From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
index 1cd0f07..e92d774 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
@@ -67,6 +67,8 @@
{
var reResult = new ReceiptGatewayResult();
reResult.listReceiptData = new string[listReceiptTopic.Count];
+ reResult.JsonData = new string[listReceiptTopic.Count];
+
var myGateway = device.Gateway;
if (myGateway == null)
{
@@ -120,6 +122,12 @@
return;
}
reResult.listReceiptData[i] = jobject["Data"].ToString();
+ if (jobject.Property("Time") != null)
+ {
+ //闇�瑕佺Щ闄ime杩欎釜瀛楁
+ jobject.Remove("Time");
+ }
+ reResult.JsonData[i] = jobject.ToString();
receiptCount++;
}
}
@@ -151,7 +159,6 @@
{
//濡傛灉鍙湁涓�涓富棰�,鍒欐浛鎹㈠彉閲�
reResult.ReceiptData = reResult.listReceiptData[0];
- reResult.listReceiptData = null;
}
}
@@ -166,8 +173,10 @@
/// <param name="receiptCommand">鎸囧畾鎺ユ敹鍛戒护绗�</param>
/// <param name="receiptDataLength">鎸囧畾鎺ユ敹鏁版嵁鐨勯暱搴�</param>
/// <param name="waitTime">瓒呮椂鏃堕棿(绉�)</param>
+ /// <param name="listReceiptLength">闄勫姞妫�娴嬫暟鎹帴鏀堕暱搴�,褰撴帴鏀剁殑闀垮害鍦ㄨ繖鍒楄〃閲岄潰鏃�,浠ｈ〃鎺ユ敹鎴愬姛(鏃ㄥ湪瀵瑰簲鏂版棫璁惧,閫忎紶鍥炲鐨勯暱搴﹀彲鑳戒笉鍚�)</param>
/// <returns>缃戝叧杩斿洖鐨勬暟鎹�</returns>
- public ReceiptGatewayResult SendJobjectDataToGateway2(CommonDevice device, string sendData, string receiptCommand, int receiptDataLength, int waitTime = 5)
+ public ReceiptGatewayResult SendJobjectDataToGateway2(CommonDevice device, string sendData, string receiptCommand, int receiptDataLength,
+ int waitTime = 5, List<int> listReceiptLength = null)
{
var reResult = new ReceiptGatewayResult();
var myGateway = device.Gateway;
@@ -217,18 +226,36 @@
}
var responseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- //闀垮害涓�鑷�
- if (responseData.PassData.Length == receiptDataLength)
+ //闀垮害涓嶄竴鑷�
+ if (responseData.PassData.Length != receiptDataLength)
{
- var command = responseData.PassData[4].ToString()
- + responseData.PassData[5].ToString()
- + responseData.PassData[2].ToString()
- + responseData.PassData[3].ToString();
- //骞朵笖鏄繖涓懡浠�
- if (command == receiptCommand)
+ if (listReceiptLength == null)
{
- reResult.ReceiptData = responseData.PassData;
+ //濡傛灉娌℃湁闄勫姞妫�娴嬮暱搴�,鍒欑洿鎺ヨ繑鍥�
+ return;
}
+ if (listReceiptLength.Contains(responseData.PassData.Length) == false)
+ {
+ //濡傛灉闄勫姞鐨勬娴嬮暱搴﹂噷闈�,杩樹笉瀛樺湪鐨勮瘽,鐩存帴杩斿洖
+ return;
+ }
+ }
+
+ var command = responseData.PassData[4].ToString()
+ + responseData.PassData[5].ToString()
+ + responseData.PassData[2].ToString()
+ + responseData.PassData[3].ToString();
+ //骞朵笖鏄繖涓懡浠�
+ if (command == receiptCommand)
+ {
+ reResult.ReceiptData = responseData.PassData;
+ reResult.JsonData = new string[1];
+ if (jobject.Property("Time") != null)
+ {
+ //闇�瑕佺Щ闄ime杩欎釜瀛楁
+ jobject.Remove("Time");
+ }
+ reResult.JsonData[0] = jobject.ToString();
}
}
};
--
Gitblit v1.8.0