新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 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);
            };
        }