先上传一个版本

黄学彪

2020-04-08 4dce704aaf8587cf3f91cf88f2208315a03c4cbb

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

@@ -173,6 +173,7 @@
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextAlignment = TextAlignment.CenterRight,
                TextSize = 16,
                Text = "--:--",
            };
            MidTopFrameLayout.AddChidren(validTime);

@@ -196,6 +197,7 @@
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 16,
                Text = "--:--",
            };
            MidTopFrameLayout.AddChidren(inValidTime);

@@ -391,7 +393,9 @@
                                //请"点击生成"临时密码；
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                    var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1);
                                    ShowMassage(ShowMsgType.Tip, mess);

                                });
                                return;
                            }
@@ -411,7 +415,8 @@
                                //请"点击生成"临时密码；
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                    var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1);
                                    this.ShowMassage(ShowMsgType.Tip, mess);
                                });
                                return;
                            }
@@ -493,7 +498,8 @@
                        //请"点击生成"临时密码；
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                            var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1);
                            this.ShowMassage(ShowMsgType.Tip, mess);
                        });
                        return;
                    }
@@ -506,7 +512,8 @@
                        //无效的时间设置
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                            var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip);
                            this.ShowMassage(ShowMsgType.Tip, mess);
                        });
                        return;
                    }
@@ -570,7 +577,7 @@
                                }
                                //对密码进行加密处理
                                string hdlKey = "hD1(La3o";
                                var enPsw = UserCenterLogic.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword); 
                                var enPsw = UserCenterLogic.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
                                addDoorLockTempPasswordData.TempPwd = enPsw;
                                if (doorLock.DeviceAddr != null)
                                {
@@ -585,7 +592,8 @@
                                {
                                    Application.RunOnMainThread(() =>
                                    {
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                        var mess = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime);
                                        this.ShowMassage(ShowMsgType.Tip, mess);
                                    });
                                    return;
                                }
@@ -593,7 +601,8 @@
                                {
                                    Application.RunOnMainThread(() =>
                                    {
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                        var mess = Language.StringByID(R.MyInternationalizationString.SetFailedXm1);
                                        this.ShowMassage(ShowMsgType.Tip, mess);
                                    });
                                    return;
                                }
@@ -605,7 +614,8 @@
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                    var mess = Language.StringByID(R.MyInternationalizationString.SetFailedXm);
                                    this.ShowMassage(ShowMsgType.Tip, mess);
                                });
                                return;
                            }
@@ -614,7 +624,8 @@
                        {
                            Application.RunOnMainThread(() =>
                            {
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                var mess = Language.StringByID(R.MyInternationalizationString.SetFailedXm);
                                this.ShowMassage(ShowMsgType.Tip, mess);
                            });
                            return;
                        }
@@ -623,7 +634,8 @@
                    {
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                            var mess = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
                            this.ShowMassage(ShowMsgType.Tip, mess);
                        });
                        return;
                    }
@@ -755,7 +767,8 @@
                                {
                                    Application.RunOnMainThread(() =>
                                    {
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1) + ".", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                        var mess = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1);
                                        this.ShowMassage(ShowMsgType.Tip, mess);
                                    });
                                }
                            }
@@ -763,7 +776,8 @@
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                    var mess = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime);
                                    this.ShowMassage(ShowMsgType.Tip, mess);
                                });
                            }
                        }
@@ -771,14 +785,15 @@
                        {
                            Application.RunOnMainThread(() =>
                            {
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                var mess = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1);
                                this.ShowMassage(ShowMsgType.Tip, mess);
                            });
                        }
                    }
                    else
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDelText);

                        var mess = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
                        this.ShowMassage(ShowMsgType.Tip, mess);
                    }
                }
            }
@@ -827,7 +842,7 @@
                                tpObj.InValidTime = curDoorLockTempPaw.ValidEndTime;
                                //解密密码
                                string hdlKey = "hD1(La3o";
                                var desPsw= UserCenterLogic.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
                                var desPsw = UserCenterLogic.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
                                doorLock.LocalTempPassword = tpObj.TempPassword = desPsw;
                                doorLock.tempPasswordObject = tpObj;
                                TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
@@ -844,7 +859,8 @@
                    }
                    else
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        var mess = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime);
                        this.ShowMassage(ShowMsgType.Tip, mess);
                    }
                }
                catch { }
@@ -949,7 +965,7 @@
            //有效时间
            if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour == 100)
            {
                validTime.Text = "00:00";
                validTime.Text = "--:--";
            }
            else
            {
@@ -975,14 +991,30 @@

            if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateHour == 100)
            {
                inValidTime.Text = "00:00";
                inValidTime.Text = "--:--";
            }
            else
            {
                inValidTime.Text = hour + ":" + minute;
            }
            validTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);
            inValidTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);

            if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth == 0)
            {
                validTimeDate.Text = "-" + Language.StringByID(R.MyInternationalizationString.Month) + "-" + Language.StringByID(R.MyInternationalizationString.Day);
            }
            else
            {
                validTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);
            }

            if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth == 0)
            {
                inValidTimeDate.Text = "-" + Language.StringByID(R.MyInternationalizationString.Month) + "-" + Language.StringByID(R.MyInternationalizationString.Day);
            }
            else
            {
                inValidTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);
            }
        }
    }
}