From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 117 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index f8b36df..9ff57e4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -31,19 +31,7 @@
{
get
{
- return GateWayList.Find((obj) => { return obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId && obj.getGatewayBaseInfo.IsMainGateWay; });
- }
- }
-
- /// <summary>
- /// 涓荤綉鍏�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public bool IsMainGateWay
- {
- get
- {
- return getGatewayBaseInfo != null && getGatewayBaseInfo.IsMainGateWay;
+ return GateWayList.Find((obj) => { return obj.HomeId == Shared.Common.Config.Instance.HomeId && obj.IsMainGateWay; });
}
}
@@ -68,7 +56,7 @@
{
get
{
- var fileName = "Gateway_" + DeviceType.ZbGateway.ToString() + "_" + this.getGatewayBaseInfo?.gwID;
+ var fileName = "Gateway_" + DeviceType.ZbGateway.ToString() + "_" + this.GwId;
return fileName;
}
}
@@ -551,7 +539,6 @@
{
await System.Threading.Tasks.Task.Run(async () =>
{
- CommonDevice commonDev = null;
Action<string, string> action1 = (topic, message) => { };
Actions += action1;
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 94 } };
@@ -2413,6 +2400,11 @@
{
DebugPrintLog($" 鏈湴杩炴帴鎴愬姛_缃戝叧IP:{brokerName}_缃戝叧鏄惁鍔�:{IsEncry}_褰撳墠瀵嗙爜:{Password}");
IsRemote = false;
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, "鏈湴杩炴帴鎴愬姛");
+ }
});
}
@@ -2452,7 +2444,12 @@
}
}
catch (Exception ex)
- {
+ {
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, "鏈湴杩炴帴寮傚父:\r\n" + ex.Message);
+ }
DebugPrintLog($"灞�鍩熺綉閫氳杩炴帴鍑哄紓甯�:{ex.Message}");
}
finally
@@ -2462,17 +2459,10 @@
});
}
- class GateWayBaseInfomation
- {
- //public string GatewayUniqueId;//"Emq缃戝叧1", <!-- 缃戝叧Mac -->
- public bool MqttOnlineStatus;//: true, <!-- 缃戝叧鍦ㄤ簯绔疎mq鏄惁鍦ㄧ嚎 -->
- public string AesKey;// : "a5d8da8a-ddea-48", <!-- 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜 -->
- public string MacMark;//: "61eaa0ea-4812-4a7a-86d6-3098c61e64ed" <!-- 缃戝叧瀵瑰簲鐨勫敮涓�鐮� -->
- }
/// <summary>
/// 褰撳墠鏈夊笎鍙蜂笅鎵�鏈夌殑缃戝叧鍒楄〃鍙婁俊鎭�
/// </summary>
- static Dictionary<string, GateWayBaseInfomation> GateWayBaseInfomations = new Dictionary<string, GateWayBaseInfomation> { };
+ public static Dictionary<string, Shared.Phone.UserCenter.GatewayResult> GateWayBaseInfomations = new Dictionary<string, Shared.Phone.UserCenter.GatewayResult> { };
/// <summary>
/// 鑾峰彇褰撳墠甯愬彿鎵�鏈夌殑缃戝叧淇℃伅
/// </summary>
@@ -2495,9 +2485,7 @@
MainAccountId = Config.Instance.Home.MainUserDistributedMark,
SharedHid = Config.Instance.Home.Id
};
-
- var listNotShow = new List<string>() { "NotSetAgain" };
- var resultData = await Shared.Phone.UserCenter.UserCenterLogic.GetByteResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra, listNotShow);
+ var resultData = Shared.Phone.UserCenter.UserCenterLogic.GetByteResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra, new List<string> { "NotCheck" });
if (resultData == null)
{
return;
@@ -2518,7 +2506,7 @@
pra2.ReqDto.LoginAccessToken = loginToken;
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(pra2));
- var result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSingleHomeGatewayPagger", bytes, loginToken);
+ var result = CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSingleHomeGatewayPagger", bytes, loginToken);
if (result != null)
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(Encoding.UTF8.GetString(result));
@@ -2543,7 +2531,7 @@
var list = JArray.Parse(responseData["PageData"].ToString());
foreach (var v in list)
{
- GateWayBaseInfomations[v["GatewayUniqueId"].ToString()] = new GateWayBaseInfomation { AesKey = v["AesKey"].ToString(), MacMark = v["MacMark"].ToString(), MqttOnlineStatus = bool.Parse(v["MqttOnlineStatus"].ToString()) };
+ GateWayBaseInfomations[v["GatewayUniqueId"].ToString()] = new Shared.Phone.UserCenter.GatewayResult { AesKey = v["AesKey"].ToString(), MacMark = v["MacMark"].ToString(), MqttOnlineStatus = bool.Parse(v["MqttOnlineStatus"].ToString()) };
//if (RemoteMqttClient.IsConnected)
{
await RemoteMqttClient.SubscribeAsync($"/ZigbeeGateWayToClient/{v["MacMark"].ToString()}/#", MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce);
@@ -2652,12 +2640,12 @@
await initGateWayBaseInfomation();
//娌℃湁涓荤綉鍏虫椂涓诲姩璇诲彇锛岃幏鍙栦富缃戝叧淇℃伅
- var gateWayList = GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);
- if (gateWayList.Find(obj => obj.getGatewayBaseInfo.IsMainGateWay == true) == null)
+ var gateWayList = GateWayList.FindAll(obj => obj.HomeId == Shared.Common.Config.Instance.HomeId);
+ if (gateWayList.Find(obj => obj.IsMainGateWay == true) == null)
{
if (gateWayList.Count == 1)
{
- gateWayList[0].getGatewayBaseInfo.IsMainGateWay = true;
+ gateWayList[0].IsMainGateWay = true;
}
else
{
@@ -2673,13 +2661,13 @@
{
for (int j = 0; j < gateWayList.Count; j++)
{
- if (gateWayList[i].getGatewayBaseInfo.gwID == info.getGwData.GwId)
+ if (gateWayList[i].GwId == info.getGwData.GwId)
{
- gateWayList[i].getGatewayBaseInfo.IsMainGateWay = true;
+ gateWayList[i].IsMainGateWay = true;
}
else
{
- gateWayList[i].getGatewayBaseInfo.IsMainGateWay = false;
+ gateWayList[i].IsMainGateWay = false;
}
}
break;
@@ -2708,7 +2696,7 @@
["PublishPayloadJsonStr"] = "1"
};
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
- result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);
+ result = CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);
}
else
{
@@ -2725,7 +2713,7 @@
["PublishPayloadJsonStr"] = "1"
};
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
- result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/ShareMemberConnMqttInfo", bytes, Config.Instance.Token);
+ result = CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/ShareMemberConnMqttInfo", bytes, Config.Instance.Token);
}
if (result != null)
{
@@ -2858,11 +2846,11 @@
{
try
{
- if (this.getGatewayBaseInfo?.gwID == null || !GateWayBaseInfomations.ContainsKey(this.getGatewayBaseInfo?.gwID))
+ if (this.GwId == string.Empty || !GateWayBaseInfomations.ContainsKey(this.GwId))
{
return;
}
- var gateWayBaseInfomation = GateWayBaseInfomations[this.getGatewayBaseInfo?.gwID];
+ var gateWayBaseInfomation = GateWayBaseInfomations[this.GwId];
message = SecuritySet.AesEncryptBytes(message, gateWayBaseInfomation.AesKey);
var topicEncStr = $"/ClientToZigbeeGateWay/{gateWayBaseInfomation.MacMark}/Common/{topicName}";
//(6)鏋勫缓Mqtt闇�瑕佸彂甯冪殑鏁版嵁鍖�,鍙戝竷缁欎簯绔殑MqttBroker
@@ -2902,6 +2890,16 @@
if (Shared.Common.Config.Instance.HomeId == "")
{
return;
+ }
+
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ string text = "杩滅▼鍙戦��:";
+ if (IsRemote == false) { text = "鏈湴鍙戦��:"; }
+ text += topic + "\r\n";
+ text += Encoding.UTF8.GetString(message) + "\r\n";
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, text);
}
if (IsRemote)
@@ -2936,6 +2934,11 @@
{
DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_鏄惁鍔犲瘑:{IsEncry}");
await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
+ }
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, "鏈湴杩炴帴寮傚父鏂紑");
}
}
}
@@ -3152,10 +3155,18 @@
attrId = topic.Split('/')[5];
}
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ string text = "缃戝叧鍥炲:" + topic + "\r\n";
+ text += message + "\r\n";
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, text);
+ }
+
//鍏ㄥ眬鎺ユ敹缃戝叧鎺ㄩ�佺殑鐨勯�昏緫(涓轰簡鎵ц閫熷害,灏藉彲鑳界殑鍒姞鑰楁椂鐨勬搷浣�)
Shared.Phone.UserCenter.HdlGatewayReceiveLogic.Current.GatewayOverallMsgReceive(gatewayID, topic, reportStatus, message);
- var gwa = GateWayList.Find(obj => obj.getGatewayBaseInfo.gwID == gatewayID);
+ var gwa = GateWayList.Find(obj => obj.GwId == gatewayID);
if (gwa == null)
{
return;
@@ -3193,16 +3204,16 @@
var gwData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GetGwData>(jobject["Data"].ToString());
if (gwData != null)
{
- var gwList = GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);
+ var gwList = GateWayList.FindAll(obj => obj.HomeId == Shared.Common.Config.Instance.HomeId);
for (int i = 0; i < gwList.Count; i++)
{
- if (gwList[i].getGatewayBaseInfo.gwID == gatewayID)
+ if (gwList[i].GwId == gatewayID)
{
- gwList[i].getGatewayBaseInfo.IsMainGateWay = true;
+ gwList[i].IsMainGateWay = true;
}
else
{
- gwList[i].getGatewayBaseInfo.IsMainGateWay = false;
+ gwList[i].IsMainGateWay = false;
}
}
}
@@ -3237,7 +3248,7 @@
switch ((DeviceType)(deviceID))
{
case DeviceType.DoorLock:
- var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
+ var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.GwId };
var OperatingEventNotificationDatad = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockOperatingEventNotificationCommand>(jobject["Data"].ToString());
if (OperatingEventNotificationDatad != null)
{
@@ -3260,7 +3271,7 @@
switch ((DeviceType)(deviceID))
{
case DeviceType.DoorLock:
- var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
+ var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.GwId };
var ProgrammingEventNotificationData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockProgrammingEventNotificationCommand>(jobject["Data"].ToString());
if (ProgrammingEventNotificationData != null)
{
@@ -3362,7 +3373,7 @@
#region 闃插尯琚Е鍙戞椂鎶ュ憡
else if (topic == gatewayID + "/" + "Security/ZoneTriggerReport")
{
- var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
+ var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
ias.zoneTriggerReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.ZoneTriggerReportData>(jobject["Data"].ToString());
if (ias.zoneTriggerReportData == null)
@@ -3380,7 +3391,7 @@
#region 閫昏緫琚皟鐢ㄥ弽棣�
else if (topic == gatewayID + "/" + "Logic/Execute_Respon")
{
- //var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
+ //var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
//logic.logicExecuteRespo = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic.ExecuteResponse>(jobject["Data"].ToString());
//if (logic.logicExecuteRespo == null)
@@ -3398,7 +3409,7 @@
#region 鏃堕棿鐐规潯浠舵帹杩熸墽琛�
else if (topic == gatewayID + "/" + "Logic/TimingWillArrive")
{
- //var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
+ //var logic = new Logic() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
//logic.timingWillArriveData = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic.TimingWillArriveData>(jobject["Data"].ToString());
//if (logic.timingWillArriveData == null)
@@ -3416,7 +3427,7 @@
#region 妯″紡瀹夐槻鍔ㄤ綔琚渶缁堟縺娲绘椂鍙戦�佹姤璀︿俊鎭�
else if (topic == gatewayID + "/" + "Security/ModeTriggerReport")
{
- var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
+ var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
ias.modeTriggerReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.ModeTriggerReportData>(jobject["Data"].ToString());
if (ias.modeTriggerReportData == null)
{
@@ -3433,7 +3444,7 @@
#region 閫氳繃澶栭儴鏂瑰紡甯冮槻鎾ら槻鎴愬姛鏃舵姤鍛婃伅
else if (topic == gatewayID + "/" + "Security/EnOrWithdrawSucceedReport")
{
- var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
+ var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
ias.enOrWithdrawSucceedReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.EnOrWithdrawSucceedReportData>(jobject["Data"].ToString());
if (ias.enOrWithdrawSucceedReportData == null)
{
@@ -3450,7 +3461,7 @@
#region 鑳佽揩瀵嗙爜鎾ら槻鏃剁煭淇℃帹閫�
else if (topic == gatewayID + "/" + "Security/PushTargetInfo")
{
- var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.getGatewayBaseInfo.gwID };
+ var ias = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = gwa.GwId };
ias.coercedPWDWithdrawReportData = Newtonsoft.Json.JsonConvert.DeserializeObject<Safeguard.CoercedPWDWithdrawReportData>(jobject["Data"].ToString());
if (ias.coercedPWDWithdrawReportData == null)
{
@@ -3513,7 +3524,7 @@
#if DEBUG
if (flage == true)
{
- if (msg.Contains("DeviceStatusReport") == false)
+ //if (msg.Contains("DeviceStatusReport") == false)
{
System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
}
--
Gitblit v1.8.0