2023年08月24日17:42:25

wjc

2023-08-24 58d4ef9af9c906acf2e9f65a3e65092363c8e1cd

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

@@ -812,15 +812,15 @@
                        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 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 = switchView.frameLayout.Bottom;
                        sourceView.frameLayout.Y = volView.frameLayout.Bottom;
                        sourceView.btnText.TextID = StringId.xinhaoyuan;
                        fLayout.AddChidren(sourceView.FLayoutView());

@@ -833,22 +833,22 @@
                        {
                            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.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);
                            //    //界面显示选中值
                            //    volView.btnState.Text = value;
                            //    //数据封装
                            //    AddDictionary("setvolume", value);//音量
                            //}, 0, 100);

                        //    BrightnessMethod(device, volView.btnState, volView.btnText.Text);
                            BrightnessMethod(device, volView.btnState, volView.btnText.Text);

                        //};
                        };

                        ///信号源点击事件
                        sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -882,7 +882,7 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, switchView.btnState, sourceView.btnState, null, null);
                            GetEditDeviceState(device, index, switchView.btnState, volView.btnState, sourceView.btnState, null);
                        }

                        #endregion
@@ -1107,19 +1107,6 @@
                        }
                        break;

                    case SPK.ElectricalTvHisense:
                        {
                            if (id == StringId.onLogic)
                            {
                                value = "1";
                            }
                            else
                            {
                                value = "0";
                            }
                        }
                        break;

                }

                //数据封装
@@ -1169,6 +1156,12 @@
                            }
                        }
                        break;
                    case SPK.ElectricalTvHisense:
                        {
                            keyVlaue = "set_volume";
                        }
                        break;

                }
                //数据封装
                AddDictionary(keyVlaue, brightnesValue);