合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

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

@@ -95,11 +95,11 @@
            };
            btnDelFrameLayout.MouseDownEventHandler += eHandler;
            btnDelIcon.MouseDownEventHandler += eHandler;
            #endregion 
            #endregion
            MidTopFrameLayout = new FrameLayout()
            {
                X = Application.GetRealWidth(181),
                Y = Application.GetRealHeight(92),
                X = Application.GetMinRealAverage(181),
                Y = Application.GetMinRealAverage(92),
                Width = Application.GetRealWidth(717),
                Height = Application.GetRealHeight(570),
                BackgroundImagePath = "DoorLock/TempPasswordBackground.png",
@@ -118,7 +118,7 @@
            {
                Height = Application.GetRealHeight(43),
                Width = Application.GetRealWidth(259),
                X = Application.GetRealWidth(230),
                X = Application.GetRealWidth(227),
                Y = Application.GetRealHeight(418),
                UnSelectedImagePath = "DoorLock/TempPasswordBackground1.png",
            };
@@ -168,23 +168,23 @@
            var validTime = new Button()
            {
                Height = Application.GetRealHeight(55),
                Width = Application.GetRealWidth(92 + 115),
                Width = Application.GetRealWidth(207),
                Y = Application.GetRealHeight(386),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextAlignment = TextAlignment.CenterRight,
                TextSize = 16,
                Text = "--:--",
                Text = "--:--", 
            };
            MidTopFrameLayout.AddChidren(validTime);

            var validTimeDate = new Button()
            {
                Height = Application.GetRealHeight(49),
                Width = Application.GetRealWidth(84 + 135),
                Width = Application.GetRealWidth(208),
                Y = Application.GetRealHeight(441),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                TextSize = 12,
                TextAlignment = TextAlignment.CenterRight,
                TextAlignment = TextAlignment.CenterRight, 
            };
            MidTopFrameLayout.AddChidren(validTimeDate);

@@ -193,11 +193,11 @@
                Height = Application.GetRealHeight(55),
                Width = Application.GetRealWidth(717 - 507),
                X = Application.GetRealWidth(507),
                Y = Application.GetRealHeight(389),
                Y = Application.GetRealHeight(386),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 16,
                Text = "--:--",
                Text = "--:--", 
            };
            MidTopFrameLayout.AddChidren(inValidTime);

@@ -206,10 +206,10 @@
                Height = Application.GetRealHeight(49),
                Width = Application.GetRealWidth(717 - 508),
                X = Application.GetRealWidth(508),
                Y = Application.GetRealHeight(444),
                Y = Application.GetRealHeight(441),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 12,
                TextSize = 12, 
            };
            MidTopFrameLayout.AddChidren(inValidTimeDate);

@@ -217,20 +217,7 @@

            #region 数据处理
            TimeDisplay(validTime, validTimeDate, inValidTime, inValidTimeDate, false);
            if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify)
            {
                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                btnFinifh.Enable = true;
                topPic.Visible = true;
                topPic.Enable = true;
            }
            else
            {
                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
                btnFinifh.Enable = false;
                topPic.Visible = false;
                topPic.Enable = false;
            }

            if (string.IsNullOrEmpty(doorLock.LocalTempPassword))
            {
                randomPassword.Text = "- - - - - -";
@@ -258,21 +245,36 @@
                }
            }

            temPasswordVisiable.MouseUpEventHandler += (sender, e) =>
            if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify)
            {
                temPasswordVisiable.IsSelected = !temPasswordVisiable.IsSelected;
                if (!temPasswordVisiable.IsSelected)
                {
                    randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMGray4;
                    randomPassword.SecureTextEntry = true;
                }
                else
                {
                    randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMOrange;
                    randomPassword.SecureTextEntry = false;
                }
                Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable = !randomPassword.SecureTextEntry;
            };
                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                btnFinifh.Enable = true;
                topPic.Visible = true;
                topPic.Enable = true;
            }
            else
            {
                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
                btnFinifh.Enable = false;
                topPic.Visible = false;
                topPic.Enable = false;
            }

            temPasswordVisiable.MouseUpEventHandler += (sender, e) =>
      {
          temPasswordVisiable.IsSelected = !temPasswordVisiable.IsSelected;
          if (!temPasswordVisiable.IsSelected)
          {
              randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMGray4;
              randomPassword.SecureTextEntry = true;
          }
          else
          {
              randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMOrange;
              randomPassword.SecureTextEntry = false;
          }
          Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable = !randomPassword.SecureTextEntry;
      };
            topPic.MouseUpEventHandler += (sender, e) =>
            {
                randomPassword.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetTempPassword();