From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index a589934..29c1290 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -14,8 +14,8 @@
         {
         }
         #region 鍙橀噺鐢虫槑
-        public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
-        public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
+        public new FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
+        public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1925 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
         #region 搴曢儴鏈夊渾瑙掑竷灞�
         /// 鑳屾櫙闃村奖鐣岄潰
         /// </summary>
@@ -120,7 +120,6 @@
             Height = 1,
             BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTitleLine,
         };
-
 
         /// <summary>
         /// 寮圭獥鍙栨秷鎸夐敭
@@ -233,6 +232,7 @@
                 PlaceholderText = Language.StringByID(R.MyInternationalizationString.InputUnlockPasswrd),
                 TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                 TextAlignment = TextAlignment.BottomLeft,
+                IsNumberKeyboardType = true,
             };
             editInputPasswordFrameLayout.AddChidren(editInputPassword);
 
@@ -296,7 +296,7 @@
                         {
                             btnNext.IsSelected = true;
                         }
-                        if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
+                        if (!HdlUserCenterResourse.AccountOption.DoorUnLockByRemote)
                         {
                             string msg = Language.StringByID(R.MyInternationalizationString.RemoteUnlockBindSucessTip).Replace("{0}", "\r\n");
                             var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
@@ -341,9 +341,9 @@
         /// </summary>
         /// <param name="doorLock">闂ㄩ攣璁惧</param>
         /// <param name="action">浜屾楠岃瘉鐨勭粨鏋滄垚鍔熷悗鐨勯�氱煡</param> 
-        public static void SecurityRequest(ZigBee.Device.DoorLock doorLock, Action action)
+        public static void SecurityRequest(ZigBee.Device.DoorLock doorLock)
         {
-            string msg = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter).Replace("{0}", "\r\n");
+            string msg = Language.StringByID(R.MyInternationalizationString.SetSecondarySecurityVerificationMode).Replace("{0}", "\r\n");
             var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
             alert.Show();
             //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
@@ -359,15 +359,16 @@
         /// </summary>
         /// <param name="doorLock"></param>
         /// <param name="btnDoorLockTitle"></param>
-        public void BindRemoteUnlockDoorlock(ZigBee.Device.DoorLock doorLock, Button btnDoorLockTitle = null)
+        public void BindRemoteUnlockDoorlock(Room room, CommonDevice devDoorLock, Button btnDoorLockTitle = null)
         {
+            ZigBee.Device.DoorLock doorLock = devDoorLock as ZigBee.Device.DoorLock;
             string msgRemoteUnlockRequest = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
             var alertRemoteUnlockRequest = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msgRemoteUnlockRequest, Language.StringByID(R.MyInternationalizationString.GoSetting));
             alertRemoteUnlockRequest.Show();
             //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
             alertRemoteUnlockRequest.ConfirmClickEvent += () =>
             {
-                var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+                var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(room, devDoorLock);
                 Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                 functionSetting.Show();
@@ -385,7 +386,7 @@
         }
 
         /// <summary>
-        /// 绯荤粺浜屾纭绐楀彛
+        /// 鍘讳釜浜轰腑蹇冿紝寮�鍚郴缁熷瘑鐮佹敮鎸佸紑閿佹潈闄�
         /// </summary>
         public void SystemSecondAuthentication()
         {
@@ -407,15 +408,16 @@
         /// <param name="action">浜屾楠岃瘉鐨勭粨鏋滄垚鍔熷悗鐨勯�氱煡</param>
         /// <param name="progressButton">闂ㄩ攣寮�鎴栧叧鏃惰繘搴︽樉绀�</param>
         /// <param name="btnDoorLockPic">闂ㄩ攣鍥剧墖寮�/鍏虫樉绀�</param>
-        public void RemoteUnlockRequest(ZigBee.Device.DoorLock doorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null, Button btnDoorLockTitle = null)
+        public void RemoteUnlockRequest(Room room, CommonDevice devDoorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null, Button btnDoorLockTitle = null)
         {
+            ZigBee.Device.DoorLock doorLock = devDoorLock as ZigBee.Device.DoorLock;
             if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
             {
-                BindRemoteUnlockDoorlock(doorLock, btnDoorLockTitle);
+                BindRemoteUnlockDoorlock(room, devDoorLock, btnDoorLockTitle);
                 return;
             }
 
-            if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
+            if (!HdlUserCenterResourse.AccountOption.DoorUnLockByRemote)
             {
                 SystemSecondAuthentication();
                 return;
@@ -499,7 +501,7 @@
                                     {
                                         this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear));
                                         doorLock.RemoteUnlockPassword = "";
-                                        var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+                                        var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(room, devDoorLock);
                                         Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
                                         Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                                         functionSetting.Show();
@@ -544,6 +546,7 @@
                         }
                     });
                 };
+
                 HdlCheckLogic.Current.CheckSecondarySecurity(action);
             };
         }

--
Gitblit v1.8.0