合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -130,18 +130,19 @@
                    }
                    else
                    {

                        ///记录当前用户信息    --温居城

                        Phone.Device.Logic.DoorLockLogic.LockIfon.UserMemberInfoRes = accountObj;

                        Phone.Device.Logic.DoorLockLogic.LockIfon.DoorLock = doorLock;

                        ///备注：WJC的

                        ///记录当前用户信息

                        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();