From 528c105b3aea0e6e00477365f16f57c1e3d7eb1c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 15:31:28 +0800
Subject: [PATCH] 2019-10-24-3

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodFailedTip.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodFailedTip.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodFailedTip.cs
old mode 100755
new mode 100644
index 7f19f0c..4428879
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodFailedTip.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodFailedTip.cs
@@ -125,9 +125,10 @@
                 X = Application.GetRealWidth(202),
                 Y = Application.GetRealHeight(1388),
                 Height = Application.GetRealHeight(49),
-                Width = Application.GetRealWidth(674),
+                Width = Application.GetRealWidth(694),
                 TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                 Gravity = Gravity.CenterHorizontal,
+                BackgroundColor = 0xff00ff00,
                 TextSize = 12,
             };
             this.midFrameLayout.AddChidren(btnPicTip5);
@@ -138,7 +139,7 @@
                 Y = Application.GetRealHeight(1472),
                 Height = Application.GetRealHeight(127),
                 Width = Application.GetRealWidth(907),
-                Text = Language.StringByID(R.MyInternationalizationString.NextStep),
+                Text = Language.StringByID(R.MyInternationalizationString.NextStepXm),
                 TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                 Gravity = Gravity.CenterHorizontal,
                 BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
@@ -221,7 +222,7 @@
                         var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                         localDoorLockObj.UserID = ProgrammingEventNotificationData.UserID;
                         localDoorLockObj.UnlockType = ProgrammingEventNotificationData.ProgramEventSoure;
-                        var entryTime = ZigBee.Device.DoorLock.GetLocalTime(ProgrammingEventNotificationData.ZigbeeLocalTime, false);
+                        var entryTime = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocalTime(ProgrammingEventNotificationData.ZigbeeLocalTime);
                         localDoorLockObj.EntryTime = entryTime;
                         doorLock.localDoorLockUserList.Add(ProgrammingEventNotificationData.UserID, localDoorLockObj);
                     }

--
Gitblit v1.8.0