2020-04-02-2

WJC

2020-04-02 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs

old mode 100755
new mode 100644
@@ -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>