~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -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, <!-- 网关在云端Emq是否在线 -->
			public string AesKey;// : "a5d8da8a-ddea-48", <!-- 与此网关在云端Emq通信时，负载加解的16位Aes密钥 -->
			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)
			{
			@@ -2758,8 +2746,8 @@
			.WithTcpServer(domain, int.Parse(port))
			.WithCredentials(connEmqUserName, connEmqPwd)
			.WithKeepAlivePeriod(TimeSpan.FromSeconds(20))
			.WithCleanSession()
			//.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
			.WithCleanSession()
			//.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
			.Build();
			await DisConnectRemoteMqttClient("StartRemoteMqtt");
			await RemoteMqttClient.ConnectAsync(options, CancellationToken.None);
			@@ -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;
			@@ -3184,44 +3195,31 @@
			{
			jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
			}

			#region 设备状态上报【奇怪，为什么放在原来的位置会不执行这块代码》？？？】
			if (topic == gatewayID + "/" + "DeviceStatusReport" + "/" + addr + "/" + epoint + "/" + cluID + "/" + attrId)
			{
			var deviceID = jobject.Value<int>("Device_ID");
			var deviceAddr = jobject.Value<string>("DeviceAddr");
			var tempEpoint = jobject.Value<int>("Epoint");
			var dataId = jobject.Value<int>("Data_ID");

			var tempDevice = new CommonDevice { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint };
			tempDevice.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceStatusReportData>(jobject["Data"].ToString());
			UpdateDeviceInfo(tempDevice, "DeviceStatusReport");
			}
			#endregion

			#region 远程,主网关上报通知
			else if (IsRemote)
			if (IsRemote)
			{
			if (topic == gatewayID + "/" + "BeMainGw_Report")
			{
			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;
			}
			}
			}
			}
			}

			#endregion

			#region 设备在线状态更新反馈
			@@ -3250,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)
			{
			@@ -3273,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)
			{
			@@ -3375,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)
			@@ -3393,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)
			@@ -3411,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)
			@@ -3429,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)
			{
			@@ -3446,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)
			{
			@@ -3463,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)
			{
			@@ -3524,13 +3522,13 @@
			public static void DebugPrintLog(string msg, bool flage = true)
			{
			#if DEBUG
			//if (flage == true)
			//{
			//if (msg.Contains("DeviceStatusReport") == false)
			//{
			System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
			// }
			// }
			if (flage == true)
			{
			//if (msg.Contains("DeviceStatusReport") == false)
			{
			System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
			}
			}
			#endif
			}