~wxr/CrabtreeOn.git

			@@ -65,11 +65,13 @@
			if (btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Voltage") {
			btn.Text = energy.ToString () + " W";
			}
			} else if (updataType == 11) {
			if (btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
			btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
			}
			}
			////2020-07-01 客户提出隐藏kwh
			//else if (updataType == 11) {
			// if (btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
			// btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
			// }
			//}
			}
			}
			}
			@@ -230,6 +232,8 @@
			});
			//Utlis.WriteLine ("U1");
			}

			private readonly object SendLocker = new object ();
			bool showTip = true;
			/// <summary>
			/// 控制所有的灯
			@@ -262,78 +266,87 @@
			if (common.Type == DeviceType.LightDimming \|\| common.Type == DeviceType.LightSwitch \|\| common.Type == DeviceType.LightRGB \|\| common.Type == DeviceType.LightEnergySwitch
			\|\| common.Type == DeviceType.LightMixDimming \|\| common.Type == DeviceType.LightMixSwitch \|\| common.Type == DeviceType.LightDALI) {

			new System.Threading.Thread (() => {
			mSendCount++;
			new System.Threading.Thread (() => {
			try {
			lock (SendLocker) {
			mSendCount++;
			}
			//mSendCount++;

			if (common.Type == DeviceType.LightDimming \|\| common.Type == DeviceType.LightDALI) {
			var light = (LightDimming)common;
			if (b == 100) {
			if (light.LastOpenBrightness == 0) {
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.LoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.LoopID, light.LastOpenBrightness, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.LoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else if (common.Type == DeviceType.LightSwitch \|\| common.Type == DeviceType.LightEnergySwitch) {
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, ((LightSwitch)common).DelayTimeHeight, ((LightSwitch)common).DelayTimeLow });
			} else if (common.Type == DeviceType.LightRGB) {
			var light = (LightLogic)common;
			byte b2 = b;
			if (b2 == 100) {
			if (light.LastOpenBrightness != 0) {
			b2 = light.LastOpenBrightness;
			}
			}
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetLogicLoopColor, common.SubnetID, common.DeviceID, new byte [] {
			if (common.Type == DeviceType.LightDimming \|\| common.Type == DeviceType.LightDALI) {
			var light = (LightDimming)common;
			if (b == 100) {
			if (light.LastOpenBrightness == 0) {
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.LoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.LoopID, light.LastOpenBrightness, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.LoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else if (common.Type == DeviceType.LightSwitch \|\| common.Type == DeviceType.LightEnergySwitch) {
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { common.LoopID, b, ((LightSwitch)common).DelayTimeHeight, ((LightSwitch)common).DelayTimeLow });
			} else if (common.Type == DeviceType.LightRGB) {
			var light = (LightLogic)common;
			byte b2 = b;
			if (b2 == 100) {
			if (light.LastOpenBrightness != 0) {
			b2 = light.LastOpenBrightness;
			}
			}
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetLogicLoopColor, common.SubnetID, common.DeviceID, new byte [] {
			common.LoopID, b2, 254, light.CustomDelayTimeOpen,light.CustomDelayTimeClose,
			3,light.RStatus,light.GStatus,light.BStatus,0,0});
			} else if (common.Type == DeviceType.LightMixDimming) {
			var light = (LightMixDimming)common;
			if (b == 100) {
			if (light.LastOpenBrightness == 0) {
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, light.LastOpenBrightness, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else if (common.Type == DeviceType.LightMixSwitch) {
			var light = (LightMixSwitch)common;
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else {
			returnBytes = new byte [] { 0x00 };
			}
			if (showTip) {
			if (returnBytes == null) {
			Application.RunOnMainThread (() => {
			} else if (common.Type == DeviceType.LightMixDimming) {
			var light = (LightMixDimming)common;
			if (b == 100) {
			if (light.LastOpenBrightness == 0) {
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, light.LastOpenBrightness, light.DelayTimeHeight, light.DelayTimeLow });
			} else
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else if (common.Type == DeviceType.LightMixSwitch) {
			var light = (LightMixSwitch)common;
			returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, common.SubnetID, common.DeviceID, new byte [] { light.PhysicsLoopID, b, light.DelayTimeHeight, light.DelayTimeLow });
			} else {
			returnBytes = new byte [] { 0x00 };
			}
			if (showTip) {
			if (returnBytes == null) {
			Application.RunOnMainThread (() => {

			var btnTip = new Button () {
			Height = Application.GetRealHeight (140),
			Text = common.Name + ErrorCode.ControlFailure,
			BackgroundColor = 0xFFD7D7D7,
			};
			MainPage.MainFrameLayout.AddChidren (btnTip);
			btnTip.MouseUpEventHandler += (sender, e) => {
			btnTip.RemoveFromParent ();
			//MainPage.MainFrameLayout.Remove (btnTip);
			//showTip = false;
			};
			var btnTip = new Button () {
			Height = Application.GetRealHeight (140),
			Text = common.Name + ErrorCode.ControlFailure,
			BackgroundColor = 0xFFD7D7D7,
			};
			MainPage.MainFrameLayout.AddChidren (btnTip);
			btnTip.MouseUpEventHandler += (sender, e) => {
			btnTip.RemoveFromParent ();
			//MainPage.MainFrameLayout.Remove (btnTip);
			//showTip = false;
			};


			System.Threading.Tasks.Task.Run (() => {
			System.Threading.Thread.Sleep (3000);
			Application.RunOnMainThread (() => {
			btnTip.RemoveFromParent ();
			//MainPage.MainFrameLayout.Remove (btnTip);
			});
			});
			System.Threading.Tasks.Task.Run (() => {
			System.Threading.Thread.Sleep (3000);
			Application.RunOnMainThread (() => {
			btnTip.RemoveFromParent ();
			//MainPage.MainFrameLayout.Remove (btnTip);
			});
			});


			});
			}
			}
			});
			}
			}

			mSendCount--;
			}) { IsBackground = true }.Start();
			//mSendCount--;
			} catch { } finally {
			lock (SendLocker) {
			mSendCount--;
			}
			}
			}) { IsBackground = true }.Start ();

			//等待100ms再发送第二个设备数据
			System.Threading.Thread.Sleep (100);
			@@ -503,8 +516,8 @@
			roomView.AddChidren (btnNumber);

			Button btnLightIcon = new Button () {
			Width = Application.GetRealWidth (100),
			Height = Application.GetRealHeight (80),
			Width = Application.GetMinRealAverage (100),
			Height = Application.GetMinRealAverage (80),
			Gravity = Gravity.CenterVertical,
			UnSelectedImagePath = "Item/RH_Lights.png",
			SelectedImagePath = "Item/RH_LightsSelected.png",
			@@ -564,8 +577,8 @@

			Button downSelectedButton = new Button () {
			X = Application.GetRealWidth (550),
			Height = Application.GetRealHeight (50),
			Width = Application.GetRealWidth (55),
			Height = Application.GetMinRealAverage (50),
			Width = Application.GetMinRealAverage (55),
			UnSelectedImagePath = "Item/Down.png",
			SelectedImagePath = "Item/DownSelected.png",
			Gravity = Gravity.CenterVertical,
			@@ -685,21 +698,21 @@
			};
			lightView.AddChidren (btnEnergy);
			EnergtLightList.Add (common);

			if (common.Type == DeviceType.LightEnergySwitch) {
			Button btnElectric = new Button () {
			Width = Application.GetRealWidth (200),
			Height = Application.GetRealHeight (35),
			X = Application.GetRealWidth (320),
			Y = tempSwitch.Bottom,
			TextAlignment = TextAlignment.CenterRight,
			TextColor = SkinStyle.Current.TextColor1,
			SelectedTextColor = SkinStyle.Current.TextColor1,
			Tag = common.Type.ToString () + "_Electric",
			Text = "0 kw.h"
			};
			lightView.AddChidren (btnElectric);
			}
			//2020-07-01 客户提出隐藏kwh
			//if (common.Type == DeviceType.LightEnergySwitch) {
			// Button btnElectric = new Button () {
			// Width = Application.GetRealWidth (200),
			// Height = Application.GetRealHeight (35),
			// X = Application.GetRealWidth (320),
			// Y = tempSwitch.Bottom,
			// TextAlignment = TextAlignment.CenterRight,
			// TextColor = SkinStyle.Current.TextColor1,
			// SelectedTextColor = SkinStyle.Current.TextColor1,
			// Tag = common.Type.ToString () + "_Electric",
			// Text = "0 kw.h"
			// };
			// lightView.AddChidren (btnElectric);
			//}
			}

			tempSwitch.MouseUpEventHandler += (sender3, e3) => {
			@@ -716,7 +729,8 @@
			if (common.Type == DeviceType.LightEnergySwitch) {
			new System.Threading.Thread (() => {
			Control.ControlBytesSend (Command.ReadAnalogValue, light.SubnetID, light.DeviceID, new byte [] { 10, light.LoopID }, SendCount.Zero);
			Control.ControlBytesSend (Command.ReadAnalogValue, light.SubnetID, light.DeviceID, new byte [] { 11, light.LoopID }, SendCount.Zero);
			//2020-07-01 客户提出隐藏kwh
			//Control.ControlBytesSend (Command.ReadAnalogValue, light.SubnetID, light.DeviceID, new byte [] { 11, light.LoopID }, SendCount.Zero);
			}) { IsBackground = true }.Start ();
			}
			};
			@@ -987,9 +1001,10 @@
			for (int i = 0; i < EnergtLightList.Count; i++) {
			var c = EnergtLightList [i];
			Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 10, c.LoopID }, SendCount.Zero);
			//if (c.Type == DeviceType.LightEnergySwitch) {
			Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
			//}
			////if (c.Type == DeviceType.LightEnergySwitch) {
			////2020-07-01 客户提出隐藏kwh
			//Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
			////}
			System.Threading.Thread.Sleep (200);
			}
			System.Threading.Thread.Sleep (10000);