From 96e9ff2e5a54f54cdbb6b8b2f049fdf6a837de3c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 八月 2023 14:28:22 +0800
Subject: [PATCH] 备份1
---
OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 246 -------------------------------------------------
1 files changed, 0 insertions(+), 246 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..039cdf0 100644
--- a/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -56,120 +56,8 @@
#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.ElectricSocket:
- //鏈烘鎵�
- case SPK.MechanicalArm:
{
#region 鐣岄潰
///寮�鍏�
@@ -709,94 +597,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
@@ -870,29 +670,6 @@
}
}
break;
- //闊充箰
- case SPK.MusicStandard:
- case SPK.AvMusic:
- {
- string volume = "volume";
- var dicObj = dicSateteList.Find((dic) => dic.ContainsValue(volume));
- if (dicObj != null)
- {
- //鏈夐厤缃煶涔愰煶閲忓睘鎬э紝瑕侀噸鏂版帓鍒�,闊抽噺鍦ㄥ墠闈�
- var dicList = new List<Dictionary<string, string>>();
- dicList.Add(dicObj);//鍏堟坊鍔犻煶閲忓睘鎬�
- var diclist = dicSateteList.FindAll((dic) => !dic.ContainsValue(volume));
- dicList.AddRange(diclist);//鍐嶆坊鍔犲叾瀹冨睘鎬�
- dicSateteList = dicList;//閲嶆柊璧嬪��
- }
- }
- break;
- case SPK.GroupControl:
- {
- outputDevice.target_type = "5";
- }
- break;
-
}
outputDevice.status.AddRange(dicSateteList);
@@ -996,26 +773,6 @@
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);
});
@@ -1046,7 +803,6 @@
case SPK.LightRGB:
case SPK.LightRGBW:
case SPK.LightCCT:
- case SPK.GroupControl:
{
keyVlaue = "brightness";
}
@@ -1091,7 +847,6 @@
switch (device.spk)
{
case SPK.LightCCT:
- case SPK.GroupControl:
{
keyVlaue = "cct";
}
@@ -1125,7 +880,6 @@
switch (device.spk)
{
case SPK.LightRGB:
- case SPK.GroupControl:
{
keyVlaue = "rgb";
}
--
Gitblit v1.8.0