Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -117,6 +117,7 @@
                Height = Application.GetRealHeight(1238),
                Width = Application.GetRealWidth(965),
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                Radius = 6,
            };
            this.midFrameLayout.AddChidren(midTopFrameLayout);

@@ -126,12 +127,14 @@
                Height = Application.GetRealHeight(60),
                X = Application.GetRealWidth(372),
                Y = Application.GetRealHeight(46),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack ,
                TextSize = 15,
                TextAlignment = TextAlignment.Center,
                IsBold =true,
            };
            midTopFrameLayout.AddChidren(btnDoorLockTitle);
            //获取Mac名字 
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);

            var btnRecord = new Button()
            {
@@ -286,12 +289,22 @@
            };
            closeFrameLayout.AddChidren(btnDoorClosePic);

            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),
                Height = Application.GetRealHeight(138),
                Y = Application.GetRealHeight(1100),
                BackgroundColor = ZigbeeColor.Current.XMBlack,
                Radius = 6,
            };
            midTopFrameLayout.AddChidren(btnCurrentFrameLayout);

@@ -321,6 +334,8 @@

            EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
             {
                openFrameLayout.Enable = false;
                btnDoorOpenPic.Enable = false;
                 if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                 {
                     var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
@@ -340,15 +355,21 @@
                                     deviceUI.CommonDevice.ReSave();
                                 }
                             };
                            openFrameLayout.Enable = true;
                            btnDoorOpenPic.Enable = true;
                         }
                         else
                         {
                             new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            openFrameLayout.Enable = true;
                            btnDoorOpenPic.Enable = true;
                         }
                     }
                     else
                     {
                         new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        openFrameLayout.Enable = true;
                        btnDoorOpenPic.Enable = true;
                     }
                 }
                 else
@@ -364,6 +385,8 @@
                             deviceUI.CommonDevice.ReSave();
                         }
                     };
                    openFrameLayout.Enable = true;
                    btnDoorOpenPic.Enable = true;
                 }
             };
            openFrameLayout.MouseUpEventHandler += hander1;