~wxr/CrabtreeOn.git

			@@ -92,7 +92,7 @@
			if (light.Type == DeviceType.LightDimming \|\| light.Type == DeviceType.LightMixDimming \|\| light.Type == DeviceType.LightDALI) {
			if ((light as LightDimming).CurrentBrightness > 0)
			brighingCount++;
			} else if (light.Type == DeviceType.LightSwitch \|\| light.Type == DeviceType.LightMixSwitch)
			} else if (light.Type == DeviceType.LightSwitch \|\| light.Type == DeviceType.LightMixSwitch \|\| light.Type == DeviceType.LightEnergySwitch)
			if ((light as LightSwitch).CurrentBrightness == 100)
			brighingCount++;
			if (light.Type == DeviceType.LightRGB)
			@@ -180,7 +180,7 @@
			}
			}
			//if (!update) {
			// Console.WriteLine ("退出更新灯光");
			// Utlis.WriteLine ("退出更新灯光");
			// return;
			//}
			Application.RunOnMainThread (() => {
			@@ -228,8 +228,10 @@
			}
			});
			});
			//Console.WriteLine ("U1");
			//Utlis.WriteLine ("U1");
			}

			private readonly object SendLocker = new object ();
			bool showTip = true;
			/// <summary>
			/// 控制所有的灯
			@@ -262,78 +264,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);
			@@ -352,12 +363,12 @@


			} catch {
			Console.WriteLine ("controlAllLight catch");
			Utlis.WriteLine ("controlAllLight catch");
			} finally {
			Application.RunOnMainThread (() => {
			MainPage.Loading.Hide ();
			});
			//Console.WriteLine ("controlAllLight Loading.Hide");
			//Utlis.WriteLine ("controlAllLight Loading.Hide");
			}
			});
			}
			@@ -583,14 +594,14 @@
			var lightList = new List<Common> ();
			foreach (var room in Room.Lists) {
			if (room == null) {
			Console.WriteLine ("Null is Room");
			Utlis.WriteLine ("Null is Room");
			continue;
			}
			Console.WriteLine ("RoomCount" + Room.Lists.Count);
			Utlis.WriteLine ("RoomCount" + Room.Lists.Count);

			Console.WriteLine (room.Name);
			Utlis.WriteLine (room.Name);
			if (string.IsNullOrEmpty (room.Name)) {
			Console.WriteLine ("Null is Room Name");
			Utlis.WriteLine ("Null is Room Name");
			continue;
			}
			foreach (var common in room.DeviceList) {
			@@ -1050,7 +1061,7 @@
			}
			#endregion

			Console.WriteLine ("L6");
			Utlis.WriteLine ("L6");
			}


			@@ -1065,12 +1076,12 @@
			{
			if (isCheckIsReadingAll) {
			if (IsReadingAll && !isRead) {
			Console.WriteLine ("============>IsReadingAll Light读取中");
			Utlis.WriteLine ("============>IsReadingAll Light读取中");
			return;
			}
			}
			#if DEBUG
			Console.WriteLine ("============>readAllStatus Light 开始读取");
			Utlis.WriteLine ("============>readAllStatus Light 开始读取");
			#endif
			if (isRead) {
			foreach (Room room in Room.Lists) {