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

黄学彪

2019-11-07 82a773d1783549caca563831aac8affc059deedf

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

@@ -28,7 +28,9 @@
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    CommonDevice.DebugPrintLog($"11111111111111F");
                    await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
                    CommonDevice.DebugPrintLog($"11111111111111G");
                }
                catch { }
                finally
@@ -36,6 +38,7 @@
                    Application.RunOnMainThread(() =>
                    {
                        MidFrameLayoutContent();
                        CommonDevice.DebugPrintLog($"11111111111111E");
                        CommonPage.Loading.Hide();
                    });
                }
@@ -47,6 +50,7 @@
        /// </summary>
        public void Show()
        {
            CommonDevice.DebugPrintLog($"11111111111111A");
            this.TopFrameLayout(this, accountObj.Account);

            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -56,13 +60,14 @@
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);

            CommonDevice.DebugPrintLog($"11111111111111B");
            ReadDoorLockUserInfo();

            CommonDevice.DebugPrintLog($"11111111111111C");
        }

        public void MidFrameLayoutContent()
        {
            CommonDevice.DebugPrintLog($"11111111111111D");
            var bodyView = new VerticalScrolViewLayout()
            {
            };
@@ -129,31 +134,11 @@
                        unLockMethod.Show();
                    }
                    else
                    {

                        ///备注：WJC的

                        ///记录当前用户信息

                        Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;

                        Phone.Device.Logic.Send.CurrentDoorLock = doorLock;

                        if (accountObj == null)

                        {

                            ///防止抛异常

                            Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();

                        }

                        if (doorLock == null)

                        {

                            ///防止抛异常

                            Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();

                        }

                        ///进来刷新一次设备列表；

                        Common.Logic.LogicDviceList.Clear();

                        if (Common.Logic.LogicDviceList.Count == 0)

                        {

                            Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());

                        }

                        var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList();

                        UserView.HomePage.Instance.AddChidren(doorLockLogicList);

                        UserView.HomePage.Instance.PageIndex += 1;

                        doorLockLogicList.Show();
                    {
                        var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                    }
                };
                btnRight.MouseUpEventHandler += eHandler;