From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期五, 10 一月 2020 17:02:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs index 34330b4..8c56b72 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs @@ -479,12 +479,12 @@ #region 鈻� 淇敼骞叉帴鐐圭鏈夊睘鎬________________ /// <summary> - /// 淇敼骞叉帴鐐圭鏈夊睘鎬� + /// 淇敼骞叉帴鐐圭涓夌骇鍒殑绉佹湁灞炴�� /// </summary> /// <param name="panel">骞叉帴鐐瑰璞�</param> /// <param name="i_value">骞叉帴鐐圭殑绗笁绾у埆灞炴�х殑鍊�,鍏蜂綋璇峰弬鐓х涓夌骇鍒睘鎬�</param> /// <returns></returns> - public async Task<bool> EditorDryContactFunction(Panel panel, int i_value) + public async Task<bool> EditorDryContactThirdFunction(Panel panel, int i_value) { var result = await panel.ConfigureHdlKeyValueAsync((Panel.KeyMode)i_value); //鍏遍�氶敊璇娴� @@ -537,7 +537,7 @@ return false; } //澶囦唤璁惧 - await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A骞叉帴鐐圭鏈夊睘鎬�, i_value); + await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A骞叉帴鐐圭涓夌骇鍒鏈夊睘鎬�, i_value); return true; } @@ -707,7 +707,13 @@ errorMsg = UserCenterLogic.CombineGatewayTimeOutMsg(errorMsg, null, "鍥炲瓒呮椂", false); } this.ShowTipMsg(errorMsg); + return false; } + //澶囦唤璁惧 + HdlThreadLogic.Current.RunThread(async () => + { + await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A绠�绾﹂潰鏉块渿鍔ㄥ姛鑳�, datainfo); + }, ShowErrorMode.NO); return success; } -- Gitblit v1.8.0