Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -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) =>
            {
@@ -129,18 +138,19 @@
                    else
                    {

                        ///备注：WJC的
                        ///记录当前用户信息
                        Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;
                        Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;
                        Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
                        Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
                        if (accountObj == null)
                        {
                            ///防止抛异常
                            Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = new MemberInfoRes();
                            Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
                        }
                        if (doorLock == null)
                        {
                            ///防止抛异常
                            Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = new ZigBee.Device.DoorLock();
                            Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
                        }
                        ///进来刷新一次设备列表；
                        Common.Logic.LogicDviceList.Clear();
@@ -152,7 +162,6 @@
                        UserView.HomePage.Instance.AddChidren(doorLockLogicList);
                        UserView.HomePage.Instance.PageIndex += 1;
                        doorLockLogicList.Show();

                    }
                };
                btnRight.MouseUpEventHandler += eHandler;
@@ -194,4 +203,4 @@
        }
        #endregion
    }
}
}