2023年03月28日11:52:02

wjc

2023-03-28 a9d1161b1df96e7ddad566335989a1444e433ef5

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

@@ -55,19 +55,44 @@
            #region  编辑设备状态
            switch (device.spk)
            {
                //插座(有USB)
                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.PanelSocket:
                case SPK.ElectricSocket:
                //机械手
                case SPK.MechanicalArm:
                    {
                        #region 界面
                        ///开关
                        LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
                        lightSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(lightSwitchView.FLayoutView());


                        ///设备延时iewv
                        DelayView(fLayout, lightSwitchView.frameLayout.Bottom);
@@ -81,7 +106,7 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, lightSwitchView.btnState, null, null, null);
                            GetEditDeviceState(device, index, lightSwitchView.btnState, null, null, null);
                        }
                        #endregion
                    }
@@ -90,7 +115,6 @@
                case SPK.LightDimming:
                case SPK.LightRGB:
                case SPK.LightRGBW:
                case SPK.LightCCT:
                    {
                        #region 界面
                        ///开关
@@ -102,7 +126,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
@@ -121,7 +145,55 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
                            GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
                        }
                        #endregion
                    }
                    break;
                case SPK.LightCCT:
                    {
                        #region 界面
                        ///开关
                        LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
                        lightSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(lightSwitchView.FLayoutView());
                        ///亮度
                        LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
                        brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
                        brightnessView.btnText.TextID = StringId.brightnesLogic;
                        fLayout.AddChidren(brightnessView.FLayoutView());
                        brightnessView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///色温
                        LogicView.FunTypeView colorTemperatureView = new LogicView.FunTypeView();
                        colorTemperatureView.frameLayout.Y = brightnessView.frameLayout.Bottom;
                        colorTemperatureView.btnText.TextID = StringId.ColorTemperature;
                        fLayout.AddChidren(colorTemperatureView.FLayoutView());
                        colorTemperatureView.btnState.Text = "2700k";
                        ///设备延时iewv
                        DelayView(fLayout, colorTemperatureView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
                        lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            SwitchViewMethod(device, lightSwitchView.btnState, 2);
                        };
                        ///亮度点击事件
                        brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);

                        };
                        ///色温点击事件
                        colorTemperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            ColorTemperatureMethod(device, colorTemperatureView.btnState, colorTemperatureView.btnText.Text);

                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, colorTemperatureView.btnState, null);
                        }
                        #endregion
                    }
@@ -145,7 +217,7 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
                            GetEditDeviceState(device, index, curtainSwitchView.btnState, null, null, null);
                        }
                        #endregion
                    }
@@ -171,7 +243,7 @@
                        ///开关点击事件
                        curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            SwitchViewMethod(device, curtainSwitchView.btnState, 3);
                            SwitchViewMethod(device, curtainSwitchView.btnState, 2);
                        };
                        ///百分比点击事件
                        crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -181,7 +253,44 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, curtainSwitchView.btnState, crtainPercentumView.btnState, null, null);
                            GetEditDeviceState(device, index, curtainSwitchView.btnState, crtainPercentumView.btnState, null, null);
                        }
                        #endregion
                    }
                    break;
                case SPK.CurtainDream:
                    {
                        #region 界面
                        ///百分比
                        LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
                        crtainPercentumView.btnText.TextID = StringId.percentum;
                        fLayout.AddChidren(crtainPercentumView.FLayoutView());
                        crtainPercentumView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///角度
                        LogicView.FunTypeView AngleView = new LogicView.FunTypeView();
                        AngleView.frameLayout.Y = crtainPercentumView.frameLayout.Bottom;
                        AngleView.btnText.TextID = StringId.Angle;
                        fLayout.AddChidren(AngleView.FLayoutView());
                        AngleView.btnState.Text = "10°";
                        ///设备延时iewv
                        DelayView(fLayout, AngleView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件

                        ///百分比点击事件
                        crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, crtainPercentumView.btnState, crtainPercentumView.btnText.Text);
                        };
                        ///角度点击事件
                        AngleView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, AngleView.btnState, AngleView.btnText.Text);
                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, crtainPercentumView.btnState, AngleView.btnState, null, null);
                        }
                        #endregion
                    }
@@ -285,13 +394,14 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, acSwitchVie.btnState, temperatureView.btnState, acModehView.btnState, acSpeedView.btnState);
                            GetEditDeviceState(device, index, acSwitchVie.btnState, temperatureView.btnState, acModehView.btnState, acSpeedView.btnState);
                        }

                        #endregion
                    }
                    break;
                case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
                    {
                        #region 界面
                        ///开关
@@ -365,7 +475,7 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, floorHeatingSwitchVie.btnState, temperatureView.btnState, floorHeatingModehView.btnState, null);
                            GetEditDeviceState(device, index, floorHeatingSwitchVie.btnState, temperatureView.btnState, floorHeatingModehView.btnState, null);
                        }

                        #endregion
@@ -451,7 +561,95 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, AirFreshSwitchVie.btnState, AirFreshSpeedView.btnState, null, null);
                            GetEditDeviceState(device, index, AirFreshSwitchVie.btnState, AirFreshSpeedView.btnState, null, null);
                        }

                        #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
