From 985abd7ee6049147119518aa41fb2d08c0cfc40d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期五, 10 一月 2020 17:56:12 +0800 Subject: [PATCH] 合并代码 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs index 227534e..cf5ecc4 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs +++ b/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; -- Gitblit v1.8.0