From bfb3d0d4879dca8c59ff287c92f5113162f3a33a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 27 八月 2024 15:22:48 +0800
Subject: [PATCH] 代码备份
---
OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 285 +++++++++++++++++----------------------------------------
1 files changed, 85 insertions(+), 200 deletions(-)
diff --git a/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 26c55dc..66a38a3 100644
--- a/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/OnPro/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
{
@@ -21,6 +22,10 @@
/// </summary>
private Button btnDelay =null;
/// <summary>
+ /// 褰撳墠璁惧
+ /// </summary>
+ private Function device;
+ /// <summary>
/// 瀹氫箟涓�涓褰曢�変腑璁惧鐘舵�佸垪琛紱
/// </summary>
private List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
@@ -31,6 +36,7 @@
public void Show(Entity.Function device, int index, bool edit)
{
#region 鐣岄潰甯冨眬
+ this.device = device;
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
LogicView.TopView topView = new LogicView.TopView();
this.AddChidren(topView.FLayoutView());
@@ -56,96 +62,14 @@
#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 = "鎬绘帶寮�鍏�";
+ view1.btnText.TextID = StringId.switchLogic;
+ //view1.btnState.Name = "鎬绘帶寮�鍏�";
fLayout.AddChidren(view1.FLayoutView());
///璁惧寤舵椂iewv
DelayView(fLayout, view1.frameLayout.Bottom);
@@ -164,7 +88,23 @@
#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.OtherCommon:
case SPK.AirSwitch:
case SPK.LightSwitch:
case SPK.ElectricSocket:
@@ -196,8 +136,8 @@
break;
//鐏厜寮�鍏� 浜害
case SPK.LightDimming:
- //case SPK.LightRGB:
- //case SPK.LightRGBW:
+ //case SPK.LightRGB:
+ //case SPK.LightRGBW:
{
#region 鐣岄潰
///寮�鍏�
@@ -709,94 +649,6 @@
#endregion
}
break;
- //闊充箰
- case SPK.MusicStandard:
- case SPK.AvMusic:
- {
- #region 鐣岄潰
- //鎻愮ず璇煶
- LogicView.FunTypeView funTypeView = new LogicView.FunTypeView();
- funTypeView.btnText.TextID = StringId.tishiyin;
- fLayout.AddChidren(funTypeView.FLayoutView());
- ///闊抽噺
- LogicView.FunTypeView volView = new LogicView.FunTypeView();
- volView.frameLayout.Y = funTypeView.frameLayout.Bottom;
- volView.btnText.TextID = StringId.volumeMusic;
- fLayout.AddChidren(volView.FLayoutView());
-
- ///璁惧寤舵椂iewv
- DelayView(fLayout, volView.frameLayout.Bottom);
- #endregion
- #region 鐐瑰嚮浜嬩欢
- ///鎻愮ず璇煶鐐瑰嚮浜嬩欢
- funTypeView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- selectedState = device.spk + "_";
- Loading loading = new Loading();
- this.AddChidren(loading);
- loading.Start();
- System.Threading.Tasks.Task.Run(() =>
- {
- try
- {
- //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>();
- for (int i = 0; i < palyList.songs.Count; i++)
- {
- var song = palyList.songs[i];
- songNameList.Add(song.name);
- }
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- PublicInterface publicInterface = new PublicInterface();
- publicInterface.FrameOrVv(this, songNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
- {
- var songSelecetd = palyList.songs[index2];
- //鐣岄潰鏄剧ず閫変腑鍊�
- funTypeView.btnState.Text = songSelecetd.name;
- //鏁版嵁灏佽
- AddDictionary("playlist_name", palyList.group);//鍒楄〃鍚�
- AddDictionary("song_name", songSelecetd.name);//姝屾洸鍚�
- if (!string.IsNullOrEmpty(songSelecetd.url))
- {
- //瀛樺湪url灏变竴璧峰彂閫佽繃鍘�
- AddDictionary("url", songSelecetd.url);
- }
-
- },false);
-
- });
- }
- catch { }
-
- });
- };
- ///闊抽噺鐐瑰嚮浜嬩欢
- 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);
- };
-
- if (edit)
- {
- //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
- GetEditDeviceState(device, index, funTypeView.btnState, volView.btnState, null, null);
- }
-
- #endregion
- }
- break;
}
#endregion
@@ -940,7 +792,7 @@
LogicView.FunTypeView delayView = new LogicView.FunTypeView();
delayView.frameLayout.Y = bottomY;
delayView.btnText.TextID = StringId.Delay;
- delayView.btnState.Text = strdelay + "s";
+ delayView.btnState.Text = LogicMethod.Current.getTimeStr(strdelay);
fLayout.AddChidren(delayView.FLayoutView());
///璧嬪�煎璞�
this.btnDelay = delayView.btnState;
@@ -950,9 +802,9 @@
InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
inpOrOutLogicMethod.Delayed(this, strdelay, (value) =>
{
- selectedState = "delay_" + strdelay;
strdelay = value.ToString();
- delayView.btnState.Text = strdelay + "s";
+ delayView.btnState.Text = LogicMethod.Current.getTimeStr(strdelay);
+ selectedState = "delay_" + strdelay;
});
};
@@ -970,10 +822,10 @@
FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
this.AddChidren(frame);
LogicView.SwitchView switchView = new LogicView.SwitchView();
- switchView.FLayoutView(frame, len, button.Text, (strValue) =>
+ switchView.FLayoutView(frame, len, button.Text, (value) =>
{
int id = 0;
- switch (strValue)
+ switch (value)
{
case "on":
{
@@ -991,33 +843,45 @@
}
break;
}
+
//鐣岄潰鏄剧ず閫変腑鍊�
button.TextID = id;
- selectedState = device.spk + "_" + strValue;
+ selectedState = device.spk + "_" + value;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
- string keyVlaue = "on_off";
+ string key = "on_off";
switch (device.spk)
{
case SPK.PanelSocket:
{
- if (button.Name == "鎬绘帶寮�鍏�")
- {
- keyVlaue = "on_off_master";
- }
+ //if (button.Name == "鎬绘帶寮�鍏�")
+ //{
+ // key = "on_off_master";
+ //}
}
break;
case SPK.GroupControl:
{
if (button.Name == "colorful")
{
- keyVlaue = "colorful";
+ key = "colorful";
}
}
break;
+ case SPK.ElectricalTvHisense:
+ {
+ if ("on" == value)
+ {
+ key = "wol";
+ }
+
+ }
+ break;
+
}
+
//鏁版嵁灏佽
- AddDictionary(keyVlaue, strValue);
+ AddDictionary(key, value);
});
#endregion
}
@@ -1063,6 +927,12 @@
}
}
break;
+ case SPK.ElectricalTvHisense:
+ {
+ keyVlaue = "set_volume";
+ }
+ break;
+
}
//鏁版嵁灏佽
AddDictionary(keyVlaue, brightnesValue);
@@ -1143,8 +1013,6 @@
}
-
-
/// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
@@ -1169,7 +1037,7 @@
if (this.btnDelay != null)
{
///寤舵椂鏄剧ず鏂囨湰
- this.btnDelay.Text = outputs.delay + "s";
+ this.btnDelay.Text =LogicMethod.Current.getTimeStr(outputs.delay);
this.strdelay = outputs.delay;
}
InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4, attribute);
@@ -1177,29 +1045,45 @@
/// <summary>
/// 娣诲姞閫変腑鏁版嵁
/// </summary>
- /// <param name="KeyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
- /// <param name="selectedValue">鐘舵�佸��</param>
- private void AddDictionary(string KeyValue, string selectedValue)
+ /// <param name="key">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
+ /// <param name="value">鐘舵�佸��</param>
+ private void AddDictionary(string key, string value)
{
//鏁版嵁灏佽
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.Current.dictionary(dic, "key", KeyValue);
- LogicMethod.Current.dictionary(dic, "value", selectedValue);
- AddDictionaryList(KeyValue, dic);
+ LogicMethod.Current.dictionary(dic, "key", key);
+ LogicMethod.Current.dictionary(dic, "value", value);
+ AddDictionaryList(key, dic);
}
/// <summary>
/// 鏇存柊鏁版嵁鍒楄〃
/// </summary>
- /// <param name="keyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
+ /// <param name="key">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
/// <param name="dictionary">娣诲姞閫変腑鏁版嵁</param>
/// <returns></returns>
- private void AddDictionaryList(string keyValue, Dictionary<string, string> dictionary)
+ private void AddDictionaryList(string key, Dictionary<string, string> dictionary)
{
+
+ if (this.device.spk == SPK.ElectricalTvHisense)
+ {
+ //鐗规畩澶勭悊
+ if (key == "on_off")
+ {
+ key = "wol";
+ }
+ else if (key == "wol")
+ {
+ key = "on_off";
+ }
+
+ }
+
+
int indexValue = -1;
for (int i = 0; i < dicSateteList.Count; i++)
{
var dic = dicSateteList[i];
- if (dic.ContainsValue(keyValue))
+ if (dic.ContainsValue(key))
{
//鍒ゆ柇鏄惁瀛樺湪
indexValue = i;
@@ -1221,6 +1105,7 @@
}
}
+
/// <summary>
/// 娣诲姞鐩爣
/// </summary>
--
Gitblit v1.8.0