From a41a96b555f3aabf243741352bded5f28cd0ced5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 21 七月 2020 15:56:32 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Common/Device.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
old mode 100644
new mode 100755
index 7f12108..b94b3e0
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -2563,7 +2563,7 @@
{
if (this.dicDeviceModelIdEnum.ContainsKey(strKey) == false)
{
- return null;
+ return new DeviceNameContent();
}
return this.dicDeviceModelIdEnum[strKey];
}
@@ -3178,18 +3178,18 @@
System.IO.StreamReader streamReader = null;
var listText = new List<string>();
try
- {
-#if iOS
- string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
- streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
+ {
+#if iOS
+ string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
+ streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
string text;
while ((text = streamReader.ReadLine()) != null)
{
listText.Add(text.Trim());
}
- return listText;
-#endif
-#if Android
+ return listText;
+#endif
+#if Android
var stream = Application.Activity.Assets.Open("DeviceName.ini");
streamReader = new System.IO.StreamReader(stream, Encoding.UTF8);
string text;
@@ -3217,10 +3217,10 @@
}
}
-#endregion
+ #endregion
}
-#region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
+ #region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
/// <summary>
/// <para>璁惧鐨勫叿浣撱�愯澶囩被鍨嬨��,鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
@@ -3595,5 +3595,5 @@
A骞叉帴鐐� = 16,
}
-#endregion
+ #endregion
}
--
Gitblit v1.8.0