From 6692d867a0876b014be3cbd64bc3a237a026dc2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 十月 2022 09:57:15 +0800
Subject: [PATCH] 修改安卓隐私确认弹窗，隐私协议英文的问题
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 064e64e..2cb4899 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -68,7 +68,6 @@
lightSwitchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(lightSwitchView.FLayoutView());
-
///璁惧寤舵椂iewv
DelayView(fLayout, lightSwitchView.frameLayout.Bottom);
#endregion
@@ -102,7 +101,7 @@
brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
brightnessView.btnText.TextID = StringId.brightnesLogic;
fLayout.AddChidren(brightnessView.FLayoutView());
- //brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
///璁惧寤舵椂iewv
DelayView(fLayout, brightnessView.frameLayout.Bottom);
#endregion
@@ -504,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 鐐瑰嚮浜嬩欢
///鎻愮ず璇煶鐐瑰嚮浜嬩欢
@@ -533,9 +537,9 @@
{
loading.Hide();
PublicInterface publicInterface = new PublicInterface();
- publicInterface.FrameOrVv(this, musicNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index) =>
+ publicInterface.FrameOrVv(this, musicNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
{
- var musicSelecetd = palyList.songs[index];
+ var musicSelecetd = palyList.songs[index2];
//鐣岄潰鏄剧ず閫変腑鍊�
funTypeView.btnState.Text = musicSelecetd.name;
//鏁版嵁灏佽
@@ -550,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
@@ -623,10 +640,29 @@
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;
@@ -742,9 +778,8 @@
/// <summary>
/// 浜害/鐧惧垎姣�=鍔熻兘涓嬩竴绾х晫闈�
/// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="button">鏄剧ず鐘舵�佸璞�</param>
- /// <param name="titleName">鏍囬</param>
+ /// <param name="device"></param>
+ /// <param name="button"></param>
private void BrightnessMethod(Entity.Function device, Button button, string titleName)
{
#region 鐣岄潰
--
Gitblit v1.8.0