refact virtual display

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-04-17 12:05:36 +08:00
parent 042a4e575f
commit 9d8e7745e2
7 changed files with 125 additions and 72 deletions

View File

@@ -1141,8 +1141,6 @@ pub struct LocalConfig {
// Various data for flutter ui
#[serde(default)]
ui_flutter: HashMap<String, String>,
#[serde(default)]
virtual_display_num: usize,
}
impl LocalConfig {
@@ -1245,19 +1243,6 @@ impl LocalConfig {
config.store();
}
}
pub fn get_virtual_display_num() -> usize {
LOCAL_CONFIG.read().unwrap().virtual_display_num
}
pub fn set_virtual_display_num(virtual_display_num: usize) {
let mut lock = LOCAL_CONFIG.write().unwrap();
if lock.virtual_display_num == virtual_display_num {
return;
}
lock.virtual_display_num = virtual_display_num;
lock.store();
}
}
#[derive(Debug, Default, Serialize, Deserialize, Clone)]

View File

@@ -3,7 +3,7 @@ use virtual_display;
fn prompt_input() -> u8 {
println!("Press key execute:");
println!(" 1. 'x' 1. exit");
println!(" 1. 'q' 1. quit");
println!(" 2. 'i' 2. install or update driver");
println!(" 3. 'u' 3. uninstall driver");
println!(" 4. 'c' 4. create device");
@@ -40,7 +40,7 @@ fn main() {
loop {
let chr = prompt_input();
match chr as char {
'x' => break,
'q' => break,
'i' => {
println!("Install or update driver begin");
let mut reboot_required = false;

View File

@@ -47,7 +47,10 @@ macro_rules! make_lib_wrapper {
$(let $field = if let Some(lib) = &lib {
match unsafe { lib.symbol::<$tp>(stringify!($field)) } {
Ok(m) => Some(*m),
Ok(m) => {
log::info!("method found {}", stringify!($field));
Some(*m)
},
Err(e) => {
log::warn!("Failed to load func {}, {}", stringify!($field), e);
None