From 7a2b08af309d3b16e380c83063da8211cc97217a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 14:18:42 +0800
Subject: [PATCH] 一个新版本
---
ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
index 2407f44..6468fba 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -366,7 +366,18 @@
else if (strData == "#DeviceInfo END#")
{
//鍙嶅簭鍒楀寲璁惧
- var device = CommonDevice.CommonDeviceByByteString(deviceType, this.strTempContentData);
+ CommonDevice device = null;
+ if (HdlCheckLogic.Current.CheckIsNumber(deviceType) == true)
+ {
+ //鏁板�煎瀷涓烘柊鏁版嵁,鐩存帴杞崲
+ device = CommonDevice.CommonDeviceByByteString(Convert.ToInt32(deviceType), this.strTempContentData);
+ }
+ else
+ {
+ //瀛楃涓插瀷涓烘棫鏁版嵁,闇�瑕佺壒娈婂鐞�
+ var myType = (DeviceType)Enum.Parse(typeof(DeviceType), deviceType);
+ device = CommonDevice.CommonDeviceByByteString((int)myType, this.strTempContentData);
+ }
if (device != null)
{
if (this.modelData.dicDeviceInfo.ContainsKey(device.DeviceAddr) == false)
@@ -1113,7 +1124,7 @@
foreach (var device in listDevice)
{
//璁惧绔偣
- writeText += "#DeviceInfo START#" + device.Type.ToString() + "\r\n";
+ writeText += "#DeviceInfo START#" + (int)device.Type + "\r\n";
string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(device);
writeText += dataInfo + "\r\n";
writeText += "#DeviceInfo END#\r\n\r\n";
@@ -1125,7 +1136,7 @@
var otaDevice = Common.LocalDevice.Current.GetOTADevice(device.DeviceAddr);
if (otaDevice != null)
{
- writeText += "#DeviceInfo START#" + otaDevice.Type.ToString() + "\r\n";
+ writeText += "#DeviceInfo START#" + (int)otaDevice.Type + "\r\n";
string dataInfo2 = Newtonsoft.Json.JsonConvert.SerializeObject(otaDevice);
writeText += dataInfo2 + "\r\n";
writeText += "#DeviceInfo END#\r\n\r\n";
--
Gitblit v1.8.0