合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

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

@@ -231,7 +231,7 @@

            ClickHandle();

            if (HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(doorLock) == true)
            if (Common.LocalDevice.Current.CheckDeviceIsOnline(doorLock) == true)
            {
                ReadDoorLockUserInfo();
            }
@@ -255,7 +255,7 @@
                Height = Application.GetRealHeight(1238),
                Width = Application.GetRealWidth(965),
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                Radius = 6,
                Radius = (uint)Application.GetRealHeight(17),
            };
            this.midFrameLayout.AddChidren(midTopFrameLayout);

@@ -264,8 +264,12 @@
            btnDoorLockTitle.Y = Application.GetRealHeight(46);
            btnDoorLockTitle.TextSize = 15;
            btnDoorLockTitle.IsBold = true;
            btnDoorLockTitle.Text = HdlDeviceCommonLogic.Current.GetDeviceMacName(doorLock);
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
            btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
            if (btnDoorLockTitle.Width > 664)
            {
                btnDoorLockTitle.Width = 664;
            }
            btnDoorLockTitle.TextAlignment = TextAlignment.Center;
            btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
            midTopFrameLayout.AddChidren(btnDoorLockTitle);
@@ -380,7 +384,7 @@
            progressFrameLayoutMatch = new FrameLayout()
            {
                Width = Application.GetRealHeight(84),//639-35
                Height = Application.GetRealHeight(446),
                Height = Application.GetRealHeight(446 + 30),
                X = Application.GetMinReal(51),
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
@@ -388,7 +392,9 @@

            var progressFrameLayout = new FrameLayout()
            {
                Width = Application.GetRealHeight(17),//639-35
                Width = Application.GetRealHeight(15),//639-35
                Height = Application.GetRealHeight(440),
                Radius = (uint)Application.GetRealHeight(17),
                Gravity = Gravity.CenterHorizontal,
                BackgroundColor = ZigbeeColor.Current.XMVerticalSeekBar,
            };
@@ -492,7 +498,7 @@
                Height = Application.GetRealHeight(138),
                Y = Application.GetRealHeight(1100),
                BackgroundColor = ZigbeeColor.Current.XMBlack,
                Radius = 6,
                Radius = (uint)Application.GetRealHeight(17),
            };
            midTopFrameLayout.AddChidren(btnCurrentFrameLayout);
            #endregion
@@ -611,7 +617,7 @@
                    if (tempDoor.doorLockOperatingEventNotificationCommand != null)
                    {
                        //非主人不弹这个窗口
                        if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
                        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                        {
                            return;
                        }
@@ -732,8 +738,8 @@
                        {
                            var listDevice = new List<CommonDevice> { };
                            listDevice.Add(doorLock);
                            var devTemp = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
                            if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
                            var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
                            if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
                            {
                                Application.RunOnMainThread(() =>
                                {
@@ -789,7 +795,7 @@
        public void ClickHandle()
        {
            //门锁标题
            btnDoorLockTitle.Text = HdlDeviceCommonLogic.Current.GetDeviceMacName(doorLock);
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);

            //返回
            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -1054,13 +1060,13 @@
        /// </summary>
        private async void NomallyOpenDialog()
        {
            if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
                this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
                return;
            }

            if (!HdlUserCenterResourse.AccountOption.DoorUnLockByRemote)
            if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
            {
                SystemSecondAuthentication();
                return;
@@ -1080,7 +1086,7 @@
                Common.Logic.LogicDviceList.Clear();
                if (Common.Logic.LogicDviceList.Count == 0)
                {
                    Common.Logic.LogicDviceList.AddRange(HdlDeviceCommonLogic.Current.listAllDevice.ToArray());
                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                }
                var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
                UserView.HomePage.Instance.AddChidren(addLogicPage);
@@ -1149,7 +1155,7 @@
        {
            openFrameLayout.Enable = false;
            btnDoorOpenPic.Enable = false;
            if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
                var result = await DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
                if (result == false)