Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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);
                    }