~wxr/OnPro.git - Gitblit

			@@ -7,64 +7,110 @@
			public partial class RGBWPage
			{
			/// <summary>
			/// 通知更新界面的时间
			/// </summary>
			DateTime notiyUpdateTime = DateTime.MinValue;
			System.Threading.Thread updateUiThread;
			object lockObj = new object();
			/// <summary>
			/// 更新功能状态
			/// </summary>
			public static void UpdataStates(Function updateTemp)
			{
			Application.RunOnMainThread((() =>
			if (bodyView == null)
			{
			try
			return;
			}
			lock (bodyView.lockObj)
			{
			MainPage.Log($"收到更新" + DateTime.Now.Ticks);
			bodyView.notiyUpdateTime = DateTime.Now;
			if (bodyView.updateUiThread == null)
			{
			if (bodyView == null)
			return;
			if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
			bodyView.updateUiThread = new System.Threading.Thread(() =>
			{
			while (true)
			{
			System.Threading.Thread.Sleep(1500);
			if (bodyView == null)
			{
			return;
			}
			if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
			{
			MainPage.Log("没有新数据，更新UI");
			break;
			}
			else
			{
			MainPage.Log("有新数据，继续等待");
			}
			}
			Application.RunOnMainThread(() =>
			{
			try
			{
			if (bodyView == null)
			return;
			if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
			{

			if (updateTemp.trait_on_off.curValue.ToString() == "on")
			{
			//解决部分安卓手机，刷新图片时会变小问题
			if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheel.png")
			{
			bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
			if (updateTemp.trait_on_off.curValue.ToString() == "on")
			{
			//解决部分安卓手机，刷新图片时会变小问题
			if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheel.png")
			{
			bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
			}
			bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
			bodyView.btnSwitch.IsSelected = true;
			if (!bodyView.onDimmerBar)
			{
			bodyView.dimmerBar.Progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Brightness));
			}
			}
			//状态一样时,不再刷新视图
			else if (updateTemp.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
			{
			//解决部分安卓手机，刷新图片时会变小问题
			if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png")
			{
			bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
			}
			//bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
			bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
			bodyView.btnSwitch.IsSelected = false;
			//色盘的圆点隐藏
			bodyView.btnWhiteRound.Visible = false;
			}
			bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.lightTemp.GetRGBcolor(updateTemp.GetAttrState(FunctionAttributeKey.RGBW)));
			bodyView.lastColor = bodyView.lightTemp.GetRGBWbytes(updateTemp);
			if (bodyView.lightTemp.GetRGBcolor(updateTemp.GetAttrState(FunctionAttributeKey.RGBW)) == 16777215 && bodyView.btnCurColor.BorderColor != 0x00000000)
			{
			bodyView.btnCurColor.BorderColor = CSS.CSS_Color.PromptingColor2;
			}
			else
			{
			bodyView.btnCurColor.BorderColor = 0x00000000;
			}
			}
			}
			bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
			bodyView.btnSwitch.IsSelected = true;
			if (!bodyView.onDimmerBar)
			catch (Exception ex)
			{
			bodyView.dimmerBar.Progress = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Brightness));
			MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
			}
			}
			//状态一样时,不再刷新视图
			else if (updateTemp.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
			{
			//解决部分安卓手机，刷新图片时会变小问题
			if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png")
			finally
			{
			bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
			bodyView.updateUiThread = null;
			}
			//bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
			bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
			bodyView.btnSwitch.IsSelected = false;
			//色盘的圆点隐藏
			bodyView.btnWhiteRound.Visible = false;
			}
			bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.lightTemp.GetRGBcolor(updateTemp.GetAttrState(FunctionAttributeKey.RGBW)));
			bodyView.lastColor = bodyView.lightTemp.GetRGBWbytes(updateTemp);
			if (bodyView.lightTemp.GetRGBcolor(updateTemp.GetAttrState(FunctionAttributeKey.RGBW)) == 16777215 && bodyView.btnCurColor.BorderColor != 0x00000000)
			{
			bodyView.btnCurColor.BorderColor = CSS.CSS_Color.PromptingColor2;
			}
			else
			{
			bodyView.btnCurColor.BorderColor = 0x00000000;
			}
			}
			});


			bodyView.updateUiThread.IsBackground = true;
			bodyView.updateUiThread.Start();
			});
			}
			catch (Exception ex)
			{
			MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
			}
			}));
			}
			}


			@@ -256,25 +302,25 @@
			d.Add(FunctionAttributeKey.Brightness, e.ToString());
			Control.Ins.SendWriteCommand(function, d);
			}
			else
			{
			if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
			{
			function.refreshTime = DateTime.Now;
			new System.Threading.Thread(() =>
			{
			//Control.Send(CommandType_A.write, function);
			System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
			d.Add(FunctionAttributeKey.Brightness, e.ToString());
			Control.Ins.SendWriteCommand(function, d);
			})
			{ IsBackground = true }.Start();
			}
			else
			{
			MainPage.Log("skip dimmer control!!");
			}
			}
			//else
			//{
			// if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
			// {
			// function.refreshTime = DateTime.Now;
			// new System.Threading.Thread(() =>
			// {
			// //Control.Send(CommandType_A.write, function);
			// System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
			// d.Add(FunctionAttributeKey.Brightness, e.ToString());
			// Control.Ins.SendWriteCommand(function, d);
			// })
			// { IsBackground = true }.Start();
			// }
			// else
			// {
			// MainPage.Log("skip dimmer control!!");
			// }
			//}
			};
			}
			}