~wxr/HDL_APP_Project.git

			@@ -65,45 +65,83 @@
			/// </summary>
			public bool IsSearchLocalGatewaySuccessful = false;

			///// <summary>
			/////
			///// </summary>
			//bool _gatewayOnline1 = false;
			///// <summary>
			///// 网关是否在线
			///// </summary>
			//public bool GatewayOnline1
			//{
			// get
			// {
			// return _gatewayOnline;
			// }
			// set
			// {
			// if (_gatewayOnline != value)
			// {
			// if(value)
			// {
			// if (IsRemote)//如果是远程
			// {
			// if(DB_ResidenceData.Instance.HomeGateway == null)
			// {
			// return;
			// }
			// if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//远程情况下，网关未链接服务器不能修改主页网关状态
			// {
			// new System.Threading.Thread(() => {
			// System.Threading.Thread.Sleep(3000);
			// var pm = new DAL.Server.HttpServerRequest();
			// pm.GetGatewayInfo();
			// }) { IsBackground = true }.Start();
			// return;
			// }
			// }
			// _gatewayOnline = value;
			// //修改主页连接状态
			// HomePage.LoadEvent_CheckLinkStatus();
			// MainPage.Log($"网关在线，刷新设备状态");
			// new System.Threading.Thread(() =>
			// {
			// System.Threading.Thread.Sleep(1000);
			// FunctionList.List.ReadAllFunctionStatus();
			// })
			// { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
			// }
			// else
			// {
			// _gatewayOnline = value;
			// //修改主页连接状态
			// HomePage.LoadEvent_CheckLinkStatus();
			// }
			// }
			// }
			//}


			bool _GatewayOnline_Local = false;
			/// <summary>
			///
			/// 网关在线-局域网
			/// </summary>
			bool _gatewayOnline = false;
			/// <summary>
			/// 网关是否在线
			/// </summary>
			public bool GatewayOnline
			public bool GatewayOnline_Local
			{
			get
			{
			return _gatewayOnline;
			return _GatewayOnline_Local;
			}
			set
			{
			if (_gatewayOnline != value)
			if (_GatewayOnline_Local != value)
			{
			if(value)
			_GatewayOnline_Local = value;
			if (value)
			{
			if (IsRemote)//如果是远程
			{
			if(DB_ResidenceData.Instance.HomeGateway == null)
			{
			return;
			}
			if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//远程情况下，网关未链接服务器不能修改主页网关状态
			{
			new System.Threading.Thread(() => {
			System.Threading.Thread.Sleep(3000);
			var pm = new DAL.Server.HttpServerRequest();
			pm.GetGatewayInfo();
			}) { IsBackground = true }.Start();
			return;
			}
			}
			_gatewayOnline = value;
			//修改主页连接状态
			HomePage.LoadEvent_CheckLinkStatus();
			MainPage.Log($"网关在线，刷新设备状态");
			MainPage.Log($"网关局域网在线，刷新设备状态");
			new System.Threading.Thread(() =>
			{
			System.Threading.Thread.Sleep(1000);
			@@ -113,13 +151,68 @@
			}
			else
			{
			_gatewayOnline = value;
			//修改主页连接状态
			HomePage.LoadEvent_CheckLinkStatus();
			}
			}
			}
			}
			bool _GatewayOnline_Cloud = false;
			/// <summary>
			/// 网关在线-云端
			/// </summary>
			public bool GatewayOnline_Cloud
			{
			get
			{
			return _GatewayOnline_Cloud;
			}
			set
			{
			if (_GatewayOnline_Cloud != value)
			{
			_GatewayOnline_Cloud = value;
			if(GatewayOnline_Local)
			{
			return;
			}
			if (value)
			{
			if (DB_ResidenceData.Instance.HomeGateway == null)
			{
			return;
			}
			if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//远程情况下，网关未链接服务器不能修改主页网关状态
			{
			new System.Threading.Thread(() =>
			{
			System.Threading.Thread.Sleep(3000);
			var pm = new DAL.Server.HttpServerRequest();
			pm.GetGatewayInfo();
			})
			{ IsBackground = true }.Start();
			return;
			}
			//修改主页连接状态
			HomePage.LoadEvent_CheckLinkStatus();
			MainPage.Log($"网关云端在线，刷新设备状态");
			new System.Threading.Thread(() =>
			{
			System.Threading.Thread.Sleep(1000);
			FunctionList.List.ReadAllFunctionStatus();
			})
			{ IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
			}
			else
			{
			//修改主页连接状态
			HomePage.LoadEvent_CheckLinkStatus();
			}
			}
			}
			}


			/// <summary>
			/// 网关通讯ID
			/// </summary>
			@@ -128,7 +221,7 @@
			/// <summary>
			/// 是否为远程连接
			/// </summary>
			public bool IsRemote = false;
			//public bool IsRemote = false;
			/// <summary>
			/// 通讯地址IP
			/// </summary>
			@@ -197,21 +290,18 @@
			{
			return;
			}
			Ins.GatewayOnline_Local = false;
			var ggg = DB_ResidenceData.Instance.GatewayType == 0 ? "一端口" : "A网关";
			var ggg1 = MainPage.InternetStatus == 1 ? "4G" : "wifi";
			MainPage.Log($"搜索网关列表，网关类型:{ggg};网络类型:{ggg1}");
			if (MainPage.InternetStatus == 0)
			{
			Ins.GatewayOnline = false;
			Ins.GatewayOnline_Cloud = false;
			return;
			}
			else if (MainPage.InternetStatus == 1)
			{
			//if (!Ins.IsRemote)
			{
			//Ins.IsRemote = true;
			DAL.Mqtt.MqttClient.InitState();
			}
			DAL.Mqtt.MqttClient.InitState();
			}
			else if (MainPage.InternetStatus == 2)
			{
			@@ -224,7 +314,10 @@
			for (int i = 0; i < 5; i++)
			{
			if (IsSearchLocalGatewaySuccessful)
			{
			Ins.GatewayOnline_Local = true;
			break;
			}
			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			new Control_Udp().ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
			@@ -236,15 +329,7 @@
			System.Threading.Thread.Sleep(500);
			}

			if (!IsSearchLocalGatewaySuccessful)
			{
			//本地搜索不到网关
			if (!Ins.IsRemote)
			{
			Ins.IsRemote = true;
			DAL.Mqtt.MqttClient.InitState();
			}
			}
			DAL.Mqtt.MqttClient.InitState();
			})
			{ IsBackground = true }.Start();
			}
			@@ -255,7 +340,7 @@
			/// </summary>
			public void ControlScene(Scene scene)
			{
			if (Ins.IsRemote \|\| DB_ResidenceData.Instance.GatewayType == 1)
			if (!Ins.GatewayOnline_Local \|\| DB_ResidenceData.Instance.GatewayType == 1)
			{
			new System.Threading.Thread(() =>
			{
			@@ -321,8 +406,8 @@
			break;
			}

			//远程通讯
			if (Ins.IsRemote \|\| useRemote == true)
			//远程通讯 --涂鸦设备必须需要远程
			if (useRemote == true)
			{
			DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
			//ALink控制、Bus控制使用同一个接口控制，由云端负责解析
			@@ -331,30 +416,54 @@
			actionObjs.Add(apiControlData);
			var pack = httpServer.ControlDevice(actionObjs);
			}
			//本地通讯
			else
			{
			//Bus控制
			if (DB_ResidenceData.Instance.GatewayType == 0)
			////远程通讯
			//if (Ins.GatewayOnline_Local == false && Ins.GatewayOnline_Cloud == true)
			//{
			// DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
			// //ALink控制、Bus控制使用同一个接口控制，由云端负责解析
			// var apiControlData = function.GetApiControlData(commandDictionary);
			// var actionObjs = new List<ApiAlinkControlActionObj>();
			// actionObjs.Add(apiControlData);
			// var pack = httpServer.ControlDevice(actionObjs);
			//}
			//本地通讯
			if (Ins.GatewayOnline_Local)
			{
			try
			//Bus控制
			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			new Control_Udp().WriteBusData(function, commandDictionary);
			try
			{
			new Control_Udp().WriteBusData(function, commandDictionary);
			}
			catch (Exception ex)
			{
			MainPage.Log($"发送数据异常: {ex.Message}");
			}
			}
			catch (Exception ex)
			//ALink控制
			else
			{
			MainPage.Log($"发送数据异常: {ex.Message}");
			var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
			var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
			var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
			new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id);
			MainPage.Log($"本地通讯发送HDL-Link数据:{functionControlDataJson}");
			}
			}
			//ALink控制
			//远程通讯
			else
			{
			var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
			var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
			var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
			new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id);
			MainPage.Log($"本地通讯发送HDL-Link数据:{functionControlDataJson}");
			DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
			//ALink控制、Bus控制使用同一个接口控制，由云端负责解析
			var apiControlData = function.GetApiControlData(commandDictionary);
			var actionObjs = new List<ApiAlinkControlActionObj>();
			actionObjs.Add(apiControlData);
			var pack = httpServer.ControlDevice(actionObjs);
			}

			}
			}
			/// <summary>
			@@ -428,13 +537,9 @@
			public void SendReadCommand(Function function)
			{
			function.refreshTime = DateTime.Now;
			if (Ins.IsRemote)
			if (Ins.GatewayOnline_Local)
			{
			var pm = new DAL.Server.HttpServerRequest();
			var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
			}
			else
			{

			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			try
			@@ -466,6 +571,11 @@
			new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);
			}
			}
			else
			{
			var pm = new DAL.Server.HttpServerRequest();
			var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
			}
			}
			///// <summary>
			///// 发送A协议读取命令
			@@ -489,7 +599,7 @@
			/// <param name="scene"></param>
			static void ControlAProtocolScene(Scene scene)
			{
			if (Ins.IsRemote)
			if (!Ins.GatewayOnline_Local)//网关本地不在线
			{
			//云端做处理发送一端口场景
			//if (DB_ResidenceData.Instance.GatewayType == 0)
			@@ -572,7 +682,7 @@
			}
			}

			MainPage.Log($"time 1 :{receiveObj.Topic}");
			MainPage.Log($"局域网信息: {receiveObj.Topic}");


			//验证有效数据长度
			@@ -594,8 +704,8 @@
			if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
			{
			MainPage.Log("本地搜索网关成功");
			Control.Ins.IsSearchLocalGatewaySuccessful = true;
			Ins.GatewayOnline = true;
			Ins.IsSearchLocalGatewaySuccessful = true;
			Ins.GatewayOnline_Local = true;
			if (!string.IsNullOrEmpty(device.gatewayId))
			{
			Ins.GatewayId = device.gatewayId;
			@@ -605,7 +715,6 @@
			Ins.GatewayId = device.device_mac;
			}
			reportIp = "239.0.168.188";// device.ip_address;
			Ins.IsRemote = false;
			}
			}
			else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" \|\|
			@@ -624,9 +733,17 @@
			/// A协议数据
			/// </summary>
			/// <param name="updateBytes"></param>
			public void UpdataFunctionStatus(string revString, byte[] usefulBytes)
			public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
			{
			MainPage.Log($"A协议更新状态:{revString}");

			if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
			{
			if (FunctionList.List.GetDeviceFunctionList(SPK.BrandType.Tuya).Count == 0)
			{
			//MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理...");
			return;
			}
			}
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
			if (temp != null)
			{
			@@ -636,18 +753,27 @@
			{
			try
			{
			//bool hadChange = false;//状态有变化再更新界面
			var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
			if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
			{
			if(!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk))
			{
			//MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理........");
			return;
			}
			}
			//MainPage.Log($"A协议更新状态:{revString}");
			foreach (var attr in updateTemp.status)
			{
			var attrState = localFunction.status.Find((func) => func.key == attr.key);
			if(attrState!= null)
			{
			attrState.value = attr.value;
			}
			}

			if (localFunction != null)
			{
			//var updateInfoString = $"更新设备:{localFunction.name}";
			//foreach (var attr in updateTemp.status)
			//{
			// updateInfoString += $" key:{attr.key};value:{attr.value}";
			//}
			//MainPage.Log(updateInfoString);


			//更新界面状态
			Function localObj = null;
			switch (localFunction.spk)
			@@ -920,6 +1046,11 @@
			case SPK.ElectricTuyaFan:
			case SPK.ElectricTuyaWeepRobot:
			case SPK.ElectricTuyaWaterValve:
			case SPK.SensorPir:
			case SPK.SensorDoorWindow:
			case SPK.SensorSmoke:
			case SPK.SensorWater:
			case SPK.ClothesHanger:
			//设备状态推送
			var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid,updateTemp.status);
			if (myDevice != null)