From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
index 084d98a..86e098e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
@@ -126,7 +126,7 @@
X = Application.GetRealWidth(202),
Y = Application.GetRealHeight(1388),
Height = Application.GetRealHeight(49),
- Width = Application.GetRealWidth(685),
+ Width = Application.GetRealWidth(674),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Gravity = Gravity.CenterHorizontal,
TextSize = 12,
@@ -139,7 +139,7 @@
Y = Application.GetRealHeight(1472),
Height = Application.GetRealHeight(127),
Width = Application.GetRealWidth(907),
- Text = Language.StringByID(R.MyInternationalizationString.NextStepXm),
+ Text = Language.StringByID(R.MyInternationalizationString.NextStep),
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
Gravity = Gravity.CenterHorizontal,
Radius = 10,
@@ -218,8 +218,8 @@
var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
localDoorLockObj.UserID = ProgrammingEventNotificationData.UserID;
localDoorLockObj.UnlockType = ProgrammingEventNotificationData.ProgramEventSoure;
- //var entryTime = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocalTime(ProgrammingEventNotificationData.ZigbeeLocalTime);
- localDoorLockObj.EntryTime = System.DateTime.Now; //entryTime;
+ var entryTime = ZigBee.Device.DoorLock.GetLocalTime(ProgrammingEventNotificationData.ZigbeeLocalTime, false);
+ localDoorLockObj.EntryTime = entryTime;
if (!doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj.UserID))
{
doorLock.localDoorLockUserList.Add(ProgrammingEventNotificationData.UserID, localDoorLockObj);
@@ -240,11 +240,11 @@
nextBtn.MouseDownEventHandler += (sende, e) =>
{
- this.RemoveFromParent();
var entryStatusPage = new Shared.Phone.UserCenter.DoorLock.EntryStatusPage(doorLock, curAccountObj, currentType);
Shared.Phone.UserView.HomePage.Instance.AddChidren(entryStatusPage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
entryStatusPage.Show();
+ this.RemoveFromParent();
};
}
--
Gitblit v1.8.0