From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 273 ++++++++++++++++++++----------------------------------
1 files changed, 101 insertions(+), 172 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index 90476ec..9572805 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -6,7 +6,6 @@
using Newtonsoft.Json.Linq;
using Shared;
using Shared.Common;
-using Shared.Common.ResponseEntity;
using Shared.Phone.UserCenter;
namespace ZigBee.Device
@@ -34,26 +33,30 @@
public string currentUserDisplayMethod = string.Empty;//褰撳墠鐢ㄦ埛鏄剧ず鏂瑰紡
//鏈湴鎵�鏈夎处鎴峰垪琛�
- public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ public List<Shared.Phone.MemberInfoRes> localAllAccountList = new List<Shared.Phone.MemberInfoRes> { };
+
/// <summary>
- /// 鏄惁甯稿紑妯″紡[褰撴暟鎹幏鍙栧け璐ワ紝杩斿洖绌篯
+ /// 鏄惁甯稿紑妯″紡
+ /// ture:甯稿紑锛� false:鍏抽棴
/// </summary>
- public Dictionary<string, bool> IsDoorLockNormallyMode = new Dictionary<string, bool> { };//鏄惁鍐荤粨瀛愯处鎴�
+ public bool IsDoorLockNormallyMode = false;
+ [Newtonsoft.Json.JsonIgnore]
public string LocalTempPassword = string.Empty;//鏈湴鐢熸垚鐨勪复鏃跺瘑鐮�
public Dictionary<string, bool> IsFreezeAccount = new Dictionary<string, bool> { };//鏄惁鍐荤粨瀛愯处鎴�
public Dictionary<string, bool> HasRemoteUnlockAccess = new Dictionary<string, bool> { };//鏄惁缁欏瓙璐︽埛鎷ユ湁杩滅▼寮�閿佺殑鏉′欢
public Dictionary<string, bool> IsFailedToGetDoorLockInfo = new Dictionary<string, bool> { };//鏄惁鑾峰彇闂ㄩ攣鏁版嵁澶辫触
+ [Newtonsoft.Json.JsonIgnore]
public string RemoteUnlockPassword = string.Empty;//杩滅▼寮�閿佸瘑鐮�
public static int RemoteUnlockCount = 5;//杩滅▼寮�閿佹鏁伴檺鍒�
public static int failedCount = 3;//杩滅▼寮�閿佸け璐ユ鏁�
- public static DateTime maxValue = DateTime.MaxValue;
public static DateTime minValue = DateTime.MinValue;
#region 涓存椂瀵嗙爜淇℃伅
/// <summary>
/// 鐢ㄦ埛绠＄悊鍙戦�佹暟鎹洖澶�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public TempPasswordObject tempPasswordObject;
/// <summary>
/// 涓存椂瀵嗙爜鏈湴瀵硅薄
@@ -472,15 +475,16 @@
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<GetDoorLockTempPasswordDataRes>>)(async () =>
{
GetDoorLockTempPasswordDataRes listInfo = null;
- var revertObj = await SendDoorLockToServer(RequestName, getDoorLockTempPasswordData);
- if (revertObj != null && revertObj.ResponseData != null)
- {
- var result = revertObj.ResponseData.ToString();
- if (result != null)
- {
- listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockTempPasswordDataRes>(result);
- }
- }
+ //鈽嗐優銉笺偗鈽�
+ //var revertObj = await SendDoorLockToServer(RequestName, getDoorLockTempPasswordData);
+ //if (revertObj != null && revertObj.ResponseData != null)
+ //{
+ // var result = revertObj.ResponseData.ToString();
+ // if (result != null)
+ // {
+ // listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockTempPasswordDataRes>(result);
+ // }
+ //}
return listInfo;
}));
}
@@ -593,15 +597,16 @@
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<GetDoorLockDataRes>>)(async () =>
{
GetDoorLockDataRes listInfo = null;
- var revertObj = await SendDoorLockToServer(RequestName, getDoorLockData);
- if (revertObj != null && revertObj.ResponseData != null)
- {
- var result = revertObj.ResponseData.ToString();
- if (result != null)
- {
- listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockDataRes>(result);
- }
- }
+ //鈽嗐優銉笺偗鈽�
+ //var revertObj = await SendDoorLockToServer(RequestName, getDoorLockData);
+ //if (revertObj != null && revertObj.ResponseData != null)
+ //{
+ // var result = revertObj.ResponseData.ToString();
+ // if (result != null)
+ // {
+ // listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDoorLockDataRes>(result);
+ // }
+ //}
return listInfo;
}));
}
@@ -613,7 +618,7 @@
/// <returns>鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑ResponsePack</returns>
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="obj">涓�涓被</param>
- public static async Task<ResponsePack> SendDoorLockToServer(string RequestName, object obj)
+ public static async Task<Shared.Phone.ResponsePack> SendDoorLockToServer(string RequestName, object obj)
{
try
{
@@ -621,21 +626,21 @@
var requestJson = JsonConvert.SerializeObject(obj);
var byteData = System.Text.Encoding.UTF8.GetBytes(requestJson);
byte[] result1 = null;
- //璁块棶鎺ュ彛
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ //璁块棶鎺ュ彛 //鈽嗐優銉笺偗鈽�
+ if (Shared.Phone.HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
- result1 = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
+ //result1 = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
}
else
{
- result1 = await CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
+ //result1 = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
}
if (result1 != null)
{
var result2 = Encoding.UTF8.GetString(result1);
if (result2 != null)
{
- var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResponsePack>(result2);
+ var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Phone.ResponsePack>(result2);
return result;
}
}
@@ -651,15 +656,13 @@
/// <summary>
/// 鑾峰彇瀛愯处鎴蜂俊鎭�
/// </summary>
- static List<Shared.Phone.UserCenter.MemberInfoRes> DoorLockAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
- public static async System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>> GetSubAccountByDistributedMark()
+ static List<Shared.Phone.MemberInfoRes> DoorLockAccountList = new List<Shared.Phone.MemberInfoRes> { };
+ public static async System.Threading.Tasks.Task<List<Shared.Phone.MemberInfoRes>> GetSubAccountByDistributedMark()
{
DoorLockAccountList.Clear();
- return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>>>)(async () =>
+ return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.MemberInfoRes>>>)(async () =>
{
- var pra = new Shared.Phone.UserCenter.MemberListInfoPra();
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
- var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Shared.Phone.UserCenter.MemberInfoRes>>(result);
+ var listInfo = Shared.Phone.HdlMemberLogic.Current.GetMemberListInfo();
return listInfo;
}));
}
@@ -682,6 +685,7 @@
/// <summary>
/// 闂ㄩ攣鎿嶄綔浜嬩欢閫氱煡
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public DoorLockOperatingEventNotificationCommand doorLockOperatingEventNotificationCommand;
/// <summary>
/// 闂ㄩ攣鎿嶄綔浜嬩欢閫氱煡
@@ -932,6 +936,7 @@
/// <summary>
/// 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public DoorLockProgrammingEventNotificationCommand doorLockProgrammingEventNotificationCommand;
/// <summary>
/// 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
@@ -983,8 +988,8 @@
/// <summary>
/// 鐭闂ㄩ攣鏃堕棿
/// </summary>
- /// <returns>The writable value async.</returns>
- /// <param name="timestamp">鐭闂ㄩ攣鐨勬椂闂�</param>
+ /// <param name="timestamp"></param>
+ /// <returns></returns>
public async System.Threading.Tasks.Task<SetWritableValueResponAllData> RectifyDoorLockTimeAsync(int timestamp)
{
if (Gateway == null)
@@ -1001,8 +1006,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1016,7 +1020,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -1062,50 +1065,6 @@
});
}
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
- public SetWritableValueResponAllData setWritableValueResponAllData;
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
- [System.Serializable]
- public class SetWritableValueResponAllData
- {
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅
- /// </summary>
- public SetWritableValueResponData setWritableValueResponData;
- }
-
- /// <summary>
- /// 璁剧疆鍙啓灞炴�х殑鍊肩殑鏁版嵁
- /// </summary>
- [System.Serializable]
- public class SetWritableValueResponData
- {
- /// <summary>
- /// 閰嶇疆灞炴�ф墍鍦ㄧ殑cluster
- /// </summary>
- public int Cluster;
- /// <summary>
- /// 0锛氶厤缃垚鍔燂紙鑻ラ厤缃垚鍔燂紝涓嬮潰鐨凙ttributeId瀛楁涓嶅瓨鍦級
- ///<para>134锛氫笉鏀寔璇ュ睘鎬�</para>
- ///<para>135锛氭棤鏁堢殑灞炴�у��</para>
- ///<para>141锛氭棤鏁堢殑鏁版嵁绫诲瀷</para>
- /// </summary>
- public int Status;
-
- }
#endregion
#endregion
@@ -1133,8 +1092,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1148,18 +1106,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
- {
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ {
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1376,7 +1333,6 @@
/// <summary>
/// 鐢ㄦ埛绠＄悊鍙戦�佹暟鎹洖澶�
/// </summary>
- public DefaultControlResponseAllData defaultControlResponseAllData;
[System.Serializable]
public class DefaultControlResponseAllData
{
@@ -1474,8 +1430,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1489,18 +1444,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new VerifyPasswordResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 12)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1580,7 +1534,6 @@
/// <summary>
/// 鐢ㄦ埛绠＄悊鍙戦�佹暟鎹洖澶�
/// </summary>
- public VerifyPasswordResponseAllData verifyPasswordResponseAllData;
[System.Serializable]
public class VerifyPasswordResponseAllData
{
@@ -1624,8 +1577,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1650,18 +1602,17 @@
}
else if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new RemoteResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1754,7 +1705,6 @@
/// <summary>
/// 杩滅▼鍥炲鏁版嵁
/// </summary>
- public RemoteResponseAllData remoteResponseAllData;
[System.Serializable]
public class RemoteResponseAllData
{
@@ -1819,8 +1769,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1834,18 +1783,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new TempPasswordResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1947,7 +1895,6 @@
/// <summary>
/// 涓存椂瀵嗙爜鍥炲鏁版嵁
/// </summary>
- public TempPasswordResponseAllData tempPasswordResponseAllData;
[System.Serializable]
public class TempPasswordResponseAllData
{
@@ -2032,8 +1979,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2048,18 +1994,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new KeyPasswordInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 20)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2374,8 +2319,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2389,18 +2333,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new VolumeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 14)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2408,7 +2351,7 @@
{
var tempD = new VolumeResponseData();
tempD.command = data[10].ToString() + data[11].ToString();
- tempD.value = Convert.ToInt32(data[13].ToString(), 16);
+ tempD.value = Convert.ToInt32(data[12].ToString() + data[13].ToString(), 16);
result = new VolumeResponseAllData { volumeResponseData = tempD };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0456_{ topic}");
}
@@ -2455,10 +2398,7 @@
///<summary >
///闊抽噺
///<para>鍛戒护鍊�: comandValue</para>
- ///<para>comandValue: 0 闈欓煶</para>
- ///<para>comandValue:1 鏈�灏忛煶閲�</para>
- ///<para>comandValue:2~13 闊抽噺 </para>
- ///<para>comandValue:14 鏈�澶ч煶閲�</para>
+ ///<para>comandValue: 0-0x64 闊抽噺</para>
/// </summary>
public async System.Threading.Tasks.Task<DefaultControlResponseAllData> SetVolumeAsync(int comandValue)
{
@@ -2477,8 +2417,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2492,18 +2431,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2560,10 +2498,7 @@
/// <summary>
/// 闊抽噺鍙戦�佹暟鎹�
- ///<para>comandValue: 0 闈欓煶</para>
- ///<para>comandValue:1 鏈�灏忛煶閲�</para>
- ///<para>comandValue:2~13 闊抽噺 </para>
- ///<para>comandValue:14 鏈�澶ч煶閲�</para>
+ ///<para>comandValue: 0-100 闊抽噺</para>
/// </summary>
public string VolumeData(int comandValue)
{
@@ -2578,16 +2513,16 @@
{
if (comandValue >= 1)
{
- //comandValue = comandValue * 100;
- //float v = (float)100 / 15;
- //int vv = Convert.ToInt32(v * 100);
- //var comandValueTemp = comandValue / vv;
- //if (comandValueTemp == 0)
- //{
- // comandValueTemp = 1;
- //}
cValue = Convert.ToString(comandValue, 16).ToUpper();
- cValue = "F" + cValue;
+ if (cValue.Length == 1)
+ {
+ cValue = "0" + cValue;
+ }
+ else
+ {
+ cValue = cValue;
+ }
+
}
else
{
@@ -2614,7 +2549,6 @@
/// <summary>
/// 闊抽噺鍥炲鏁版嵁
/// </summary>
- public VolumeResponseAllData volumeResponseAllData;
[System.Serializable]
public class VolumeResponseAllData
{
@@ -2677,8 +2611,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2692,18 +2625,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new OpenModeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 12)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2775,8 +2707,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2790,18 +2721,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2903,7 +2833,6 @@
/// <summary>
/// 甯稿紑妯″紡聽鍥炲鏁版嵁
/// </summary>
- public OpenModeResponseAllData openModeResponseAllData;
[System.Serializable]
public class OpenModeResponseAllData
{
--
Gitblit v1.8.0