From fba3a6c55c4de790eaeee55f9897d668bb36dbb8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 13 十月 2022 13:55:21 +0800
Subject: [PATCH] 2022年10月13日13:55:00
---
HDL_ON/DAL/Server/HttpUtil.cs | 4 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 17 ++++++--
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs | 19 +++++----
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 47 +++++++++++++++++++++--
4 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 4a01eef..1c3250c 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 286dbbe..5953a75 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1274,12 +1274,15 @@
case SPK.MusicStandard:
case SPK.AvMusic:
{
- foreach (var dic in dicList)
+ string song_name = GetKeyValue("song_name", dicList);
+ string volume = GetKeyValue("volume", dicList);
+ stateStr = song_name + ";" +Language.StringByID(StringId.volumeMusic)+volume;
+ if (stateStr.StartsWith(";"))
{
- if (dic["key"] == "song_name")
- {
- stateStr = dic["value"]?.ToString();
- }
+ stateStr = stateStr.Substring(1, stateStr.Length - 1);
+ }else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
+ {
+ stateStr = stateStr.Substring(0, stateStr.Length - 3);
}
}
break;
@@ -2065,6 +2068,10 @@
{
button1.Text = dic["value"]?.ToString();
}
+ else if (dic["key"] == "volume")
+ {
+ button2.Text = dic["value"]?.ToString();
+ }
}
}
break;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
index 31feff1..f39f42f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
@@ -11,11 +11,11 @@
/// <summary>
/// 澶ф鍦嗚鍊�
/// </summary>
- public int RradiusFrameLayout = 15;
+ private int RradiusFrameLayout = 15;
/// <summary>
/// 灏忔鍦嗚鍊�
/// </summary>
- public int radiusEditFrameLayout = 4;
+ private int radiusEditFrameLayout = 4;
/// <summary>
/// 杈撳叆妗�
/// </summary>
@@ -368,7 +368,9 @@
/// <param name="titleId">鏍囬鏂囨湰</param>
/// <param name="tnputEditTxet">鏄剧ず鏂囨湰</param>
/// <param name="confirmAction">鍥炶皟鍑芥暟</param>
- public void InputBox(int titleId, string tnputEditTxet, Action<string> confirmAction)
+ /// <param name="minValue">鏈�灏忓��</param>
+ /// <param name="maxValue">鏈�澶у��</param>
+ public void InputBox(int titleId, string tnputEditTxet, Action<string> confirmAction,int minValue=1,int maxValue=100)
{
Dialog dialog = new Dialog()
{
@@ -537,11 +539,10 @@
}
else
{
- var editTextValue = editText.Text.Trim();
- int intValue = int.Parse(editTextValue);
- if (intValue <= 0 || intValue > 100)
+ int intValue = int.Parse(editText.Text.Trim());
+ if (intValue <minValue || intValue > maxValue)
{
- errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue);
+ errorId_IsNullOrEmpty = Language.StringByID(StringId.setvalue).Replace("1",minValue.ToString()).Replace("000",maxValue.ToString());
}
}
if (errorId_IsNullOrEmpty!="")
@@ -564,8 +565,8 @@
btnTip.IsMoreLines = true;
return;
}
-
- confirmAction(editText.Text.Trim());
+ string editTextValue= int.Parse(editText.Text.Trim()).ToString();
+ confirmAction(editTextValue);
dialog.Close();
};
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index eaa5c14..0246a9d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -503,9 +503,14 @@
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, funTypeView.frameLayout.Bottom);
+ DelayView(fLayout, volView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///鎻愮ず璇煶鐐瑰嚮浜嬩欢
@@ -549,11 +554,24 @@
});
};
+ ///闊抽噺鐐瑰嚮浜嬩欢
+ 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, null, null, null);
+ GetEditDeviceState(device, index, funTypeView.btnState, volView.btnState, null, null);
}
#endregion
@@ -622,13 +640,32 @@
if (!_bool)
{
//娌℃湁寮�鍏冲氨榛樿娣诲姞-寮�-灞炴��
- Dictionary<string, string> diction = new Dictionary<string, string>();
- diction.Add("key", "on_off");
- diction.Add("value", "on");
+ Dictionary<string, string> diction = new Dictionary<string, string>
+ {
+ { "key", "on_off" },
+ { "value", "on" }
+ };
dicSateteList.Add(diction);
}
}
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;
}
outputDevice.status = dicSateteList;
--
Gitblit v1.8.0