From b562a582ac3a288193e6e4f57c5eff8a344305a4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 13:52:17 +0800
Subject: [PATCH] Update AndroidManifest.xml
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index b6d04cf..a9e30ac 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -49,6 +50,11 @@
/// 鑹茬洏閲岄潰閭ｄ釜浼氭粦鍔ㄧ殑鐞�
/// </summary>
Button btnWhiteRound;
+ /// <summary>
+ /// 鐐僵寮�鍏虫寜閽�
+ /// </summary>
+ Button btnColorfulSwitch;
+
#endregion
#region 鍖哄煙鍙橀噺
@@ -94,7 +100,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
@@ -228,7 +234,7 @@
dimmerBar = new DiyImageSeekBar()
{
X = Application.GetRealWidth(35 + 22),
- Y = Application.GetRealHeight(312 - magriHeight),
+ Y = Application.GetRealHeight(316 - magriHeight),
Width = Application.GetRealWidth(210),
Height = Application.GetRealHeight(54),
SeekBarViewHeight = Application.GetRealHeight(8),
@@ -308,11 +314,11 @@
SeekBarPadding = Application.GetRealWidth(20),
};
controlView.AddChidren(barFadeTime);
- barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
- {
- function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.Progress);
- function.UpdataFuncitonInfo();
- };
+ //barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
+ //{
+ // function.SetAttrState(FunctionAttributeKey.FadeTime, barFadeTime.Progress);
+ // function.UpdataFuncitonInfo();
+ //};
var btnGradualChangeMaxValuesText = new Button()
{
@@ -329,7 +335,7 @@
};
controlView.AddChidren(btnGradualChangeMaxValuesText);
#endregion
- heightMore = 70;
+ //heightMore += 70;
}
@@ -337,10 +343,11 @@
{
#region 鐐僵鍔熻兘
+
var btnGradualChangeText = new Button()
{
X = Application.GetRealWidth(35),
- Y = Application.GetRealHeight(375+ heightMore- magriHeight),
+ Y = Application.GetRealHeight(heightMore + magriHeight),
Width = Application.GetRealWidth(224),
Height = Application.GetRealHeight(21),
TextAlignment = TextAlignment.CenterLeft,
@@ -350,7 +357,7 @@
};
controlView.AddChidren(btnGradualChangeText);
- var btnGradualChangeMinValuesText = new Button()
+ var btnEditColorful = new Button()
{
X = Application.GetRealWidth(35),
Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
@@ -358,8 +365,8 @@
Height = Application.GetRealHeight(21),
UnSelectedImagePath = "Public/Edit.png",
};
- controlView.AddChidren(btnGradualChangeMinValuesText);
- btnGradualChangeMinValuesText.MouseUpEventHandler = (sender, e) => {
+ controlView.AddChidren(btnEditColorful);
+ btnEditColorful.MouseUpEventHandler = (sender, e) => {
var rgbView = new ColorfulInfoPage(function);
MainPage.BasePageView.AddChidren(rgbView);
rgbView.LoadPage();
@@ -368,23 +375,54 @@
var barColorful = new FrameLayout()
{
- X = btnGradualChangeMinValuesText.Right + Application.GetRealWidth(15),
- Y = Application.GetRealHeight(412 + heightMore-magriHeight),
+ X = btnEditColorful.Right + Application.GetRealWidth(15),
+ Y = Application.GetRealHeight(37 + heightMore + magriHeight),
Width = Application.GetRealWidth(180),
Height = Application.GetRealHeight(8),
BackgroundImagePath = "FunctionIcon/Light/ColorfulBar.png",
};
controlView.AddChidren(barColorful);
- var btnGradualChangeMaxValuesText = new Button()
+ btnColorfulSwitch = new Button()
{
X = barColorful.Right + Application.GetRealWidth(8),
Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(38),
Height = Application.GetRealHeight(24),
- UnSelectedImagePath = "Public/Switch.png"
+ UnSelectedImagePath = "Public/Switch.png",
+ SelectedImagePath = "Public/SwitchOn.png",
};
- controlView.AddChidren(btnGradualChangeMaxValuesText);
+ controlView.AddChidren(btnColorfulSwitch);
+
+ btnColorfulSwitch.MouseUpEventHandler = (sender, e) => {
+ btnColorfulSwitch.IsSelected = !btnColorfulSwitch.IsSelected;
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var controlColorfulState = btnColorfulSwitch.IsSelected ? "on" : "off";
+ function.SetAttrState(FunctionAttributeKey.Colorful, controlColorfulState);
+ System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.Colorful, controlColorfulState);
+ if (controlColorfulState == "on")
+ {
+ var color = function.GetAttrState(FunctionAttributeKey.ColorfulBegin).Split(",");
+ var sendColorString = color[0] + "," + color[1] + "," + color[2];
+ d.Add(FunctionAttributeKey.ColorfulBegin, sendColorString);
+ color = function.GetAttrState(FunctionAttributeKey.ColorfulEnd).Split(",");
+ sendColorString = color[0] + "," + color[1] + "," + color[2];
+ d.Add(FunctionAttributeKey.ColorfulEnd, sendColorString);
+ d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
+ }
+ Control.Ins.SendWriteCommand(function, d);
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鎺у埗鐐僵寮�鍏冲紓甯�:{ex.Message}");
+ }
+ })
+ { IsBackground = true }.Start();
+ };
+
#endregion
@@ -417,11 +455,12 @@
new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(function, actionRefresh);
new System.Threading.Thread(() =>
{
- DriverLayer.Control.Ins.SendReadCommand(function);
+ Control.Ins.SendReadCommand(function);
})
{ IsBackground = true }.Start();
- new System.Threading.Thread(() => {
+ new System.Threading.Thread(() =>
+ {
while (true)
{
System.Threading.Thread.Sleep(1000);
@@ -435,7 +474,8 @@
}
else
{
- DriverLayer.Control.Ins.SendReadCommand(function);
+ System.Threading.Thread.Sleep(1000);
+ Control.Ins.SendReadCommand(function);
curDimmerStatus = true;
}
}
--
Gitblit v1.8.0