Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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(674),
                Width = Application.GetRealWidth(685),
                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.NextStep),
                Text = Language.StringByID(R.MyInternationalizationString.NextStepXm),
                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 = ZigBee.Device.DoorLock.GetLocalTime(ProgrammingEventNotificationData.ZigbeeLocalTime, false);
                        localDoorLockObj.EntryTime = entryTime;
                        //var entryTime = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocalTime(ProgrammingEventNotificationData.ZigbeeLocalTime);
                        localDoorLockObj.EntryTime = System.DateTime.Now; //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();
            };
        }