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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

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

                EventHandler<MouseEventArgs> eHandler2 = (sender2, e2) =>
                {
                    var dialog1 = new Dialog { };
                    var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog1, Language.StringByID(R.MyInternationalizationString.Tip));
                    doorDialog.Show();
                    doorDialog.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
                    doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
                    doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(190);
                    doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
                    doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
                    doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToDeleteTempPassword);
                    doorDialog.dialogMidText.TextSize = 14;
                    doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
                    doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.Confrim);
                    doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
                    {
                        dialog.Close();
                        dialog1.Close();
                    };
                    doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
                    {
                        dialog.Close();
                        dialog1.Close();
                        ClearEventHandler(btnDelText, dialog1);
                    };
                    dialog.Close();
                    string msg = Language.StringByID(R.MyInternationalizationString.SureToDeleteTempPassword);
                    var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
                    alert.Show();
                    //使用确认型弹框时,的回调函数
                    alert.ConfirmClickEvent += () =>
                    { 
                        ClearEventHandler(btnDelText);
                    }; 
                };
                delBackgroundFrameLayout.MouseDownEventHandler += eHandler2;
                btnDelIcon2.MouseDownEventHandler += eHandler2;
@@ -181,7 +168,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,
@@ -226,7 +213,7 @@
                Height = Application.GetRealHeight(49),
                Width = Application.GetRealWidth(84 + 135),
                Y = Application.GetRealHeight(441),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                TextSize = 12,
                TextAlignment = TextAlignment.CenterRight,
            };
@@ -250,7 +237,7 @@
                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 = 12,
            };
@@ -341,6 +328,7 @@
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
            this.midFrameLayout.AddChidren(bottomFrameLayout);
            bottomFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            var informationEdit = new Button()
            {
@@ -393,7 +381,7 @@
                {
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(58),
                    UnSelectedImagePath = "Item/Next.png",
                    UnSelectedImagePath = "Item/RightNext.png",
                    SelectedImagePath = "Item/Down.png",
                };
                btnNextFrameLayout.AddChidren(btnNext);
@@ -508,6 +496,7 @@
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                TextSize = 16,
                IsBold = true,
                Enable = false,
            };
            bottomFrameLayout.AddChidren(btnFinifh);
@@ -679,7 +668,7 @@
        }

        //清除事件处理
        async void ClearEventHandler(Button btnDelText = null, Dialog dialog = null)
        async void ClearEventHandler(Button btnDelText = null)
        {
            if (btnDelText == null)
            {
@@ -753,10 +742,7 @@
            {
                Application.RunOnMainThread(() =>
                {
                    if (dialog != null)
                    {
                        dialog.Close();
                    }

                    MidFrameLayoutContent();
                    CommonPage.Loading.Hide();
                });