From 9cc8fd11b13813adbdd3c6c31554e5c0bebf4026 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期五, 21 八月 2020 19:53:49 +0800 Subject: [PATCH] 发布到商店的版本 --- ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs index fbf9219..1802c94 100755 --- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs +++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs @@ -245,10 +245,22 @@ //鑾峰彇瀵硅薄 var classData = new ModelDeviceBindData(); var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData); + + //娓呯┖缁戝畾琛ㄧ殑杩斿洖鍊� + string clearResult = "{" + + SetDouMarks("Device_ID") + ":" + (int)device.Type + "," + + SetDouMarks("DeviceAddr") + ":" + SetDouMarks(device.DeviceAddr) + "," + + SetDouMarks("Epoint") + ":" + device.DeviceEpoint + "," + + SetDouMarks("Data_ID") + ":5006," + + SetDouMarks("Data") + ": {" + + SetDouMarks("Result") + ": 0," + + SetDouMarks("ResultRemark") + ":" + SetDouMarks("Success") + "}" + + "}"; + if (memoryData.ListReceiveResult.Count == 1) { //璁惧缁戝畾鏈変笁鏉″懡浠� 绗竴鏉′负娓呯┖ - memoryData.ListReceiveResult.Insert(0, "{" + SetDouMarks("Result") + ": 0," + SetDouMarks("ResultRemark") + ": " + SetDouMarks("Success") + " }"); + memoryData.ListReceiveResult.Insert(0, clearResult); memoryData.ListReceiveTopic.Insert(0, "Bind/ClearBindInfo_Respon"); memoryData.ListSendTopic.Insert(0, "Bind/ClearBindInfo"); @@ -256,6 +268,13 @@ memoryData.ListReceiveTopic.Add(string.Empty); memoryData.ListSendTopic.Add(string.Empty); } + else + { + memoryData.ListReceiveResult[0] = clearResult; + memoryData.ListReceiveTopic[0] = "Bind/ClearBindInfo_Respon"; + memoryData.ListSendTopic[0] = "Bind/ClearBindInfo"; + } + memoryData.ListSendTopic[2] = "Bind/SetBind"; memoryData.ListReceiveTopic[2] = "Bind/SetBind_Respon"; memoryData.ListReceiveResult[2] = receiveResult; @@ -419,9 +438,9 @@ if (memoryData.ListReceiveResult.Count == 1) { //璁惧缁戝畾鏈変笁鏉″懡浠� 绗竴鏉′负娓呯┖ - memoryData.ListReceiveResult.Insert(0, "{" + SetDouMarks("Result") + ": 0," + SetDouMarks("ResultRemark") + ": " + SetDouMarks("Success") + " }"); - memoryData.ListReceiveTopic.Insert(0, "Bind/ClearBindInfo_Respon"); - memoryData.ListSendTopic.Insert(0, "Bind/ClearBindInfo"); + memoryData.ListReceiveResult.Insert(0, string.Empty); + memoryData.ListReceiveTopic.Insert(0, string.Empty); + memoryData.ListSendTopic.Insert(0, string.Empty); memoryData.ListReceiveResult.Add(string.Empty); memoryData.ListReceiveTopic.Add(string.Empty); @@ -583,7 +602,7 @@ + SetDouMarks("Data_ID") + ": 100," + SetDouMarks("Data") + ": {" + SetDouMarks("Result") + ": 0," - + SetDouMarks("MacName") + ":" + macName+ "}" + + SetDouMarks("MacName") + ":" + SetDouMarks(macName) + "}" + "}"; memoryData.ListSendTopic[0] = "MacRename"; @@ -617,13 +636,13 @@ //璁惧杩斿洖鐨勭粨鏋� var receiveResult = "{" - + SetDouMarks("Device_ID") + ": 2," + + SetDouMarks("Device_ID") + ": " + (int)device.Type + "," + SetDouMarks("DeviceAddr") + ": " + SetDouMarks(device.DeviceAddr) + "," + SetDouMarks("Epoint") + ": " + device.DeviceEpoint + "," + SetDouMarks("Data_ID") + ": 96," + SetDouMarks("Data") + ": {" + SetDouMarks("Result") + ": 0," - + SetDouMarks("DeviceName") + ":" + deviceName + "}" + + SetDouMarks("DeviceName") + ":" + SetDouMarks(deviceName) + "}" + "}"; memoryData.ListSendTopic[0] = "DeviceRename"; -- Gitblit v1.8.0