合并代码

黄学彪

2020-01-10 985abd7ee6049147119518aa41fb2d08c0cfc40d

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -154,6 +154,8 @@
            //获取设备列表

            string gwID = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);

            var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(gwID);

            var listSpecialOta = Common.LocalDevice.Current.GetSpecialOtaDevice(gwID);

            listDevice.AddRange(listSpecialOta);



            this.dicRowInfo.Clear();



@@ -229,7 +231,7 @@


            //检测设备是否拥有定位的功能

            var listdevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);

            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listdevice[0]) == true)

            if (listdevice.Count > 0 && Common.LocalDevice.Current.DeviceIsCanFixedPosition(listdevice[0]) == true)

            {

                //定位

                var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowMenu.Height, false);

@@ -845,8 +847,14 @@
                var localDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr);

                if (localDevice.Count == 0)

                {

                    //入网之后，又把它删了

                    return;

                    //针对单纯只有一个200端点的设备

                    var ota = Common.LocalDevice.Current.GetOTADevice(deviceAddr);

                    if (ota == null)

                    {

                        //入网之后，又把它删了

                        return;

                    }

                    localDevice.Add(ota);

                }

                var rowNewInfo = new DeviceObjRowInfo();

                rowNewInfo.DeviceMac = deviceAddr;