From ef0c6b76b06590b38f6e87d1e4efb35b81374502 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 25 五月 2020 09:49:02 +0800
Subject: [PATCH] 请合并代码，优化逻辑执行提示和撤销门锁定时功能。
---
ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 9 +++++----
ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 51 ---------------------------------------------------
2 files changed, 5 insertions(+), 55 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
old mode 100755
new mode 100644
index 2f3c31e..169646f
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -935,16 +935,17 @@
{
//寮�鍚嚜鍔ㄥ浠�
HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
- }
- //鏄剧ず寮曞鐣岄潰
+ }
+
+ //鏄剧ず寮曞鐣岄潰
ShowGuideForm(result);
}
//APP缂撳瓨鍔犺浇瀹屾垚
UserCenterResourse.AccountOption.AppCanSignout = true;
return true;
- }
-
+ }
+
/// <summary>
/// 鍒濆鍖栬櫄鎷熶綇瀹呯殑涓汉涓績鐨勬暟鎹�(鍒囨崲浣忓畢浣跨敤)
/// </summary>
diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index d5d49ec..e84d61a 100644
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -705,20 +705,6 @@
CommonPage.Loading.Start("");
});
- //鏀惧湪璁惧鍚姩鐨勫湴鏂�
- //HdlGatewayReceiveLogic
- //1銆佸惎鍔ㄨ幏鍙栭棬閿佽澶囧璞★紝
- //2銆佸啀鑾峰彇褰撳墠闂ㄩ攣瀵硅薄鐨勫父寮�妯″紡
- var res = await DoorLockCommonInfo.GetNormallyOpenMode(doorLock);
- if (DoorLockCommonInfo.DoorLockNormallyMode.ContainsKey(doorLock.DeviceAddr + doorLock.DeviceEpoint))
- {
- DoorLockCommonInfo.DoorLockNormallyMode[doorLock.DeviceAddr + doorLock.DeviceEpoint] = res;
- }
- else
- {
- DoorLockCommonInfo.DoorLockNormallyMode.Add(doorLock.DeviceAddr + doorLock.DeviceEpoint, res);
- }
-
//鏄惁鏀寔甯稿紑
canOpenNormallyMode = DoorLockCommonInfo.CanNormallyOpen(doorLock);
if (canOpenNormallyMode)
@@ -825,43 +811,6 @@
CommonPage.Loading.Hide();
});
}
-
- //瀹氭椂妫�娴嬫椂闂村彉鍖�
- var curDateNow = DateTime.Now;
- var curDateDelay = DateTime.MinValue;
- new System.Threading.Thread(async () =>
- {
- while (true)
- {
- try
- {
- curDateNow = DateTime.Now;
- if (curDateNow > curDateDelay)
- {
- //鏅氫笂9鐐规彁绀虹敤鎴烽棬閿佹槸鍚﹁繕寮�鐫�
- if (DoorLockCommonInfo.DoorLockNormallyMode[doorLock.DeviceAddr + doorLock.DeviceEpoint] == true)
- {
- if (curDateNow.Hour == 21)
- {
- curDateDelay = curDateNow;
- curDateDelay = curDateDelay.AddHours(+1);
- var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)doorLock);
- HdlThreadLogic.Current.RunMain(() =>
- {
- //寮瑰嚭寰愭鐨勯偅涓獥鍙�
- DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)doorLock, DoorLock.DoorLockCommonInfo.DoorLockMessType.AppOperate,
- result != 0 ? true : false, ControlCommonResourse.UpdateDoorLockStatusAction);
- });
- }
- }
- }
- }
- catch { }
- System.Threading.Thread.Sleep(1000 * 60);
- }
-
- })
- { IsBackground = true }.Start();
});
}
--
Gitblit v1.8.0