mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-12 02:09:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

debug, refact, connection state

Browse Source 
Signed-off-by: dignow <linlong1265@gmail.com>
This commit is contained in:
dignow 2023-06-23 11:28:51 +08:00
parent 1b38986a82
commit ed53fa37fc
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/flutter_ffi.rs
View File

@ -689,7 +689,7 @@ pub fn main_get_connect_status() -> String {
if state > 0 { if state > 0 {
state = 1; state = 1;
} }
serde_json::json!({ "status_num": get_online_statue() }).to_string() serde_json::json!({ "status_num": state }).to_string()
} }
} }
@ -1197,15 +1197,20 @@ pub fn main_check_mouse_time() {
} }
pub fn main_get_mouse_time() -> f64 { pub fn main_get_mouse_time() -> f64 {
let mut mouse_time = 0.0;
#[cfg(all( #[cfg(all(
not(any(target_os = "android", target_os = "ios")), not(any(target_os = "android", target_os = "ios")),
feature = "flutter" feature = "flutter"
))] ))]
{ {
mouse_time = get_mouse_time(); get_mouse_time()
}
#[cfg(not(all(
not(any(target_os = "android", target_os = "ios")),
feature = "flutter"
)))]
{
0.0
} }
mouse_time
} }
pub fn main_wol(id: String) { pub fn main_wol(id: String) {

11
src/ui_interface.rs
View File

@ -438,6 +438,7 @@ pub fn check_mouse_time() {
} }
#[inline] #[inline]
#[cfg(not(any(target_os = "android", target_os = "ios")))]
pub fn get_connect_status() -> UiStatus { pub fn get_connect_status() -> UiStatus {
UI_STATUS.lock().unwrap().clone() UI_STATUS.lock().unwrap().clone()
} }
@ -884,10 +885,13 @@ pub fn get_hostname() -> String {
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
#[tokio::main(flavor = "current_thread")] #[tokio::main(flavor = "current_thread")]
async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc::Data>) { async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc::Data>) {
#[cfg(not(feature = "flutter"))]
let mut key_confirmed = false; let mut key_confirmed = false;
let mut rx = rx; let mut rx = rx;
let mut mouse_time = 0; let mut mouse_time = 0;
#[cfg(not(feature = "flutter"))]
let mut id = "".to_owned(); let mut id = "".to_owned();
#[cfg(target_os="windows")]
let mut enable_file_transfer = "".to_owned(); let mut enable_file_transfer = "".to_owned();
loop { loop {
@ -924,7 +928,10 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
} }
Ok(Some(ipc::Data::Config((name, Some(value))))) => { Ok(Some(ipc::Data::Config((name, Some(value))))) => {
if name == "id" { if name == "id" {
#[cfg(not(feature = "flutter"))]
{
id = value; id = value;
}
} else if name == "temporary-password" { } else if name == "temporary-password" {
*TEMPORARY_PASSWD.lock().unwrap() = value; *TEMPORARY_PASSWD.lock().unwrap() = value;
} }
@ -933,6 +940,10 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
if x > 0 { if x > 0 {
x = 1 x = 1
} }
#[cfg(not(feature = "flutter"))]
{
key_confirmed = _c;
}
*UI_STATUS.lock().unwrap() = UiStatus { *UI_STATUS.lock().unwrap() = UiStatus {
status_num: x as _, status_num: x as _,
#[cfg(not(feature = "flutter"))] #[cfg(not(feature = "flutter"))]