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

黄学彪

2019-11-07 06978e3b15b8536e2d4511ae4612fec1d556e145

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

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

@@ -135,10 +135,30 @@
                    }
                    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;

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs

@@ -103,7 +103,7 @@
                //初始化Wi-Fi连接

                //var hdlWifi = new Com.Hdl.Hdlelianzigbee.ElianNative();

                //hdlWifi.InitSmartConnection(null, 1, 1);

                ////开始Wi-Fi连接

                //开始Wi-Fi连接

                //var result = hdlWifi.StartSmartConnection(rowWifi.Text, btnPsw.Text, "1");

                //var form = new WirelessGwClickButtonForm();

                //this.AddFromAndRemoveNowForm(form);