~wxr/HDL_APP_Project.git

			@@ -156,145 +156,180 @@
			/// </summary>
			public void ControlBusScenes(Scene scene)
			{
			foreach (var f in scene.functions)
			if (Control.Ins.IsRemote)
			{
			switch (f.localFunction.functionType)
			foreach (var f in scene.functions)
			{
			case FunctionType.Curtain:
			foreach (var attr in f.status)
			var count = 0;
			List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
			Dictionary<string, string> d = new Dictionary<string, string>();
			var pm = new DAL.Server.HttpServerRequest();
			foreach (var temp in f.status)
			{
			if (f.localFunction == null)
			{
			if (attr.key == FunctionAttributeKey.OnOff)
			continue;
			}
			d.Add(temp.key, temp.value);
			var apiControlData = f.localFunction.GetApiControlData(d);
			actionObjs.Add(apiControlData);
			count++;
			if (count > 9)
			{
			var result = pm.ControlDevice(actionObjs);
			actionObjs = new List<ApiAlinkControlActionObj>();
			count = 0;
			}
			}
			var pack = pm.ControlDevice(actionObjs);
			}
			}
			else
			{
			foreach (var f in scene.functions)
			{
			if (f.localFunction == null)
			{
			continue;
			}
			switch (f.localFunction.functionType)
			{
			case FunctionType.Curtain:
			foreach (var attr in f.status)
			{
			byte curtainState = 0;
			switch (attr.value)
			if (attr.key == FunctionAttributeKey.OnOff)
			{
			case "on":
			curtainState = 1;
			break;
			case "off":
			curtainState = 2;
			break;
			}
			ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
			new byte[] { f.localFunction.bus_Data.loopId, curtainState });
			break;
			}
			}
			break;
			case FunctionType.AC:
			AC tempAc = new AC();
			foreach (var attr in f.status)
			{
			byte modeKey = 4;
			switch (attr.key)
			{
			case FunctionAttributeKey.OnOff:
			tempAc.trait_on_off.curValue = attr.value;
			break;
			case FunctionAttributeKey.Mode:
			tempAc.trait_mode.curValue = attr.value;
			break;
			case FunctionAttributeKey.FanSpeed:
			tempAc.trait_fan.curValue = attr.value;
			break;
			case FunctionAttributeKey.SetTemp:
			tempAc.trait_temp.curValue = attr.value;
			switch (tempAc.curModeIndex)
			{
			case 3:
			modeKey = 8;
			break;
			case 0:
			modeKey = 4;
			break;
			case 1:
			modeKey = 7;
			break;
			case 4:
			modeKey = 19;
			break;
			case 2:
			modeKey = 2;
			break;
			}
			break;
			}
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 3, tempAc.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus_Data.loopId });
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 6, tempAc.curModeIndex, f.localFunction.bus_Data.loopId });
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 5, tempAc.curFanIndex, f.localFunction.bus_Data.loopId });
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.trait_temp.curValue), f.localFunction.bus_Data.loopId });
			}
			break;
			case FunctionType.Relay:
			case FunctionType.Dimmer:
			byte brightness = 0;
			foreach (var attr in f.status)
			{
			switch (attr.key)
			{
			case FunctionAttributeKey.OnOff:
			byte curtainState = 0;
			switch (attr.value)
			{
			case "on":
			brightness = 100;
			curtainState = 1;
			break;
			case "off":
			brightness = 0;
			curtainState = 2;
			break;
			}
			ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
			new byte[] { f.localFunction.bus.LoopId, curtainState });
			break;
			case FunctionAttributeKey.Brightness:
			brightness = Convert.ToByte(attr.value);
			break;
			}
			}
			}
			ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
			new byte[] { f.localFunction.bus_Data.loopId, brightness });
			break;
			case FunctionType.RGB:
			break;
			case FunctionType.FloorHeating:
			var tempFh = new FloorHeating();
			foreach (var attr in f.status)
			{
			switch (attr.key)
			break;
			case FunctionType.AC:
			AC tempAc = new AC();
			foreach (var attr in f.status)
			{
			case FunctionAttributeKey.OnOff:
			tempFh.trait_on_off.curValue = attr.value;
			break;
			case FunctionAttributeKey.SetTemp:
			tempFh.trait_temp.curValue = attr.value;
			break;
			case FunctionAttributeKey.Mode:
			tempFh.trait_mode.curValue = attr.value;
			break;
			}
			}
			byte b1 = tempFh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
			ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] {
			f. localFunction.bus_Data.loopId, b1, 0, tempFh.curModeIndex, Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), 0, 0 });
			break;
			case FunctionType.Socket:
			foreach (var attr in f.status)
			{
			if (attr.key == FunctionAttributeKey.OnOff)
			{
			byte onOffValue = 0;
			switch (attr.value)
			byte modeKey = 4;
			switch (attr.key)
			{
			case "on":
			onOffValue = 1;
			case FunctionAttributeKey.OnOff:
			tempAc.trait_on_off.curValue = attr.value;
			break;
			case "off":
			onOffValue = 2;
			case FunctionAttributeKey.Mode:
			tempAc.trait_mode.curValue = attr.value;
			break;
			case FunctionAttributeKey.FanSpeed:
			tempAc.trait_fan.curValue = attr.value;
			break;
			case FunctionAttributeKey.SetTemp:
			tempAc.trait_temp.curValue = attr.value;
			switch (tempAc.curModeIndex)
			{
			case 3:
			modeKey = 8;
			break;
			case 0:
			modeKey = 4;
			break;
			case 1:
			modeKey = 7;
			break;
			case 4:
			modeKey = 19;
			break;
			case 2:
			modeKey = 2;
			break;
			}
			break;
			}
			ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
			new byte[] { f.localFunction.bus_Data.loopId, onOffValue });
			break;
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 3, tempAc.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus.LoopId });
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 6, tempAc.curModeIndex, f.localFunction.bus.LoopId });
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { 5, tempAc.curFanIndex, f.localFunction.bus.LoopId });
			ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.trait_temp.curValue), f.localFunction.bus.LoopId });
			}
			}
			break;
			break;
			case FunctionType.Relay:
			case FunctionType.Dimmer:
			byte brightness = 0;
			foreach (var attr in f.status)
			{
			switch (attr.key)
			{
			case FunctionAttributeKey.OnOff:
			switch (attr.value)
			{
			case "on":
			brightness = 100;
			break;
			case "off":
			brightness = 0;
			break;
			}
			break;
			case FunctionAttributeKey.Brightness:
			brightness = Convert.ToByte(attr.value);
			break;
			}
			}
			ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
			new byte[] { f.localFunction.bus.LoopId, brightness, (byte)(f.localFunction.delay / 255), (byte)(f.localFunction.delay % 255) });
			break;
			case FunctionType.RGB:
			break;
			case FunctionType.FloorHeating:
			var tempFh = new FloorHeating();
			foreach (var attr in f.status)
			{
			switch (attr.key)
			{
			case FunctionAttributeKey.OnOff:
			tempFh.trait_on_off.curValue = attr.value;
			break;
			case FunctionAttributeKey.SetTemp:
			tempFh.trait_temp.curValue = attr.value;
			break;
			case FunctionAttributeKey.Mode:
			tempFh.trait_mode.curValue = attr.value;
			break;
			}
			}
			byte b1 = tempFh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
			ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
			f. localFunction.bus.LoopId, b1, 0, tempFh.curModeIndex, Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), 0, 0 });
			break;
			case FunctionType.Socket:
			foreach (var attr in f.status)
			{
			if (attr.key == FunctionAttributeKey.OnOff)
			{
			byte onOffValue = 0;
			switch (attr.value)
			{
			case "on":
			onOffValue = 1;
			break;
			case "off":
			onOffValue = 2;
			break;
			}
			ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
			new byte[] { f.localFunction.bus.LoopId, onOffValue });
			break;
			}
			}
			break;
			}
			}
			}
			}
			@@ -308,9 +343,9 @@
			{
			try
			{
			var subnetId = function.bus_Data.SubnetID;
			var deviceId = function.bus_Data.DeviceID;
			var loopId = function.bus_Data.loopId;
			var subnetId = function.bus.SubnetID;
			var deviceId = function.bus.DeviceID;
			var loopId = function.bus.LoopId;

			switch (function.functionCategory)
			{
			@@ -329,11 +364,11 @@
			{
			b = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
			}
			var bytes = new byte[] { function.bus_Data.loopId,
			var bytes = new byte[] { function.bus.LoopId,
			b,
			254, 0,Convert.ToByte(light.fadeTime) ,3,
			(byte)light.redColor,(byte)light.greenColor,
			(byte)light.blueColor,
			(byte)light.RedColor,(byte)light.GreenColor,
			(byte)light.BlueColor,
			0,0};
			ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
			break;
			@@ -348,13 +383,13 @@
			b1 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
			}
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
			function.bus_Data.loopId,
			function.bus.LoopId,
			b1,
			0, Convert.ToByte(light.fadeTime) });
			//DimmerPage.UpdataStates(light);
			break;
			case FunctionType.Relay:
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.loopId, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
			//RelayPage.UpdataState(light);
			break;
			}
			@@ -377,7 +412,7 @@
			{
			b1 = 2;
			}
			ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, b1 });
			ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus.LoopId, b1 });
			break;
			case FunctionType.MotorCurtain:
			case FunctionType.RollingShutter:
			@@ -385,7 +420,7 @@
			//{
			if (curtain.trait_on_off.curValue.ToString() == "stop")
			{
			ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
			ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus.LoopId, 0 });
			}
			else
			{
			@@ -416,20 +451,20 @@
			{
			case FunctionType.AC:
			var aC = function as AC;
			ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus_Data.loopId, (byte)aC.curTempType, 32, 32, 32, 32, 32, 0, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, Convert.ToByte(aC.trait_temp.curValue), 0 });
			ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus.LoopId, (byte)aC.curTempType, 32, 32, 32, 32, 32, 0, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, Convert.ToByte(aC.trait_temp.curValue), 0 });
			//ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.on_off == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
			foreach (var dic in commandDictionary)
			{
			switch (dic.Key)
			{
			case "on_off":
			ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
			ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus.LoopId });
			break;
			case "mode":
			ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.loopId });
			ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus.LoopId });
			break;
			case "fan":
			ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.loopId });
			ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus.LoopId });
			break;
			case "temp":
			byte modeKey = 4;
			@@ -451,7 +486,7 @@
			modeKey = 2;
			break;
			}
			ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.loopId });
			ControlBytesSend(Command.InstructionPanelKey, aC.bus.SubnetID, aC.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus.LoopId });
			break;
			default:
			MainPage.Log($"功能未支持 : {dic.Key}");
			@@ -490,7 +525,7 @@
			break;
			}
			}
			ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus_Data.loopId, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
			ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus.LoopId, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
			}
			break;
			}
			@@ -502,10 +537,10 @@
			var fan = function as Fan;
			if (fan.trait_on_off.curValue.ToString() == "on")
			{
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, (byte)fan.openLevel });
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId, (byte)fan.openLevel });
			}
			{
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, 0 });
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId, 0 });
			}
			break;
			}
			@@ -515,7 +550,7 @@
			{
			case FunctionType.Socket:
			var s = function as SwitchSocket;
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
			break;
			}
			break;
			@@ -540,9 +575,9 @@
			{
			try
			{
			var subnetId = function.bus_Data.SubnetID;
			var deviceId = function.bus_Data.DeviceID;
			var loopId = function.bus_Data.loopId;
			var subnetId = function.bus.SubnetID;
			var deviceId = function.bus.DeviceID;
			var loopId = function.bus.LoopId;

			switch (function.functionCategory)
			{
			@@ -554,7 +589,7 @@
			ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
			break;
			case FunctionType.RGB:
			ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
			ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId });
			break;
			}
			break;
			@@ -564,7 +599,7 @@
			case FunctionType.Curtain:
			case FunctionType.MotorCurtain:
			case FunctionType.RollingShutter:
			ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
			ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus.LoopId });
			break;
			}
			break;
			@@ -572,10 +607,10 @@
			switch (function.functionType)
			{
			case FunctionType.AC:
			ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
			ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
			break;
			case FunctionType.FloorHeating:
			ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
			ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
			break;
			}
			break;
			@@ -584,7 +619,7 @@
			{
			case FunctionType.Fan:
			var fan = function as Fan;
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId });
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId });
			break;
			}
			break;
			@@ -593,14 +628,14 @@
			{
			case FunctionType.Socket:
			var s = function as SwitchSocket;
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId });
			ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId });
			break;
			}
			break;
			case FunctionCategory.Sensor:
			var sensor = function as Sensor;
			ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { (byte)5,
			(byte)((int)sensor.functionType % 256), sensor.bus_Data.loopId });
			(byte)((int)sensor.functionType % 256), sensor.bus.LoopId });
			break;
			}
			}
			@@ -728,7 +763,7 @@
			UdpSocket._BusSocket.AsyncBeginSend(packet);
			controlLostCount++;
			}
			System.Threading.Thread.Sleep(100);
			System.Threading.Thread.Sleep(300);
			}
			}
			catch (Exception ex)
			@@ -787,6 +822,10 @@
			}

			}

			//private void signAlinkPacket()
			//{
			//}

			/// <summary>
			/// 发送数据
			@@ -857,7 +896,7 @@
			{
			wait();
			}
			//MainPage.Log($"发送Hdl-Link数据，IP:{Control.Ins.reportIp}:8585");
			MainPage.Log($"发送Hdl-Link数据，IP:{Control.Ins.reportIp}:8585");
			}
			}