From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 124 +++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 9c88669..89a1e85 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using System.Linq;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
@@ -59,7 +60,7 @@
//缇ゆ帶
case SPK.GroupControl:
int height = Application.GetRealHeight(50);
- int attributesNameId=0;
+ int attributesNameId = 0;
int count = 0;
foreach (var attr in (device as GroupControl).attributes)
{
@@ -136,7 +137,7 @@
}
//璁惧寤舵椂iewv
- DelayView(fLayout, height* count);
+ DelayView(fLayout, height * count);
break;
//鎻掑骇(鏈塙SB)
case SPK.PanelSocket:
@@ -163,6 +164,21 @@
}
#endregion
}
+ break;
+ case SPK.CommonSeries:
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView SerriesSwitchView = new LogicView.FunTypeView();
+ SerriesSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(SerriesSwitchView.FLayoutView());
+
+ #endregion
+ ///寮�鍏崇偣鍑讳簨浠�
+ SerriesSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, SerriesSwitchView.btnState, 2);
+ };
+
break;
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
@@ -196,8 +212,8 @@
break;
//鐏厜寮�鍏� 浜害
case SPK.LightDimming:
- //case SPK.LightRGB:
- //case SPK.LightRGBW:
+ //case SPK.LightRGB:
+ //case SPK.LightRGBW:
{
#region 鐣岄潰
///寮�鍏�
@@ -721,7 +737,7 @@
///闊抽噺
LogicView.FunTypeView volView = new LogicView.FunTypeView();
volView.frameLayout.Y = funTypeView.frameLayout.Bottom;
- volView.btnText.TextID = StringId.volumeMusic;
+ volView.btnText.TextID = StringId.volumeMusic;
fLayout.AddChidren(volView.FLayoutView());
//if (SPK.AvMusic == device.spk)
@@ -729,7 +745,7 @@
// //涓嶆敮鎸佺壒娈婅闊�
// volView.frameLayout.Y = Application.GetRealHeight(0);
//}
-
+
///璁惧寤舵椂iewv
DelayView(fLayout, volView.frameLayout.Bottom);
@@ -748,11 +764,11 @@
{
//HDL_ON.DriverLayer.Control.Ins.GetMusicDirectory(device);
//var palyListName = Music.SendMethod.mMethod.GetListName(device);
- var palyList= Music.SendMethod.Current.GetSingleSongList(device, "hdl_special","");
- List<string> songNameList = 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 song = palyList.songs[i];
+ var song = palyList.songs[i];
songNameList.Add(song.name);
}
Application.RunOnMainThread(() =>
@@ -761,7 +777,7 @@
PublicInterface publicInterface = new PublicInterface();
publicInterface.FrameOrVv(this, songNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
{
- var songSelecetd = palyList.songs[index2];
+ var songSelecetd = palyList.songs[index2];
//鐣岄潰鏄剧ず閫変腑鍊�
funTypeView.btnState.Text = songSelecetd.name;
//鏁版嵁灏佽
@@ -773,7 +789,7 @@
AddDictionary("url", songSelecetd.url);
}
- },false);
+ }, false);
});
}
@@ -787,12 +803,12 @@
selectedState = device.spk + "_volume";
new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
{
-
+
//鐣岄潰鏄剧ず閫変腑鍊�
- volView.btnState.Text =value;
+ volView.btnState.Text = value;
//鏁版嵁灏佽
AddDictionary("volume", value);//闊抽噺
- },0,100);
+ }, 0, 100);
};
if (edit)
@@ -809,18 +825,18 @@
{
#region 鐣岄潰
///寮�鍏�
- LogicView.FunTypeView switchView = new LogicView.FunTypeView();
+ LogicView.FunTypeView switchView = new LogicView.FunTypeView();
switchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(switchView.FLayoutView());
- /////闊抽噺
- //LogicView.FunTypeView volView = new LogicView.FunTypeView();
- //volView.frameLayout.Y = switchView.frameLayout.Bottom;
- //volView.btnText.TextID = StringId.yinliang;
- //fLayout.AddChidren(volView.FLayoutView());
+ ///闊抽噺
+ LogicView.FunTypeView volView = new LogicView.FunTypeView();
+ volView.frameLayout.Y = switchView.frameLayout.Bottom;
+ volView.btnText.TextID = StringId.yinliang;
+ fLayout.AddChidren(volView.FLayoutView());
///淇″彿婧�
- LogicView.FunTypeView sourceView = new LogicView.FunTypeView();
- sourceView.frameLayout.Y = switchView.frameLayout.Bottom;
+ LogicView.FunTypeView sourceView = new LogicView.FunTypeView();
+ sourceView.frameLayout.Y = volView.frameLayout.Bottom;
sourceView.btnText.TextID = StringId.xinhaoyuan;
fLayout.AddChidren(sourceView.FLayoutView());
@@ -833,22 +849,22 @@
{
SwitchViewMethod(device, switchView.btnState, 2);
};
- /////闊抽噺鐐瑰嚮浜嬩欢
- //volView.btnClick.MouseUpEventHandler += (sender, e) =>
- //{
- // selectedState = device.spk + "_volume";
- // //new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
- // //{
+ ///闊抽噺鐐瑰嚮浜嬩欢
+ volView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ //selectedState = device.spk + "_volume";
+ //new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
+ //{
- // // //鐣岄潰鏄剧ず閫変腑鍊�
- // // volView.btnState.Text = value;
- // // //鏁版嵁灏佽
- // // AddDictionary("volume", value);//闊抽噺
- // //}, 0, 100);
+ // //鐣岄潰鏄剧ず閫変腑鍊�
+ // volView.btnState.Text = value;
+ // //鏁版嵁灏佽
+ // AddDictionary("setvolume", value);//闊抽噺
+ //}, 0, 100);
- // BrightnessMethod(device, volView.btnState, volView.btnText.Text);
+ BrightnessMethod(device, volView.btnState, volView.btnText.Text);
- //};
+ };
///淇″彿婧愮偣鍑讳簨浠�
sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -856,23 +872,16 @@
///涔嬪墠鐨勭姸鎬佹枃鏈�
string currText = sourceView.btnState.Text;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
- string key = "signal";
+ string key = "signal";
selectedState = device.spk + "_" + key;
PublicInterface pif = new PublicInterface();
- var sourceList = new List<string>();
- sourceList.Add("HDML 1");
- sourceList.Add("HDML 2");
- sourceList.Add("HDML 3");
- sourceList.Add("HDML 4");
- sourceList.Add("Live TV");
- sourceList.Add("PS");
- sourceList.Add("AV");
- pif.SingleSelectionShow(this, sourceList, Language.StringByID(StringId.xinhaoyuan), currText
- , (valueStr) =>
+ var dic = pif.GetHisenseSignalSourceDic();
+ pif.SingleSelectionShow(this, dic.Keys.ToList(), Language.StringByID(StringId.xinhaoyuan), currText
+ , (valueStr) =>
{
//鐣岄潰鏄剧ず閫変腑鍊�
sourceView.btnState.Text = valueStr;
- string value = valueStr.Replace(" ", "_");
+ string value = pif.GetValue(dic, valueStr);
//鏁版嵁灏佽
AddDictionary(key, value);
@@ -882,7 +891,7 @@
if (edit)
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
- GetEditDeviceState(device, index, switchView.btnState, sourceView.btnState, null, null);
+ GetEditDeviceState(device, index, switchView.btnState, volView.btnState, sourceView.btnState, null);
}
#endregion
@@ -1107,19 +1116,6 @@
}
break;
- case SPK.ElectricalTvHisense:
- {
- if (id == StringId.onLogic)
- {
- value = "1";
- }
- else
- {
- value = "0";
- }
- }
- break;
-
}
//鏁版嵁灏佽
@@ -1169,6 +1165,12 @@
}
}
break;
+ case SPK.ElectricalTvHisense:
+ {
+ keyVlaue = "set_volume";
+ }
+ break;
+
}
//鏁版嵁灏佽
AddDictionary(keyVlaue, brightnesValue);
--
Gitblit v1.8.0