~wxr/RongAn.git

			@@ -261,6 +261,7 @@
			/// </summary>
			public void OpenTcpClent()
			{
			return;
			if (myTcpClient == null)
			{
			myTcpClient = new Control_TcpClient(reportIp);
			@@ -311,8 +312,6 @@
			}
			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) });
			}
			else if (DB_ResidenceData.Instance.GatewayType == 1)
			{
			@@ -329,57 +328,6 @@


			private System.Threading.Thread loginGatewayThread;

			/// <summary>
			/// 登录网关
			/// </summary>
			public void LoginGateway()
			{
			return;//tcp控制存在问题，但是先不用tcp控制了，要经过测试先 2023-07-29 10:14:32
			if (loginGatewayThread == null)
			{
			loginGatewayThread = new System.Threading.Thread(() =>
			{
			while (!Ins.myTcpClient.isConnected)
			{
			if (Ins.GatewayOnline_Local && myTcpClient.isConnected)
			{
			var sendData = new { clientType = "app", version = "1.0" };
			var sendJob = new { id = Control.Ins.msg_id.ToString(), time_stamp = Utlis.GetTimestamp(), objects = sendData };

			var bodyString = JsonConvert.SerializeObject(sendJob);

			var sendBytes = ConvertSendBodyData($"/user/{GatewayId}/custom/gateway/login", bodyString);

			Ins.myTcpClient.SendMessage(sendBytes);
			}
			System.Threading.Thread.Sleep(2000);
			}
			//loginGatewayThread?.Abort();
			//loginGatewayThread = null;

			});
			loginGatewayThread.Start();
			}
			else
			{
			try
			{
			loginGatewayThread?.Abort();
			}
			catch (Exception ex)
			{
			MainPage.Log($"重启登录网关线程异常:{ex.Message}");
			}
			finally
			{
			loginGatewayThread = null;
			LoginGateway();
			}
			}

			}


			/// <summary>
			/// 场景控制入口
			@@ -422,7 +370,6 @@
			{
			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			new Control_Udp().ControlBusScenes(scene);
			}
			}
			}
			@@ -484,21 +431,6 @@
			return true;
			}

			//MainPage.Log($"发送数据:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");

			///第三方涂鸦设备统一使用远程控制
			switch (function.spk)
			{
			case SPK.ElectricTuyaAirCleaner:
			case SPK.ElectricTuyaAirCleaner2:
			case SPK.ElectricTuyaFan:
			case SPK.ElectricTuyaFan2:
			case SPK.ElectricTuyaWaterValve:
			case SPK.ElectricTuyaWeepRobot:
			case SPK.ElectricTuyaWeepRobot2:
			useRemote = true;
			break;
			}

			//远程通讯 --涂鸦设备必须需要远程
			if (useRemote == true)
			@@ -515,28 +447,12 @@
			//本地通讯
			if (Ins.GatewayOnline_Local)
			{
			//Bus控制
			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			try
			{
			new Control_Udp().WriteBusData(function, commandDictionary);
			}
			catch (Exception ex)
			{
			MainPage.Log($"发送数据异常: {ex.Message}");
			}
			}
			//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, resend);
			MainPage.Log($"本地通讯发送HDL-Link数据:{functionControlDataJson}");
			Ins.myTcpClient.SendMessage(sendBytes);
			}
			//Ins.myTcpClient.SendMessage(sendBytes);
			}
			//远程通讯
			else
			@@ -587,13 +503,6 @@
			{
			Dictionary<string, string> d1 = new Dictionary<string, string>();
			d1.Add(FunctionAttributeKey.OnOff, open ? "on" : "off");
			if (function.spk == SPK.PanelSocket)
			{
			if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
			{
			d1.Add("on_off_usb", function.trait_on_off.curValue.ToString());
			}
			}
			SendWriteCommand(function, d1);
			System.Threading.Thread.Sleep(100);
			}
			@@ -646,35 +555,6 @@
			var pack = pm.RefreshDeviceStatus(functionIds);
			}
			/// <summary>
			/// 读取功能详细数据
			/// </summary>
			/// <param name="functionIds"></param>
			public void ReadFunctionsInfo(List<string> functionIds)
			{
			var pm = new DAL.Server.HttpServerRequest();
			var pack = pm.GetDeviceInfoList(functionIds);
			if (pack != null && pack.Data != null)
			{
			//待测试2021-03-04
			var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AlinkStatusData>>(pack.Data.ToString());
			if (ddd != null)
			{
			foreach (var function in ddd)
			{
			var temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.deviceId == function.deviceId);
			if (temp != null)
			{
			if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(temp.spk))
			{
			Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(temp.sid, function.status);
			}
			}
			}
			}
			}
			}

			/// <summary>
			/// 发送读取命令
			/// 自动判断是否为A协议设备
			/// </summary>
			@@ -693,14 +573,6 @@

			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			try
			{
			new Control_Udp().ReadBusData(function);
			}
			catch (Exception ex)
			{
			MainPage.Log($"发送数据异常: {ex.Message}");
			}
			}
			else
			{
			@@ -755,19 +627,6 @@

			if (DB_ResidenceData.Instance.GatewayType == 0)
			{
			try
			{
			var busClient = new Control_Udp();
			foreach (Function function in functions)
			{
			busClient.ReadBusData(function);
			}

			}
			catch (Exception ex)
			{
			MainPage.Log($"发送数据异常: {ex.Message}");
			}
			}
			else
			{
			@@ -802,41 +661,6 @@
			}
			}


			/// <summary>
			/// 安防控制
			/// </summary>
			public void ControlSecurity(SecurityAlarm securityAlarm, string state)
			{
			if (!Ins.GatewayOnline_Local)//网关本地不在线
			{
			var pm = new DAL.Server.HttpServerRequest();
			var result = pm.SetSecurityStatus(new List<SecurityState>() { new SecurityState() {
			gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId,
			sid = securityAlarm.sid, status = state, userSecurityId = securityAlarm.userSecurityId
			} });
			MainPage.Log($"安防控制结果:{result.Code}");
			}
			else
			{
			Dictionary<string, string> keys = new Dictionary<string, string>();
			keys.Add("sid", securityAlarm.sid);
			keys.Add("status", state);
			keys.Add("alarm", securityAlarm.alarm.ToString());
			var aLinkData = new AlinkReadFunctionStatusObj()
			{
			id = Ins.msg_id.ToString(),
			objects = new List<Dictionary<string, string>>()
			{
			keys
			},
			time_stamp = Utlis.GetTimestamp()
			};
			var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData);
			var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlSeurity, aLinkJson);
			new Control_Udp().SendLocalHdlLinkData(sendBytes, aLinkData.id);
			}
			}

			/// <summary>
			/// a协议控制场景
			@@ -1011,9 +835,9 @@

			if (receiveObj.Topic == CommunicationTopic.ct.HeartBeat + "_reply")
			{
			Ins.myTcpClient.ClearHeartBeatLog();
			MainPage.Log("tcp心跳回复");
			return null;
			//Ins.myTcpClient.ClearHeartBeatLog();
			//MainPage.Log("tcp心跳回复");
			//return null;
			}

			//2021-09-23 过滤不需要解密的主题目前搜索网关主题不加密
			@@ -1078,7 +902,7 @@
			if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply \|\| receiveObj.Topic == CommunicationTopic.GatewayBroadcast)
			{

			var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
			var bodyJObj = JsonConvert.DeserializeObject<ResponsePack>(res[1]);
			if (bodyJObj == null)
			{
			return receiveObj;
			@@ -1105,9 +929,6 @@
			reportIp = device.ip_address;//主播地址也能控制设备//"239.0.168.188";//
			//2021-09-23 新增获取当前网关是否本地加密
			Ins.IsLocalEncrypt = device.isLocalEncrypt;
			//MainPage.Log("网关本地加密状态：" + device.local_encrypt.ToString());
			//登录网关Tcp
			OpenTcpClent();


			}
			@@ -1120,39 +941,6 @@
			{
			//TODO 暂时不传正确的数据上去，如果后面要优化前面这些代码
			UpdataFunctionStatus(receiveObj.BodyDataString, null);
			}
			else if (receiveObj.Topic == CommunicationTopic.ct.ControlSeurity + "_reply"
			\|\| receiveObj.Topic == CommunicationTopic.ct.ReadSecurityStatus + "_reply"
			\|\| receiveObj.Topic == CommunicationTopic.ct.SecurityStatusUp)
			{
			try
			{
			MainPage.Log($"局域网安防信息: {receiveObj.Topic} : 内容: {res[1]}");
			var tt = "";
			lock (tt)
			{
			var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);
			if (temp != null)
			{
			Control_Udp.ReceiveRepeatManager(temp.id, null);
			foreach (var updataSecurity in temp.objects)
			{
			var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
			if (updataLocalSecurity != null)
			{
			updataLocalSecurity.status = updataSecurity.status;
			updataLocalSecurity.alarm = updataSecurity.alarm;
			ArmCenterPage.LoadEvent_RefreshSecurityStatus(updataLocalSecurity);
			}
			}
			HomePage.LoadEvent_RefreshSecurityStatus();
			}
			}
			}
			catch (Exception ex)
			{
			MainPage.Log($"安防局域网异常：{ex.Message}");
			}
			}
			else if (receiveObj.Topic == $"/user/{GatewayId}/custom/gateway/login_reply")
			{
			@@ -1207,58 +995,6 @@

			}


			/// <summary>
			/// 更新群控设备状态
			/// A协议数据
			/// </summary>
			public void UpdataGroupControlStatus(string revString, byte[] usefulBytes, bool isCloudData = false)
			{
			var temp = JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
			if (temp != null)
			{
			Control_Udp.ReceiveRepeatManager(temp.id, usefulBytes);
			var allLocalFuntion = FunctionList.List.groupControls;
			foreach (var updateTemp in temp.objects)
			{
			try
			{
			var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
			if (localFunction == null)
			{
			continue;
			}
			MainPage.Log($"收到数据:{revString}");
			foreach (var attr in updateTemp.status)
			{
			localFunction.time_stamp = temp.time_stamp;
			localFunction.SetAttrState(attr.key, attr.value);

			}

			//更新界面状态
			switch (localFunction.spk)
			{
			case SPK.ElectricEnergy:
			EnergyMainPage.UpdataStatus(localFunction);
			break;
			}

			HomePage.UpdataFunctionStates(localFunction);
			RoomPage.UpdataStates(localFunction);
			FunctionPage.UpdataStates(localFunction);
			ClassificationPage.UpdataInfo(localFunction);

			}
			catch (Exception ex)
			{
			MainPage.Log($"A协议更新状态异常:{ex.Message}");
			}
			}
			}
			}


			/// <summary>
			/// 更新设备状态
			/// A协议数据
			@@ -1281,48 +1017,13 @@
			try
			{

			if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
			{
			if (FunctionList.List.OtherBrandFunction.Count == 0)
			{
			MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理...");
			return;
			}
			else
			{
			if (FunctionList.List.OtherBrandFunction.Find((obj) => obj.sid == updateTemp.sid) == null)
			{
			return;
			}
			}
			}

			var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
			if (localFunction == null)
			{
			continue;
			}
			MainPage.Log(localFunction.name);

			if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
			{
			if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk) && !SPK.MusicSpkList().Contains(localFunction.spk))
			{
			//MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理........");

			return;
			}
			}

			//if (SPK.MusicSpkList().Contains(localFunction.spk))
			//{
			// if (updateTemp.status.Count < 3)
			// {
			// ///是音乐功能的
			// ///上报属性少3条不做处理
			// return;
			// }
			//}
			MainPage.Log($"收到数据:{revString}");
			foreach (var attr in updateTemp.status)
			{
			@@ -1330,35 +1031,10 @@
			localFunction.SetAttrState(attr.key, attr.value);

			}
			if(localFunction.spk == SPK.AirSwitchP3)
			{
			localFunction.online = updateTemp.online;
			}

			//更新界面状态
			switch (localFunction.spk)
			{
			case SPK.AcstParent:
			AcstParentPage.UpdateAcstParentInfo(localFunction);
			break;
			case SPK.AcstSub:
			AcstParentPage.UpdateAcstSubInfo(localFunction);
			AcstSubPage.UpdateStatus(localFunction);
			break;
			case SPK.AirSwitch:
			AirSwitchPage.UpdataState(localFunction);
			if (localFunction.GetAttribute(FunctionAttributeKey.Power) != null)//如果是带电量的空开也要更新能源界面
			{
			EnergyMainPage.UpdataStatus(localFunction);
			}
			break;
			case SPK.AirSwitchP3:
			AirSwitchP3Page.UpdataState(localFunction);
			AirSwitchP3SubloopEnergyPage.UpdataStatus(localFunction);
			break;
			case SPK.ElectricEnergy:
			EnergyMainPage.UpdataStatus(localFunction);
			break;
			case SPK.LightSwitch:
			RelayPage.UpdataState(localFunction);
			break;
			@@ -1366,12 +1042,6 @@
			localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " +
			localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
			DimmerPage.UpdataStates(localFunction);
			break;
			case SPK.ElectricFan:
			case SPK.HvacFan:
			localFunction.lastState = Language.StringByID(StringId.Level) + " : " +
			localFunction.GetAttrState(FunctionAttributeKey.OpenLevel);
			FanPage.UpdataState(localFunction);
			break;
			case SPK.LightRGB:
			localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " + localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
			@@ -1477,124 +1147,11 @@
			localFunction.lastState += " " + localFunction.GetAttrState(FunctionAttributeKey.SetTemp) + new FloorHeating().GetTempUnitString(localFunction);
			FloorHeatingPage.UpdataStates(localFunction);
			break;
			case SPK.SensorPm25:
			case SPK.SensorCO2:
			case SPK.SensorTVOC:
			case SPK.SensorTemperature:
			case SPK.SensorHumidity:
			case SPK.SensorHcho:
			if (localFunction.spk == SPK.SensorTemperature)
			{
			HomePage.LoadEvent_RefreshEnvirIndoorTemp();
			}
			else if (localFunction.spk == SPK.SensorHumidity)
			{
			HomePage.LoadEvent_RefreshEnvirIndoorHumi();
			}
			EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
			//A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
			break;
			case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
			case SPK.SensorEnvironment2:
			case SPK.SensorEnvironment3:
			if (localFunction.GetAttributes().Contains(FunctionAttributeKey.Temperature))
			{
			HomePage.LoadEvent_RefreshEnvirIndoorTemp();
			}
			if (localFunction.GetAttributes().Contains(FunctionAttributeKey.Humidity))
			{
			HomePage.LoadEvent_RefreshEnvirIndoorHumi();
			}
			EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
			//A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
			break;
			case SPK.ElectricSocket:
			case SPK.PanelSocket:
			SocketPage.UpdataState(localFunction);
			SocketPage_InstantaneousValue.UpdataView(localFunction);
			break;
			case SPK.ElectricTV:
			break;
			case SPK.ElectricTuyaAirCleaner:
			case SPK.ElectricTuyaAirCleaner2:
			case SPK.ElectricTuyaFan:
			case SPK.ElectricTuyaFan2:
			case SPK.ElectricTuyaWeepRobot:
			case SPK.ElectricTuyaWeepRobot2:
			case SPK.ElectricTuyaWaterValve:
			case SPK.ElectricTuyaWaterValve2:
			case SPK.SensorPir:
			case SPK.SensorDoorWindow:
			case SPK.SensorSmoke:
			case SPK.SensorWater:
			case SPK.ClothesHanger:
			case SPK.AirFreshStandard:
			case SPK.HvacAirFresh:
			case SPK.SensorGas:
			case SPK.HvacCac:
			case SPK.SensorHelp:
			case SPK.MechanicalArm:
			//设备状态推送
			//状态更新
			Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
			break;
			case SPK.SenesorMegahealth:
			case SPK.SenesorMegahealth2:
			case SPK.SensorMmvPose:

			var tempStatus = localFunction.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
			if (tempStatus != null)
			{

			switch (tempStatus.state)
			{//0空，1走，2跑，3坐，4跌倒，5站
			case "0":
			localFunction.lastState = Language.StringByID(StringId.SensorNormalState);
			break;
			case "1":
			localFunction.lastState = Language.StringByID(StringId.SomeoneIn);
			break;
			case "2":
			if (localFunction.extSet.labModel)
			{
			localFunction.lastState = Language.StringByID(StringId.SomeoneRunning);
			}
			break;
			case "3":
			if (localFunction.extSet.labModel)
			{
			localFunction.lastState = Language.StringByID(StringId.SomeoneSitting);
			}
			break;
			case "4":
			localFunction.lastState = Language.StringByID(StringId.SomeoneFell);
			break;
			case "5":
			if (localFunction.extSet.labModel)
			{
			localFunction.lastState = Language.StringByID(StringId.SomeoneStanding);
			}
			break;
			default:

			break;
			}
			}
			Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
			break;
			case SPK.AvMusic:
			case SPK.MusicStandard:
			//UI.Music.MusicMain.mMusicMain.RefreshView(updateTemp);
			Console.WriteLine("音乐播放器显示状态=======" + revString);
			//wjc
			break;
			case SPK.Inverter:
			case SPK.InverterRst:
			var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = temp.objects };
			Application.RunOnMainThread(() =>
			{
			Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
			});
			break;
			}