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/DoorLock/UserDoorLockPage.cs |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 2551447..e84d61a 100644
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -17,7 +17,7 @@
         public UserDoorLockPage(Room room, CommonDevice doorLock)
         {
             //寰愭鐨勯棬閿佺晫闈㈡墦寮�(缃戝叧鍏ㄥ眬鎺ユ敹鏃朵娇鐢�)
-            //ControlCommonResourse.IsDoorLockPageOpen = true; 
+            //ControlCommonResourse.IsDoorLockPageOpen = true;
             this.doorLock = doorLock as ZigBee.Device.DoorLock;
             currentRoom = room;
             deviceUI = doorLock;
@@ -58,7 +58,7 @@
         /// <summary>
         /// 閫昏緫涓槸鍚︽湁甯稿紑妯″紡
         /// </summary>
-        private bool haveLogicNormallyOpenMode = false;
+        private bool haveLogicNormallyOpenMode = false;
 
         /// <summary>
         /// 褰撳墠鐢甸噺
@@ -200,7 +200,7 @@
         #endregion
 
         /// <summary>
-        /// UI鏄剧ず 
+        /// UI鏄剧ず
         /// </summary>
         public void Show()
         {
@@ -525,7 +525,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
             };
             btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
-            #endregion 
+            #endregion
         }
 
         #region 闊抽噺寮圭獥
@@ -580,7 +580,7 @@
                 ThumbImagePath = "DoorLock/UnLockButton.png",//杩涘害鏉℃寜閽浘鏍�
                 ThumbImageHeight = Application.GetRealHeight(81),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
                 ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
-                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� 
+                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
                 SeekBarViewHeight = Application.GetRealHeight(17),//杩涘害鏉＄殑瀹藉害
                 Progress = currentVolume,
             };
@@ -734,18 +734,18 @@
                             }
                             DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
 
-                            //Application.RunOnMainThread(async () =>
-                            //{
-                            //var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
-                            //if (resTemp == 1)
-                            //{
-                            //    haveLogicNormallyOpenMode = true;
-                            //}
-                            //else if (resTemp == 0)
-                            //{
-                            //    haveLogicNormallyOpenMode = false;
-                            //}
-                            //});
+                            Application.RunOnMainThread(async () =>
+                            {
+                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
+                                if (resTemp == 0)
+                                {
+                                    haveLogicNormallyOpenMode = false;
+                                }
+                                else
+                                {
+                                    haveLogicNormallyOpenMode = true;
+                                }
+                            });
                         }
                     }
                     else
@@ -760,7 +760,7 @@
                     canVolume = DoorLockCommonInfo.CanVolume(doorLock);
                     if (canVolume)
                     {
-                        //2銆佽鍙栭煶閲� 
+                        //2銆佽鍙栭煶閲�
                         var resultRes = await doorLock.GetVolumeAsync();
                         if (resultRes == null || resultRes.volumeResponseData == null)
                         {
@@ -816,9 +816,9 @@
 
         #endregion
 
-        #region 鍏叡浜嬩欢澶勭悊 
+        #region 鍏叡浜嬩欢澶勭悊
         /// <summary>
-        /// 浜嬩欢澶勭悊 
+        /// 浜嬩欢澶勭悊
         /// </summary>
         public void ClickHandle()
         {
@@ -882,11 +882,11 @@
                 btnCollect.IsSelected = !btnCollect.IsSelected;
                 if (btnCollect.IsSelected)
                 {
-                    HdlRoomLogic.Current.AddLoveDevice(deviceUI);//鏀惰棌 
+                    HdlRoomLogic.Current.AddLoveDevice(deviceUI);//鏀惰棌
                 }
                 else
                 {
-                    HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//鍙栨秷鏀惰棌 
+                    HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//鍙栨秷鏀惰棌
                 }
             };
             btnCollectFrameLayout.MouseDownEventHandler += handerCollect;
@@ -1007,7 +1007,7 @@
         }
         #endregion
 
-        #region 闊抽噺 
+        #region 闊抽噺
         /// <summary>
         /// 鏇存柊闊抽噺
         /// </summary>
@@ -1082,7 +1082,7 @@
         }
         #endregion
 
-        #region 甯稿紑妯″紡  
+        #region 甯稿紑妯″紡
         /// <summary>
         /// 甯稿紑妯″紡澶勭悊
         /// </summary>
@@ -1121,8 +1121,8 @@
                 UserView.HomePage.Instance.PageIndex += 1;
                 addLogicPage.Show();
                 addLogicPage.action += (w) =>
-                {
-                    doorLock.IsDoorLockNormallyMode = w;
+                {
+                    DoorLockCommonInfo.NormallyOpenModeValue(doorLock, w);
                     UpdateNomallyOpenStatus();
                     //杩斿洖鎸夐敭娓呯┖褰撳墠閫昏緫瀹氫箟鐨凩ogicAction
                     UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
@@ -1130,9 +1130,9 @@
             };
             HdlCheckLogic.Current.CheckSecondarySecurity(action);
 
-        }
-
-        /// <summary>
+        }
+
+        /// <summary>
         /// 甯稿紑妯″紡鐘舵�佹洿鏂�
         /// </summary>
         private void UpdateNomallyOpenStatus()
@@ -1160,7 +1160,7 @@
         }
         #endregion
 
-        #region 寮�閿佸鐞� 
+        #region 寮�閿佸鐞�
         /// <summary>
         /// 寮�閿佸鐞�
         /// </summary>

--
Gitblit v1.8.0