2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

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

old mode 100644
new mode 100755
@@ -22,7 +22,7 @@
        #endregion

        /// <summary>

        /// UI显示

        /// UI显示 
        /// </summary>
        public void Show()
        {
@@ -123,31 +123,30 @@
                        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;
                    {

                        ///备注：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();
                    }
                };
@@ -191,4 +190,4 @@
        }
        #endregion
    }
}
}