From 9107338c027ceff6b14d80aecce30e449793fff7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 二月 2024 16:04:17 +0800
Subject: [PATCH] 线上服务器域名更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 285 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 240 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 26c55dc..9a2e707 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
{
@@ -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());
@@ -59,7 +65,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 +142,7 @@
}
//璁惧寤舵椂iewv
- DelayView(fLayout, height* count);
+ DelayView(fLayout, height * count);
break;
//鎻掑骇(鏈塙SB)
case SPK.PanelSocket:
@@ -144,8 +150,8 @@
#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 +170,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 +218,8 @@
break;
//鐏厜寮�鍏� 浜害
case SPK.LightDimming:
- //case SPK.LightRGB:
- //case SPK.LightRGBW:
+ //case SPK.LightRGB:
+ //case SPK.LightRGBW:
{
#region 鐣岄潰
///寮�鍏�
@@ -714,20 +736,64 @@
case SPK.AvMusic:
{
#region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView switchVie = new LogicView.FunTypeView();
+ switchVie.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(switchVie.FLayoutView());
//鎻愮ず璇煶
LogicView.FunTypeView funTypeView = new LogicView.FunTypeView();
+ funTypeView.frameLayout.Y = switchVie.frameLayout.Bottom;
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;
+ 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);
+ var delayView = DelayView(fLayout, volView.frameLayout.Bottom);
+ if (edit )
+ {
+ Output outputs = Logic.currlogic.output[index];
+ var dicList = outputs.status.Find((obj) => obj.ContainsValue(FunctionAttributeKey.OnOff));
+ if (dicList != null)
+ {
+ if (dicList.ContainsValue( "off") || dicList.ContainsValue("pause"))
+ {
+ funTypeView.frameLayout.Visible = false;
+ volView.frameLayout.Visible = false;
+ delayView.frameLayout.Y = switchVie.frameLayout.Bottom;
+ }
+ }
+ }
#endregion
#region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ switchVie.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, switchVie.btnState, 2, (v) => {
+ if (v == "on")
+ {
+ funTypeView.frameLayout.Visible = true;
+ volView.frameLayout.Visible = true;
+ delayView.frameLayout.Y = volView.frameLayout.Bottom;
+ }
+ else
+ {
+ funTypeView.frameLayout.Visible = false;
+ volView.frameLayout.Visible = false;
+ delayView.frameLayout.Y = switchVie.frameLayout.Bottom;
+ }
+ });
+ };
///鎻愮ず璇煶鐐瑰嚮浜嬩欢
funTypeView.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -741,11 +807,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(() =>
@@ -754,7 +820,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;
//鏁版嵁灏佽
@@ -766,7 +832,7 @@
AddDictionary("url", songSelecetd.url);
}
- },false);
+ }, false);
});
}
@@ -780,18 +846,95 @@
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)
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
- GetEditDeviceState(device, index, funTypeView.btnState, volView.btnState, null, null);
+ GetEditDeviceState(device, index, switchVie.btnState, funTypeView.btnState, volView.btnState, null);
+ }
+
+ #endregion
+ }
+ break;
+ //娴蜂俊鐢佃
+ case SPK.ElectricalTvHisense:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ 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 sourceView = new LogicView.FunTypeView();
+ sourceView.frameLayout.Y = volView.frameLayout.Bottom;
+ sourceView.btnText.TextID = StringId.xinhaoyuan;
+ fLayout.AddChidren(sourceView.FLayoutView());
+
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, sourceView.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ switchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ 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.btnState.Text = value;
+ // //鏁版嵁灏佽
+ // AddDictionary("setvolume", value);//闊抽噺
+ //}, 0, 100);
+
+ BrightnessMethod(device, volView.btnState, volView.btnText.Text);
+
+ };
+
+ ///淇″彿婧愮偣鍑讳簨浠�
+ sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText = sourceView.btnState.Text;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string key = "signal";
+ selectedState = device.spk + "_" + key;
+ PublicInterface pif = new PublicInterface();
+ var dic = pif.GetHisenseSignalSourceDic();
+ pif.SingleSelectionShow(this, dic.Keys.ToList(), Language.StringByID(StringId.xinhaoyuan), currText
+ , (valueStr) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ sourceView.btnState.Text = valueStr;
+ string value = pif.GetValue(dic, valueStr);
+ //鏁版嵁灏佽
+ AddDictionary(key, value);
+
+ });
+ };
+
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, switchView.btnState, volView.btnState, sourceView.btnState, null);
}
#endregion
@@ -885,6 +1028,23 @@
dicList.AddRange(diclist);//鍐嶆坊鍔犲叾瀹冨睘鎬�
dicSateteList = dicList;//閲嶆柊璧嬪��
}
+ var onoffDic = dicSateteList.Find((obj) => obj.ContainsValue("on_off"));
+ if (onoffDic != null)
+ {
+ if (onoffDic.ContainsValue("off"))
+ {
+ for(int i =0;i<dicSateteList.Count;)
+ {
+ var d = dicSateteList[i];
+ if(!d.ContainsValue("on_off") || d.ContainsValue("delay"))
+ {
+ dicSateteList.Remove(d);
+ continue;
+ }
+ i++;
+ }
+ }
+ }
}
break;
case SPK.GroupControl:
@@ -935,12 +1095,12 @@
/// </summary>
/// <param name="fLayout">鐖舵帶浠�</param>
/// <param name="bottomY">鍦ㄥ摢涓帶浠朵笅闈�</param>
- private void DelayView(FrameLayout fLayout, int bottomY)
+ private LogicView.FunTypeView DelayView(FrameLayout fLayout, int bottomY)
{
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,11 +1110,12 @@
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;
});
};
+ return delayView;
}
@@ -964,16 +1125,17 @@
/// <param name="device"></param>
/// <param name="button"></param>
/// <param name="len">鏄剧ず閫夋嫨View鏁伴噺</param>
- private void SwitchViewMethod(Entity.Function device, Button button, int len)
+ /// <param name="action">鐐瑰嚮鍥炶皟浜嬩欢锛岀敤鏉ョ粰闊充箰鍒锋柊鐣岄潰浣跨敤锛寃xr 2024-01-04 16:03:47</param>
+ private void SwitchViewMethod(Entity.Function device, Button button, int len,Action<string> action = null)
{
#region 鐣岄潰
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 +1153,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);
+ action?.Invoke(value);
});
#endregion
}
@@ -1063,6 +1237,12 @@
}
}
break;
+ case SPK.ElectricalTvHisense:
+ {
+ keyVlaue = "set_volume";
+ }
+ break;
+
}
//鏁版嵁灏佽
AddDictionary(keyVlaue, brightnesValue);
@@ -1143,8 +1323,6 @@
}
-
-
/// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
@@ -1169,7 +1347,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 +1355,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 +1415,7 @@
}
}
+
/// <summary>
/// 娣诲姞鐩爣
/// </summary>
--
Gitblit v1.8.0