合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -107,7 +107,8 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = Language.StringByID(R.MyInternationalizationString.ClearTempPassword),
                    TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                    TextSize = 12,
                    TextSize = 14,
                    IsBold =true,
                };
                delBackgroundFrameLayout.AddChidren(btnDelText);

@@ -181,7 +182,7 @@
                Y = Application.GetRealHeight(48),
                TextAlignment = TextAlignment.Center,
                Text = Language.StringByID(R.MyInternationalizationString.ClickGenerate),
                TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 12,
                Visible = true,
                Enable = true,
@@ -190,11 +191,9 @@

            var randomPassword = new EditText()
            {
                X = Application.GetRealWidth(233),
                Y = Application.GetRealHeight(153),
                Height = Application.GetRealHeight(84),
                Width = Application.GetRealWidth(251),
                TextAlignment = TextAlignment.CenterRight,
                TextAlignment = TextAlignment.Center,
                TextSize = 24,
                SecureTextEntry = false,
                Enable = false,
@@ -215,47 +214,46 @@
            var validTime = new Button()
            {
                Height = Application.GetRealHeight(55),
                Width = Application.GetRealWidth(115),
                X = Application.GetRealWidth(92),
                Width = Application.GetRealWidth(92 + 115),
                Y = Application.GetRealHeight(386),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
                TextAlignment = TextAlignment.CenterRight,
                TextSize = 16,
            };
            MidTopFrameLayout.AddChidren(validTime);

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

            var inValidTime = new Button()
            {
                Height = Application.GetRealHeight(55),
                Width = Application.GetRealWidth(118),
                Width = Application.GetRealWidth(717 - 507),
                X = Application.GetRealWidth(507),
                Y = Application.GetRealHeight(389),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
                TextSize = 16,
            };
            MidTopFrameLayout.AddChidren(inValidTime);

            var inValidTimeDate = new Button()
            {
                Height = Application.GetRealHeight(49),
                Width = Application.GetRealWidth(135),
                Width = Application.GetRealWidth(717 - 508),
                X = Application.GetRealWidth(508),
                Y = Application.GetRealHeight(444),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 10,
                TextSize = 12,
            };
            MidTopFrameLayout.AddChidren(inValidTimeDate);

@@ -281,7 +279,6 @@
            {
                randomPassword.Text = "- - - - - -";
                temPasswordVisiable.Visible = false;
                randomPassword.X = Application.GetRealWidth(215);
                randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMGray4;
                Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify = true;
                topPic.Visible = true;
@@ -345,7 +342,8 @@
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
            this.midFrameLayout.AddChidren(bottomFrameLayout);

            bottomFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
             
            var informationEdit = new Button()
            {
                Height = Application.GetRealHeight(60),
@@ -397,7 +395,7 @@
                {
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(58),
                    UnSelectedImagePath = "Item/Next.png",
                    UnSelectedImagePath = "Item/RightNext.png",
                    SelectedImagePath = "Item/Down.png",
                };
                btnNextFrameLayout.AddChidren(btnNext);
@@ -432,6 +430,15 @@
                    {
                        if (curIndex == 0)
                        {
                            if (string.IsNullOrEmpty(doorLock.LocalTempPassword))
                            {
                                //请"点击生成"临时密码；
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                });
                                return;
                            }
                            var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "ValidTime");
                            Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
                            Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -443,6 +450,15 @@
                        }
                        if (curIndex == 1)
                        {
                            if (string.IsNullOrEmpty(doorLock.LocalTempPassword))
                            {
                                //请"点击生成"临时密码；
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                });
                                return;
                            }
                            var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "InValidTime");
                            Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
                            Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -494,6 +510,7 @@
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                TextSize = 16,
                IsBold =true,
                Enable = false,
            };
            bottomFrameLayout.AddChidren(btnFinifh);
@@ -794,7 +811,7 @@
                    }
                    else
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    }
                }
                catch { }