2023年08月28日15:41:39

wjc

2023-08-28 5215a463afd281f62ecd67b2ae87d37404174287

 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
{
@@ -59,7 +60,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 +137,7 @@
                    }

                    //设备延时iewv
                    DelayView(fLayout, height* count);
                    DelayView(fLayout, height * count);
                    break;
                //插座(有USB)
                case SPK.PanelSocket:
@@ -211,8 +212,8 @@
                    break;
                //灯光开关 亮度
                case SPK.LightDimming:
                //case SPK.LightRGB:
                //case SPK.LightRGBW:
                    //case SPK.LightRGB:
                    //case SPK.LightRGBW:
                    {
                        #region 界面
                        ///开关
@@ -736,7 +737,7 @@
                        ///音量
                        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)
@@ -744,7 +745,7 @@
                        //    //不支持特殊语音
                        //    volView.frameLayout.Y = Application.GetRealHeight(0);
                        //}
                        


                        ///设备延时iewv
                        DelayView(fLayout, volView.frameLayout.Bottom);
@@ -763,11 +764,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(() =>
@@ -776,7 +777,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;
                                            //数据封装
@@ -788,7 +789,7 @@
                                                AddDictionary("url", songSelecetd.url);
                                            }

                                        },false);
                                        }, false);

                                    });
                                }
@@ -802,12 +803,12 @@
                            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)
@@ -824,7 +825,7 @@
                    {
                        #region 界面
                        ///开关
                        LogicView.FunTypeView switchView = new LogicView.FunTypeView(); 
                        LogicView.FunTypeView switchView = new LogicView.FunTypeView();
                        switchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(switchView.FLayoutView());
                        ///音量
@@ -834,7 +835,7 @@
                        fLayout.AddChidren(volView.FLayoutView());

                        ///信号源
                        LogicView.FunTypeView sourceView = new LogicView.FunTypeView(); 
                        LogicView.FunTypeView sourceView = new LogicView.FunTypeView();
                        sourceView.frameLayout.Y = volView.frameLayout.Bottom;
                        sourceView.btnText.TextID = StringId.xinhaoyuan;
                        fLayout.AddChidren(sourceView.FLayoutView());
@@ -871,23 +872,16 @@
                            ///之前的状态文本
                            string currText = sourceView.btnState.Text;
                            //设备属性值，云雀上定义好的;
                            string key = "signal"; 
                            string key = "signal";
                            selectedState = device.spk + "_" + key;
                            PublicInterface pif = new PublicInterface();
                            var sourceList = new List<string>();
                            sourceList.Add("HDML 1");
                            sourceList.Add("HDML 2");
                            sourceList.Add("HDML 3");
                            sourceList.Add("HDML 4");
                            sourceList.Add("Live TV");
                            sourceList.Add("PS");
                            sourceList.Add("AV");
                            pif.SingleSelectionShow(this, sourceList, Language.StringByID(StringId.xinhaoyuan), currText
                               , (valueStr) => 
                            var dic = pif.GetHisenseSignalSourceDic();
                            pif.SingleSelectionShow(this, dic.Keys.ToList(), Language.StringByID(StringId.xinhaoyuan), currText
                               , (valueStr) =>
                               {
                                   //界面显示选中值
                                   sourceView.btnState.Text = valueStr;
                                   string value = valueStr.Replace(" ", "_");
                                   string value = pif.GetValue(dic, valueStr);
                                   //数据封装
                                   AddDictionary(key, value);