合并了全部的代码，IOS 图片需要从新引入工程

黄学彪

2019-11-07 82a773d1783549caca563831aac8affc059deedf

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

@@ -40,7 +40,7 @@
            {
                currentTitle = Language.StringByID(R.MyInternationalizationString.AddFingerprint);
            }
            else
            else if (currentType == "proximity")
            {
                currentTitle = Language.StringByID(R.MyInternationalizationString.AddIcCard);
            }
@@ -178,7 +178,7 @@
                btnPicTip1.X = Application.GetRealWidth(450);
                btnPicTip5.Text = Language.StringByID(R.MyInternationalizationString.EntryTip);
            }
            else
            else if (currentType == "proximity")
            {
                topMidFrameLayout.BackgroundImagePath = "DoorLock/AddIcCardTipPic.png";
                btnPicTip3.Width = Application.GetRealWidth(495);
@@ -214,12 +214,31 @@
                    var ProgrammingEventNotificationData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockProgrammingEventNotificationCommand>(jObjectdata["Data"].ToString());
                    if (ProgrammingEventNotificationData != null)
                    {
                        int curMethod = -1;
                        if (currentType == "password")
                        {
                            curMethod = 0;
                        }
                        else if (currentType == "fingerprint")
                        {
                            curMethod = 15;
                        }
                        else if (currentType == "proximity")
                        {
                            curMethod = 3;
                        }
                        else
                        {
                            return;
                        }
                        if (ProgrammingEventNotificationData.ProgramEventSoure == curMethod)
                        {
                        doorLock.doorLockProgrammingEventNotificationCommand = ProgrammingEventNotificationData;
                        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;
                            localDoorLockObj.EntryTime = System.DateTime.Now;
                            //先暂时加入，等云端添加和获取真正成功后才真的加入
                        if (!doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj.UserID))
                        {
                            doorLock.localDoorLockUserList.Add(ProgrammingEventNotificationData.UserID, localDoorLockObj);
@@ -230,6 +249,14 @@
                            nextBtn.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        });
                    }
                        else
                        {
                            //Application.RunOnMainThread(() =>
                            //{
                            //new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.EntryCurrentUnlockMethod), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
                            //});
                        }
                    }
                }
            };