Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

mac

2023-08-29 2d5cd35af7437ad4015d38594d8c721dc6166b11

 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:
@@ -163,6 +164,21 @@
                        }
                        #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.AirSwitch:
@@ -196,8 +212,8 @@
                    break;
                //灯光开关 亮度
                case SPK.LightDimming:
                //case SPK.LightRGB:
                //case SPK.LightRGBW:
                    //case SPK.LightRGB:
                    //case SPK.LightRGBW:
                    {
                        #region 界面
                        ///开关
@@ -721,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)
@@ -729,7 +745,7 @@
                        //    //不支持特殊语音
                        //    volView.frameLayout.Y = Application.GetRealHeight(0);
                        //}
                        


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

                                        },false);
                                        }, false);

                                    });
                                }
@@ -787,18 +803,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);
                        }

                        #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
@@ -977,10 +1070,10 @@
            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":
                        {
@@ -1000,16 +1093,16 @@
                }
                //界面显示选中值
                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";
                                key = "on_off_master";
                            }
                        }
                        break;
@@ -1017,14 +1110,16 @@
                        {
                            if (button.Name == "colorful")
                            {
                                keyVlaue = "colorful";
                                key = "colorful";
                            }

                        }
                        break;

                }

                //数据封装
                AddDictionary(keyVlaue, strValue);
                AddDictionary(key, value);
            });
            #endregion
        }
@@ -1070,6 +1165,12 @@
                            }
                        }
                        break;
                    case SPK.ElectricalTvHisense:
                        {
                            keyVlaue = "set_volume";
                        }
                        break;

                }
                //数据封装
                AddDictionary(keyVlaue, brightnesValue); 
@@ -1150,8 +1251,6 @@
        }




        /// <summary>
        /// 显示编辑之前的设备状态
        /// </summary>
@@ -1184,29 +1283,29 @@
        /// <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)
        {
            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;
@@ -1227,7 +1326,7 @@
                dicSateteList.Add(dictionary);
            }

        }
        } 
        /// <summary>
        /// 添加目标
        /// </summary>