From 19397c2a95efa904cccaf299363dc0111af28042 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 八月 2023 19:47:53 +0800
Subject: [PATCH] 2023年08月07日19:47:43
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 380 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 356 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 2cb4899..5508c06 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -2,6 +2,7 @@
using Shared;
using System.Collections.Generic;
using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
@@ -55,12 +56,120 @@
#region 缂栬緫璁惧鐘舵��
switch (device.spk)
{
+ //缇ゆ帶
+ case SPK.GroupControl:
+ int height = Application.GetRealHeight(50);
+ int attributesNameId=0;
+ int count = 0;
+ foreach (var attr in (device as GroupControl).attributes)
+ {
+ if (attr.key == FunctionAttributeKey.OnOff ||
+ attr.key == FunctionAttributeKey.Brightness ||
+ attr.key == FunctionAttributeKey.CCT ||
+ attr.key == FunctionAttributeKey.RGB ||
+ attr.key == FunctionAttributeKey.Colorful)
+ {
+ LogicView.FunTypeView view = new LogicView.FunTypeView();
+ view.btnState.Name = "缇ゆ帶";
+ view.frameLayout.Y = count * height;
+ fLayout.AddChidren(view.FLayoutView());
+ count++;
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ attributesNameId = StringId.switchLogic;
+ ///寮�鍏崇偣鍑讳簨浠�
+ view.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, view.btnState, 2);
+ };
+ break;
+ case FunctionAttributeKey.Brightness:
+ attributesNameId = StringId.brightnesLogic;
+ view.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ ///浜害鐐瑰嚮浜嬩欢
+ view.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, view.btnState, view.btnText.Text);
+
+ };
+ break;
+ case FunctionAttributeKey.CCT:
+ attributesNameId = StringId.ColorTemperature;
+ ///鑹叉俯鐐瑰嚮浜嬩欢
+ view.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ ColorTemperatureMethod(device, view.btnState, view.btnText.Text);
+
+ };
+ break;
+ case FunctionAttributeKey.RGB:
+ attributesNameId = StringId.rgbsepan;
+ view.btnState.Tag = "";
+ view.btnState.Width = Application.GetRealWidth(16);
+ view.btnState.Height = Application.GetRealWidth(16);
+ view.btnState.Radius = (uint)Application.GetRealWidth(8);
+ view.btnState.X = Application.GetRealWidth(375 - 48 - 16);
+ ///RGB鑹茬洏鐐瑰嚮浜嬩欢
+ view.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ RgbColorDiskMethod(device, view.btnState, view.btnText.Text);
+ };
+ break;
+ case FunctionAttributeKey.Colorful:
+ attributesNameId = StringId.ColorfulFunction;
+ view.btnState.Name = "colorful";
+ ///寮�鍏崇偣鍑讳簨浠�
+ view.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, view.btnState, 2);
+ };
+ break;
+ }
+ view.btnText.TextID = attributesNameId;
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, view.btnState, null, null, null, attr.key);
+ }
+ }
+ }
+
+ //璁惧寤舵椂iewv
+ DelayView(fLayout, height* count);
+ break;
+ //鎻掑骇(鏈塙SB)
+ case SPK.PanelSocket:
+ {
+ #region 鐣岄潰
+ ///鎬绘帶寮�鍏�
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+ view1.btnText.TextID = StringId.zongkogkaiguan;
+ view1.btnState.Name = "鎬绘帶寮�鍏�";
+ fLayout.AddChidren(view1.FLayoutView());
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, view1.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///鎬绘帶寮�鍏崇偣鍑讳簨浠�
+ view1.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, view1.btnState, 2);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, view1.btnState, null, null, null);
+ }
+ #endregion
+ }
+ break;
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
case SPK.LightSwitch:
- //鎻掑骇
- case SPK.PanelSocket:
case SPK.ElectricSocket:
+ //鏈烘鎵�
+ case SPK.MechanicalArm:
{
#region 鐣岄潰
///寮�鍏�
@@ -87,9 +196,8 @@
break;
//鐏厜寮�鍏� 浜害
case SPK.LightDimming:
- case SPK.LightRGB:
- case SPK.LightRGBW:
- case SPK.LightCCT:
+ //case SPK.LightRGB:
+ //case SPK.LightRGBW:
{
#region 鐣岄潰
///寮�鍏�
@@ -125,6 +233,107 @@
#endregion
}
break;
+ case SPK.LightRGB:
+ case SPK.LightRGBW:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
+ lightSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(lightSwitchView.FLayoutView());
+ ///浜害
+ LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
+ brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
+ brightnessView.btnText.TextID = StringId.brightnesLogic;
+ fLayout.AddChidren(brightnessView.FLayoutView());
+ brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ ///RGB鑹茬洏
+ LogicView.FunTypeView rgbView = new LogicView.FunTypeView();
+ rgbView.frameLayout.Y = brightnessView.frameLayout.Bottom;
+ rgbView.btnText.TextID = StringId.rgbsepan;
+ rgbView.btnState.Tag = "";
+ rgbView.btnState.Width = Application.GetRealWidth(16);
+ rgbView.btnState.Height = Application.GetRealWidth(16);
+ rgbView.btnState.Radius = (uint)Application.GetRealWidth(8);
+ rgbView.btnState.X = Application.GetRealWidth(375 - 48 - 16);
+ fLayout.AddChidren(rgbView.FLayoutView());
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, rgbView.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, lightSwitchView.btnState, 2);
+ };
+ ///浜害鐐瑰嚮浜嬩欢
+ brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
+
+ };
+ ///RGB鑹茬洏鐐瑰嚮浜嬩欢
+ rgbView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ RgbColorDiskMethod(device, rgbView.btnState, rgbView.btnText.Text);
+
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, rgbView.btnState, null);
+ }
+ #endregion
+ }
+ break;
+ case SPK.LightCCT:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
+ lightSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(lightSwitchView.FLayoutView());
+ ///浜害
+ LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
+ brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
+ brightnessView.btnText.TextID = StringId.brightnesLogic;
+ fLayout.AddChidren(brightnessView.FLayoutView());
+ brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ ///鑹叉俯
+ LogicView.FunTypeView colorTemperatureView = new LogicView.FunTypeView();
+ colorTemperatureView.frameLayout.Y = brightnessView.frameLayout.Bottom;
+ colorTemperatureView.btnText.TextID = StringId.ColorTemperature;
+ fLayout.AddChidren(colorTemperatureView.FLayoutView());
+ colorTemperatureView.btnState.Text = "2700k";
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, colorTemperatureView.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, lightSwitchView.btnState, 2);
+ };
+ ///浜害鐐瑰嚮浜嬩欢
+ brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
+
+ };
+ ///鑹叉俯鐐瑰嚮浜嬩欢
+ colorTemperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ ColorTemperatureMethod(device, colorTemperatureView.btnState, colorTemperatureView.btnText.Text);
+
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, colorTemperatureView.btnState, null);
+ }
+ #endregion
+ }
+ break;
//绐楀笜
case SPK.CurtainSwitch:
{
@@ -156,10 +365,10 @@
///寮�鍏�
LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
curtainSwitchView.btnText.TextID = StringId.switchLogic;
- fLayout.AddChidren(curtainSwitchView.FLayoutView());
+ //fLayout.AddChidren(curtainSwitchView.FLayoutView());//2023骞�04鏈�17鏃�16:27:10 浜у搧瑕佹眰鐨勫幓鎺�
///鐧惧垎姣�
LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
- crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
+ //crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
crtainPercentumView.btnText.TextID = StringId.percentum;
fLayout.AddChidren(crtainPercentumView.FLayoutView());
crtainPercentumView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
@@ -224,6 +433,7 @@
break;
case SPK.AcStandard:
case SPK.HvacAC:
+ case SPK.AcIr:
{
#region 鐣岄潰
///寮�鍏�
@@ -257,6 +467,9 @@
{
SwitchViewMethod(device, acSwitchVie.btnState, 2);
};
+ int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min;
+ int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max;
+ string unit = InpOrOutLogicMethod.Current.GetTemperatureUnit(device);
///娓╁害鐐瑰嚮浜嬩欢
temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -270,11 +483,10 @@
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "set_temp";
selectedState = device.spk + "_" + keyVlaue;
- string set_temp_value = stateStr.Replace("鈩�", "");
+ string set_temp_value = stateStr.Replace(unit, "");
//鏁版嵁灏佽
AddDictionary(keyVlaue, set_temp_value);
- });
-
+ }, min, max, unit);
};
///妯″紡鐐瑰嚮浜嬩欢
@@ -361,6 +573,9 @@
///娓╁害鐐瑰嚮浜嬩欢
temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
{
+ int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min;
+ int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max;
+ string unit = InpOrOutLogicMethod.Current.GetTemperatureUnit(device);
string tempValue = temperatureView.btnState.Text;
LogicView.TemperatureView tempView = new LogicView.TemperatureView();
tempView.FLayoutView(this, tempValue, (stateStr) =>
@@ -370,11 +585,11 @@
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "set_temp";
selectedState = device.spk + "_" + keyVlaue;
- string set_temp_value = stateStr.Replace("鈩�", "");
+ string set_temp_value = stateStr.Replace(unit, "");
//鏁版嵁灏佽
AddDictionary(keyVlaue, set_temp_value);
- });
+ }, min, max, unit);
};
///妯″紡鐐瑰嚮浜嬩欢
@@ -509,6 +724,13 @@
volView.btnText.TextID = StringId.volumeMusic;
fLayout.AddChidren(volView.FLayoutView());
+ //if (SPK.AvMusic == device.spk)
+ //{
+ // //涓嶆敮鎸佺壒娈婅闊�
+ // volView.frameLayout.Y = Application.GetRealHeight(0);
+ //}
+
+
///璁惧寤舵椂iewv
DelayView(fLayout, volView.frameLayout.Bottom);
#endregion
@@ -526,25 +748,30 @@
{
//HDL_ON.DriverLayer.Control.Ins.GetMusicDirectory(device);
//var palyListName = Music.SendMethod.mMethod.GetListName(device);
- var palyList= Music.SendMethod.Current.GetListMusic(device, "hdl_special");
- List<string> musicNameList = new List<string>();
+ var palyList= Music.SendMethod.Current.GetSingleSongList(device, "hdl_special","");
+ List<string> songNameList = new List<string>();
for (int i = 0; i < palyList.songs.Count; i++)
{
- var music = palyList.songs[i];
- musicNameList.Add(music.name);
+ var song = palyList.songs[i];
+ songNameList.Add(song.name);
}
Application.RunOnMainThread(() =>
{
loading.Hide();
PublicInterface publicInterface = new PublicInterface();
- publicInterface.FrameOrVv(this, musicNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
+ publicInterface.FrameOrVv(this, songNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
{
- var musicSelecetd = palyList.songs[index2];
+ var songSelecetd = palyList.songs[index2];
//鐣岄潰鏄剧ず閫変腑鍊�
- funTypeView.btnState.Text = musicSelecetd.name;
+ funTypeView.btnState.Text = songSelecetd.name;
//鏁版嵁灏佽
AddDictionary("playlist_name", palyList.group);//鍒楄〃鍚�
- AddDictionary("song_name", musicSelecetd.name);//姝屾洸鍚�
+ AddDictionary("song_name", songSelecetd.name);//姝屾洸鍚�
+ if (!string.IsNullOrEmpty(songSelecetd.url))
+ {
+ //瀛樺湪url灏变竴璧峰彂閫佽繃鍘�
+ AddDictionary("url", songSelecetd.url);
+ }
},false);
@@ -621,6 +848,7 @@
break;
}
case SPK.HvacAC:
+ case SPK.AcIr:
case SPK.AcStandard:
case SPK.FloorHeatStandard:
case SPK.HvacFloorHeat:
@@ -666,9 +894,14 @@
}
}
break;
+ case SPK.GroupControl:
+ {
+ outputDevice.target_type = "5";
+ }
+ break;
}
- outputDevice.status = dicSateteList;
+ outputDevice.status.AddRange(dicSateteList);
if (edit)
{
@@ -770,6 +1003,26 @@
selectedState = device.spk + "_" + strValue;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "on_off";
+ switch (device.spk)
+ {
+ case SPK.PanelSocket:
+ {
+ if (button.Name == "鎬绘帶寮�鍏�")
+ {
+ keyVlaue = "on_off_master";
+ }
+ }
+ break;
+ case SPK.GroupControl:
+ {
+ if (button.Name == "colorful")
+ {
+ keyVlaue = "colorful";
+ }
+
+ }
+ break;
+ }
//鏁版嵁灏佽
AddDictionary(keyVlaue, strValue);
});
@@ -800,6 +1053,7 @@
case SPK.LightRGB:
case SPK.LightRGBW:
case SPK.LightCCT:
+ case SPK.GroupControl:
{
keyVlaue = "brightness";
}
@@ -824,6 +1078,81 @@
}
/// <summary>
+ /// 鑹叉俯(cct)=鍔熻兘涓嬩竴绾х晫闈�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="button"></param>
+ private void ColorTemperatureMethod(Entity.Function device, Button button, string titleName)
+ {
+ #region 鐣岄潰
+ //涔嬪墠鐨勭姸鎬佸��
+ string stateVlaue = button.Text;
+ LogicView.ColorTemperature brightness = new LogicView.ColorTemperature();
+ brightness.FLayoutView(this, titleName, stateVlaue, (colorTemperatureValue, unitStr) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ button.Text = colorTemperatureValue + unitStr;
+ selectedState = device.spk + colorTemperatureValue.ToString();
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "";
+ switch (device.spk)
+ {
+ case SPK.LightCCT:
+ case SPK.GroupControl:
+ {
+ keyVlaue = "cct";
+ }
+ break;
+ }
+ //鏁版嵁灏佽
+ AddDictionary(keyVlaue, colorTemperatureValue);
+ });
+ #endregion
+
+ }
+
+ /// <summary>
+ /// RGB鑹茬洏涓撶敤
+ /// </summary>
+ /// <param name="device">璁惧</param>
+ /// <param name="button">鐘舵�佹帶浠�</param>
+ /// <param name="titleName">鏍囬</param>
+ private void RgbColorDiskMethod(Entity.Function device, Button button, string titleName)
+ {
+ LogicView.RGBColorView rgbColorView = new LogicView.RGBColorView();
+ rgbColorView.LoadRGBDialog(button.Tag.ToString(), (rgbValueStr) =>
+ {
+ button.BackgroundColor = rgbColorView.GetBackgroundColor(rgbValueStr);
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ button.Tag = rgbValueStr;
+ //button.Text = rgbValueStr;
+ selectedState = device.spk + rgbValueStr.ToString();
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "";
+ switch (device.spk)
+ {
+ case SPK.LightRGB:
+ case SPK.GroupControl:
+ {
+ keyVlaue = "rgb";
+ }
+ break;
+ case SPK.LightRGBW:
+ {
+ keyVlaue = "rgbw";
+ }
+ break;
+ }
+ //鏁版嵁灏佽
+ AddDictionary(keyVlaue, rgbValueStr);
+ });
+
+ }
+
+
+
+
+ /// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
/// <param name="device">缂栬緫璁惧</param>
@@ -832,7 +1161,8 @@
/// <param name="button2">鏄剧ずBtn</param>
/// <param name="button3">鏄剧ずBtn</param>
/// <param name="button4">鏄剧ずBtn</param>
- private void GetEditDeviceState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4)
+ /// <param name="attribute">灞炴�ey</param>
+ private void GetEditDeviceState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4, string attribute="")
{
Output outputs = Logic.currlogic.output[index];
var dicList = outputs.status;
@@ -841,7 +1171,7 @@
if (dicList.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = dicList;
+ dicSateteList.AddRange(dicList);
}
if (this.btnDelay != null)
{
@@ -849,7 +1179,7 @@
this.btnDelay.Text = outputs.delay + "s";
this.strdelay = outputs.delay;
}
- InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
+ InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4, attribute);
}
/// <summary>
/// 娣诲姞閫変腑鏁版嵁
@@ -926,5 +1256,7 @@
}
+
+
}
}
--
Gitblit v1.8.0