@@ -468,7 +666,7 @@
                    Output outputDevice = new Output();
                    outputDevice.target_type = "1";
                    outputDevice.sid = device.sid;
                    outputDevice.delay= strdelay;
                    outputDevice.delay = strdelay;
                    switch (device.spk)
                    {
                        case SPK.LightDimming:
@@ -502,7 +700,8 @@
                            }
                        case SPK.HvacAC:
                        case SPK.AcStandard:
                        case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
                        case SPK.FloorHeatStandard:
                        case SPK.HvacFloorHeat:
                            {
                                //做了一个特殊处理；
                                bool _bool = false;
@@ -519,16 +718,35 @@
                                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;
                    outputDevice.status.AddRange(dicSateteList);

                    if (edit)
                    {
@@ -555,7 +773,7 @@
                    this.RemoveFromParent();
                    return;
                }
                LogicMethod.CurrLogicMethod.RemoveAllView();
                LogicMethod.Current.RemoveAllView();
                AddLogic addLogic = new AddLogic();
                MainPage.BasePageView.AddChidren(addLogic);
                addLogic.Show();
@@ -630,6 +848,17 @@
                selectedState = device.spk + "_" + strValue;
                //设备属性值，云雀上定义好的;
                string keyVlaue = "on_off";
                switch (device.spk)
                {
                    case SPK.PanelSocket:
                        {
                            if (button.Name == "总控开关")
                            {
                                keyVlaue = "on_off_master";
                            }
                        }
                        break;
                }
                //数据封装
                AddDictionary(keyVlaue, strValue);
            });
@@ -638,19 +867,18 @@
        /// <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 界面
            //之前的状态值
            string stateVlaue = button.Text;
            LogicView.BrightnessView brightness = new LogicView.BrightnessView();
            brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue) =>
            brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue, unitStr) =>
            {
                //界面显示选中值
                button.Text = brightnesValue + "%";
                button.Text = brightnesValue + unitStr;
                selectedState = device.spk + brightnesValue.ToString();
                //设备属性值，云雀上定义好的;
                string keyVlaue = "";
@@ -667,13 +895,51 @@
                        break;
                    case SPK.CurtainRoller:
                    case SPK.CurtainTrietex:
                    case SPK.CurtainDream:
                        {
                            keyVlaue = "percent";
                            if (unitStr == "°")
                            {
                                //角度
                                keyVlaue = "angle";
                            }
                        }
                        break;
                }
                //数据封装
                AddDictionary(keyVlaue, brightnesValue);
                AddDictionary(keyVlaue, brightnesValue); 
            });
            #endregion

        }
        /// <summary>
        /// 色温(cct)=功能下一级界面
        /// </summary>
        /// <param name="device"></param>
        /// <param name="button"></param>
        private void ColorTemperatureMethod(Entity.Function device, Button button, string titleName)
        {
            #region 界面
            //之前的状态值
            string stateVlaue = button.Text;
            LogicView.ColorTemperature brightness = new LogicView.ColorTemperature();
            brightness.FLayoutView(this, titleName, stateVlaue, (colorTemperatureValue, unitStr) => 
            {
                //界面显示选中值
                button.Text = colorTemperatureValue + unitStr;
                selectedState = device.spk + colorTemperatureValue.ToString();
                //设备属性值，云雀上定义好的;
                string keyVlaue = "";
                switch (device.spk)
                {
                    case SPK.LightCCT:
                        {
                            keyVlaue = "cct";
                        }
                        break;
                }
                //数据封装
                AddDictionary(keyVlaue, colorTemperatureValue);
            });
            #endregion

@@ -687,7 +953,7 @@
        /// <param name="button2">显示Btn</param>
        /// <param name="button3">显示Btn</param>
        /// <param name="button4">显示Btn</param>
        private void GetEditState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4)
        private void GetEditDeviceState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4)
        {
            Output outputs = Logic.currlogic.output[index];
            var dicList = outputs.status;
@@ -696,7 +962,7 @@
            if (dicList.Count != 0)
            {
                //有数据重新赋值
                dicSateteList = dicList;
                dicSateteList.AddRange(dicList);
            }
            if (this.btnDelay != null)
            {
@@ -704,7 +970,7 @@
                this.btnDelay.Text = outputs.delay + "s";
                this.strdelay = outputs.delay;
            }
            InpOrOutLogicMethod.EditState(device, dicList, button1, button2, button3, button4);
            InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
        }
        /// <summary>
        /// 添加选中数据
@@ -715,8 +981,8 @@
        {
            //数据封装
            Dictionary<string, string> dic = new Dictionary<string, string>();
            LogicMethod.CurrLogicMethod.dictionary(dic, "key", KeyValue);
            LogicMethod.CurrLogicMethod.dictionary(dic, "value", selectedValue);
            LogicMethod.Current.dictionary(dic, "key", KeyValue);
            LogicMethod.Current.dictionary(dic, "value", selectedValue);
            AddDictionaryList(KeyValue, dic);
        }
        /// <summary>