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/DeviceGeneralInformationForm.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
index fd6e618..1ec0c90 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
@@ -38,6 +38,12 @@
             this.ClearBodyFrame();
 
             var listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
+            var oTADevice = Common.LocalDevice.Current.GetOTADevice(i_deviceMac);
+            if (listDevice.Count == 0)
+            {
+                //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+                listDevice.Add(oTADevice);
+            }
 
             var listView = new VerticalListControl(12);
             listView.BackgroundColor = UserCenterColor.Current.White;
@@ -76,9 +82,8 @@
                 rowImage.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uImageId), 400);
                 rowImage.AddMostRightView(otaDevice.ImgTypeId.ToString(), 400);
                 rowImage.AddBottomLine();
-            }
+            }
 
-            var oTADevice = Common.LocalDevice.Current.GetOTADevice(listDevice[0].DeviceAddr);
             if (oTADevice != null)
             {
                 //鍥轰欢鐗堟湰

--
Gitblit v1.8.0