合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -228,22 +228,22 @@
                if (DateTime.Now < ZigBee.Device.DoorLock.minValue)
                {
                    CommonPage.Loading.Hide();
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AfterThirtySeconds), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AfterFiftySeconds), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
                    return;
                }

                if (DateTime.Now >= oldTime && ZigBee.Device.DoorLock.RemoteUnlockCount == 0)
                {
                    ZigBee.Device.DoorLock.RemoteUnlockCount = 3;
                    ZigBee.Device.DoorLock.RemoteUnlockCount = 5;
                    oldTime = DateTime.MaxValue;
                }

                if (ZigBee.Device.DoorLock.RemoteUnlockCount <= 0)
                {
                    ZigBee.Device.DoorLock.minValue = DateTime.Now.AddSeconds(+20);
                    ZigBee.Device.DoorLock.minValue = DateTime.Now.AddSeconds(+15);
                    oldTime = ZigBee.Device.DoorLock.minValue;
                    CommonPage.Loading.Hide();
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AfterThirtySeconds), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AfterFiftySeconds), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
                    return;
                }

@@ -262,7 +262,7 @@
                    System.Threading.Thread.Sleep(500);
                    ZigBee.Device.DoorLock.RemoteUnlockPassword = editInputPassword.Text;
                    ZigBee.Device.DoorLock.minValue = DateTime.MinValue;
                    ZigBee.Device.DoorLock.RemoteUnlockCount = 3;
                    ZigBee.Device.DoorLock.RemoteUnlockCount = 5;
                    oldTime = DateTime.MaxValue;
                    CommonPage.Loading.Hide();
                    dialog.Close();