2019-11-14-1

WJC

2019-11-14 653b65a9bd3d3df806f7cbecc767085cd506058d

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

old mode 100755
new mode 100644
@@ -43,11 +43,20 @@
        }

        /// <summary>

        /// UI显示 
        /// UI显示

        /// </summary>
        public void Show()
        {
            this.TopFrameLayout(this, accountObj.Account);
            string accountTitle = "";
            if (accountObj.UserName != null)
            {
                accountTitle = accountObj.UserName;
            }
            else
            {
                accountTitle = accountObj.Account;
            }
            this.TopFrameLayout(this, accountTitle);

            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
            {
@@ -56,9 +65,7 @@
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);

            ReadDoorLockUserInfo();

        }

        public void MidFrameLayoutContent()
@@ -130,10 +137,31 @@
                    }
                    else
                    {
                        var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();

                        ///备注：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();
                    }
                };
                btnRight.MouseUpEventHandler += eHandler;
@@ -175,4 +203,4 @@
        }
        #endregion
    }
}
}