合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -428,6 +428,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;
@@ -439,6 +448,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;