From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs |   40 +++++++++++++---------------------------
 1 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
old mode 100755
new mode 100644
index 062c187..1831d1e
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -171,7 +171,7 @@
         #endregion
 
         /// <summary>
-        /// UI鏄剧ず
+        /// UI鏄剧ず 
         /// </summary>
         public void Show()
         {
@@ -242,16 +242,6 @@
                 IsBold = true,
             };
             midTopFrameLayout.AddChidren(btnDoorLockTitle);
-            //鑾峰彇Mac鍚嶅瓧
-            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
-
-            var btnRecordFrameLayout = new FrameLayout()
-            {
-                Width = Application.GetRealWidth(69+15+46),
-                Height = Application.GetRealHeight(69+46 * 2),
-                X = Application.GetRealWidth(752-46),
-             };
-            midTopFrameLayout.AddChidren(btnRecordFrameLayout);
 
             //璁板綍
             btnRecordFrameLayout = new FrameLayout()
@@ -459,15 +449,6 @@
             };
             midTopFrameLayout.AddChidren(btnCurrentTopFrameLayout);
 
-            var btnCurrentTopFrameLayout = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(50),
-                Width = Application.GetRealWidth(965),
-                BackgroundColor = ZigbeeColor.Current.XMBlack,
-                Y = Application.GetRealHeight(1100),
-            };
-            midTopFrameLayout.AddChidren(btnCurrentTopFrameLayout);
-
             var btnCurrentFrameLayout = new FrameLayout()
             {
                 Width = Application.GetRealWidth(965),
@@ -502,7 +483,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
             };
             btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
-            #endregion
+            #endregion 
         }
 
         #region 闊抽噺寮圭獥
@@ -556,7 +537,7 @@
                 ThumbImagePath = "DoorLock/UnLockButton.png",//杩涘害鏉℃寜閽浘鏍�
                 ThumbImageHeight = Application.GetRealHeight(81),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
                 ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
-                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
+                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� 
                 SeekBarViewHeight = Application.GetRealHeight(17),//杩涘害鏉＄殑瀹藉害
                 Progress = (currentVolume * (Convert.ToInt32(((float)100 / 15) * 100))) / 100,
             };
@@ -670,9 +651,9 @@
 
         #endregion
 
-        #region 鍏叡浜嬩欢澶勭悊
+        #region 鍏叡浜嬩欢澶勭悊 
         /// <summary>
-        /// 浜嬩欢澶勭悊
+        /// 浜嬩欢澶勭悊 
         /// </summary>
         public void ClickHandle()
         {
@@ -957,7 +938,7 @@
         }
         #endregion
 
-        #region 甯稿紑妯″紡
+        #region 甯稿紑妯″紡  
         /// <summary>
         /// 甯稿紑妯″紡澶勭悊
         /// </summary>
@@ -1019,6 +1000,8 @@
                             alertNomallyModeIsTurnOn.LogicClickEvent += () =>
                             {
                                 //鑷姩鍖�
+                                Shared.Phone.Device.Logic.SkipView.SkipAddLogic(2,doorLock);
+
                             };
                             alertNomallyModeIsTurnOn.InvalidClickEvent += async () =>
                             {
@@ -1118,6 +1101,8 @@
                         UpdateNomallyOpenStatus();
                         string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
                         this.ShowTipMsg(msg2);
+                        Shared.Phone.Device.Logic.SkipView.LockDelLogic(doorLock);
+                        //
                     }
                 }
             };
@@ -1128,7 +1113,7 @@
         /// </summary>
         private void NomallyOpenModeInvalidTimeDialog()
         {
-            //澶辨晥璁剧疆
+            //澶辨晥璁剧疆 
             string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
             var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
             var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
@@ -1154,6 +1139,7 @@
                 }
                 var temp = int.Parse(obj);
                 DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
+                Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime,doorLock);
                 btnNormallyOpen.IsSelected = true;
             };
         }
@@ -1193,7 +1179,7 @@
         }
         #endregion
 
-        #region 寮�閿佸鐞�
+        #region 寮�閿佸鐞� 
         /// <summary>
         /// 寮�閿佸鐞�
         /// </summary>

--
Gitblit v1.8.0