2023年08月24日17:42:25

wjc

2023-08-24 58d4ef9af9c906acf2e9f65a3e65092363c8e1cd

2023年08月24日17:42:25

增加海信，中控影屏

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png

 HDL-ON_Android/Assets/Phone/HisenseTv/electricaltvhisense.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -589,6 +589,8 @@
    <AndroidAsset Include="Assets\Phone\HisenseTv\shouye.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjia.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1617,6 +1617,16 @@
      <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
      <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
      <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
      <BundleResource Include="Resources\Phone\HisenseTv\on.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\yingliangjian.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\caidan.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\kaiguan.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\offbj.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\electricaltvhisense.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\yingliangjia.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\shouye.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\onbj.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_right_selected.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_kuaijin_selected.png" />
      <BundleResource Include="Resources\Phone\AksIcon\xia.png" />
@@ -1684,6 +1694,7 @@
      <BundleResource Include="Resources\Phone\AksIcon\zdyxia2.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_pindaojian_selected.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_kuaitui.png" />
      <BundleResource Include="Resources\Phone\AksIcon\like.png" />
      <BundleResource Include="Resources\Phone\AksIcon\zuo_selected.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_xia.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_kuaijin.png" />
@@ -1726,6 +1737,7 @@
      <BundleResource Include="Resources\Phone\AksIcon\xiangshang.png" />
      <BundleResource Include="Resources\Phone\AksIcon\yingyinzhongkong2.png" />
      <BundleResource Include="Resources\Phone\AksIcon\yinliangjia.png" />
      <BundleResource Include="Resources\Phone\AksIcon\aks.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_bofan_selected.png" />
      <BundleResource Include="Resources\Phone\AksIcon\ykq_dengguang_selected.png" />
      <BundleResource Include="Resources\Phone\AksIcon\xia_selected.png" />
@@ -1737,6 +1749,8 @@
      <BundleResource Include="Resources\Phone\AksIcon\yule.png" />
      <BundleResource Include="Resources\Phone\AksIcon\tingzhi.png" />
      <BundleResource Include="Resources\Phone\AksIcon\zdyyou2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltvhisense.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Resources/Language.ini

@@ -1227,6 +1227,39 @@
8512=Serial number
8513=Model

8701=Home theatre
8702=Player 
8703=Amplifier
8704=Virtual remote control
8705=Allmov
8706=TIMING
8707=Open
8708=Off
8709=Vocal tract
8710=All around
8711=Storehouse
8712=Subtitle
8713=Have already collected
8714=A Collection for the Future
8715=Synthesize
8716=Video Introduction
8717=Score
8718=Play now
8719=Conform action
8720=Channel
8721=Control

8801=Home page
8802=Power off
8803=Volume
8804=Setting 
8805=Unmute
8806=Signal source
8807=Power off
8808=Power on
8809=Stripping equipment





@@ -2578,9 +2611,37 @@
8512=序列号
8513=型号

8701=家庭影院
8702=播放器
8703=功放
8704=虚拟遥控器
8705=影库
8706=时序器
8707=开
8708=关
8709=声道
8710=上一部
8711=进出仓
8712=字幕
8713=已收藏
8714=未收藏
8715=综合
8716=影片介绍
8717=评分
8718=立即播放
8719=下一部
8720=频道
8721=控制



8801=首页
8802=关机
8803=音量
8804=设置
8805=解除静音
8806=信号源
8807=已关机
8808=开机
8809=解绑设备



@@ -3919,6 +3980,38 @@
8512=Serial number
8513=Model

8701=Home theatre
8702=Player 
8703=Amplifier
8704=Virtual remote control
8705=Allmov
8706=TIMING
8707=Open
8708=Off
8709=Vocal tract
8710=All around
8711=Storehouse
8712=Subtitle
8713=Have already collected
8714=A Collection for the Future
8715=Synthesize
8716=Video Introduction
8717=Score
8718=Play now
8719=Conform action
8720=Channel
8721=Control

8801=Home page
8802=Power off
8803=Volume
8804=Setting 
8805=Unmute
8806=Signal source
8807=Power off
8808=Power on
8809=Stripping equipment




@@ -5252,6 +5345,38 @@
8511=Door opener
8512=Serial number
8513=Model

8701=Home theatre
8702=Player 
8703=Amplifier
8704=Virtual remote control
8705=Allmov
8706=TIMING
8707=Open
8708=Off
8709=Vocal tract
8710=All around
8711=Storehouse
8712=Subtitle
8713=Have already collected
8714=A Collection for the Future
8715=Synthesize
8716=Video Introduction
8717=Score
8718=Play now
8719=Conform action
8720=Channel
8721=Control

8801=Home page
8802=Power off
8803=Volume
8804=Setting 
8805=Unmute
8806=Signal source
8807=Power off
8808=Power on
8809=Stripping equipment

9000=Inicio sesión con un nuevo número de teléfono celular 
9001=Inicie sesión con una nueva dirección de correo eléctrónico 
@@ -6591,6 +6716,40 @@
8512=Serial number
8513=Model

8701=Home theatre
8702=Player 
8703=Amplifier
8704=Virtual remote control
8705=Allmov
8706=TIMING
8707=Open
8708=Off
8709=Vocal tract
8710=All around
8711=Storehouse
8712=Subtitle
8713=Have already collected
8714=A Collection for the Future
8715=Synthesize
8716=Video Introduction
8717=Score
8718=Play now
8719=Conform action
8720=Channel
8721=Control

8801=Home page
8802=Power off
8803=Volume
8804=Setting 
8805=Unmute
8806=Signal source
8807=Power off
8808=Power on
8809=Stripping equipment







 HDL-ON_iOS/Resources/Phone/AksIcon/aks.png

 HDL-ON_iOS/Resources/Phone/AksIcon/like.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricaltvhisense_blue.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricaltvhisense.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/caidan.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/electricaltvhisense.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/kaiguan.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/offbj.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/offtvbj.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/on.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/onbj.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/shouye.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjia.png

 HDL-ON_iOS/Resources/Phone/HisenseTv/yingliangjian.png

 HDL_ON/Common/Utlis.cs

@@ -21,6 +21,24 @@
        }

        /// <summary>
        /// 全局打印
        /// </summary>
        /// <param name="tag">描述信息</param>
        /// <param name="url">请求地址(可以根据地址过滤该数据)</param>
        /// <param name="content">信息内容</param>
        public static void WriteLine(string tag,string url,string content)
        {
#if DEBUG
            if (url == "")
            {
                return;
            }
            string text = tag + "======" + url + "\r\n" + content;
            Console.WriteLine(text);
#endif
        }

        /// <summary>
        /// 弹窗提示
        /// </summary>
        /// <param name="mes"></param>

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -208,8 +208,8 @@
                        request.AddUrlSegment(data.Key, data.Value.ToString());
                    }
                }

                IRestResponse response = client.Execute(request);
                HDL_ON.Utlis.WriteLine("发送", requestFullUrl, response.Request.Body?.Value.ToString());
                if (response.StatusCode == HttpStatusCode.OK)
                {
                    try
@@ -227,7 +227,7 @@
                            revertObj.Data = "";
                        }
                        //*****一些判空处理*****************

                        HDL_ON.Utlis.WriteLine("接收", requestFullUrl, response.Content);
                        return revertObj;
                    }
                    catch (Exception ex)

 HDL_ON/UI/MainPage.cs

@@ -122,7 +122,9 @@
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl,
            SPK.AvMusic,SPK.MusicStandard
            //SPK.AvMusic,
            //SPK.MusicStandard,
            //SPK.ElectricalTvHisense
        };



 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -352,7 +352,7 @@
                    case SPK.ElectricalTvHisense:
                        {
                            //海信电视
                            var form = new UI2.FuntionControlView.HisenseTV.HisenseTvPage(function, btnName, btnFromFloor, comerom, action);
                            var form = new UI2.FuntionControlView.HisenseTV.HisenseTvPage(function, btnName, btnFromFloor,btnCollectionIcon, comerom, action);
                            MainPage.BasePageView.AddChidren(form);
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                            form.Show();

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -566,6 +566,7 @@
                            btnSwitch.IsSelected = !btnSwitch.IsSelected;
                        });
                    }
                   
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -186,8 +186,6 @@
            else if (titleId == StringId.Electric)
            {
                functionList.AddRange(FunctionList.List.GetElectricals());
                functionList.Add(new Function { spk = SPK.ElectricalTvHisense, name = "海信电视1",sid="123456789"});
                functionList.Add(new Function { spk = SPK.ElectricalTvHisense, name = "海信电视2", sid = "1234567890" });
            }
            else if (titleId == StringId.EnvironmentalScience)
            {
@@ -307,6 +305,34 @@
                                functionListView.AddChidren(functionDiv);

                            }
                            else if (function.spk == SPK.ElectricalTvHisense)
                            {
                                Action deviceDelAction = () =>
                                {
                                    //删除设备成功后更新UI
                                    if (functionListView==null) {
                                        return;
                                    }
                                    functionListView.RemoveAll();
                                    showList.Remove(function);//先移除
                                    ShowFunctionRow(showList,isAppend);

                                };
                                var functionDiv = new FunctionControlZone(function, deviceDelAction) 
                                {
                                    Gravity = Gravity.CenterHorizontal,
                                    Width = Application.GetRealWidth(343),
                                    Height = Application.GetRealHeight(96),
                                    Radius = (uint)Application.GetMinRealAverage(12),
                                    BorderColor = 0x00FFFFFF,
                                    BorderWidth = 1,
                                    BackgroundColor = CSS_Color.MainBackgroundColor,
                                    Tag = function.spk + function.sid
                                };
                                functionDiv.LoadFunctionDiv();
                                functionDiv.OrderEvent = OrderEvent;
                                functionListView.AddChidren(functionDiv);
                            }
                            else
                            {
                                var functionDiv = new FunctionControlZone(function,null)

 HDL_ON/UI/UI2/2-Classification/RoomPage.cs

@@ -121,9 +121,10 @@
                }
                else
                {
                    
                    var functionDiv = new FunctionControlZone(function, () =>
                    {
                        this.ReLoadPage();
                        this.ReLoadPage(); //删除设备后重新刷新UI
                    })
                    {
                        Gravity = Gravity.CenterHorizontal,

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

@@ -1488,19 +1488,31 @@
                                case SPK.ElectricalTvHisense:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string volumet = GetKeyValue("set_volume", dicList);
                                        string signal = GetKeyValue("signal", dicList);
                                        if (!string.IsNullOrEmpty(on_off))
                                        {
                                            if (on_off == "1")
                                            if (on_off == "on")
                                            {
                                                stateStr = Language.StringByID(StringId.onLogic);
                                            }
                                            else
                                            {
                                                stateStr = Language.StringByID(StringId.offLogic);
                                                //如果关了，其它属性不显示
                                                break;
                                            }

                                        }
                                        if (!string.IsNullOrEmpty(stateStr))
                                        {
                                            stateStr += ",";
                                        }
                                        if (!string.IsNullOrEmpty(volumet))
                                        {
                                            stateStr += Language.StringByID(StringId.yinliang)+ volumet;
                                        }

                                        if (!string.IsNullOrEmpty(stateStr))
                                        {
                                            stateStr += ",";
@@ -2492,12 +2504,12 @@
                                    {
                                        switch (value)
                                        {
                                            case "1":
                                            case "on":
                                                {
                                                    button1.Text = Language.StringByID(StringId.onLogic);
                                                }
                                                break;
                                            case "0":
                                            case "off":
                                                {
                                                    button1.Text = Language.StringByID(StringId.offLogic);
                                                }
@@ -2505,14 +2517,25 @@
                                        }
                                    }
                                    break;
                                case "signal":
                                   
                                case "set_volume":
                                    {
                                        if (button2 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value.Replace("_", " ");
                                        button2.Text = value;
                                    }
                                    break;
                                case "signal":
                                    {
                                        if (button3 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button3.Text = value.Replace("_", " ");
                                    }
                                    break;
                            }

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

@@ -189,7 +189,7 @@
            list.AddRange(list2);
            list.AddRange(FunctionList.List.groupControls);
#if DEBUG
            GetTestDevice(ref list, true);
            //GetTestDevice(ref list, true);
#endif
            return list;
        }

 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) =>
                        //{
                        ///音量点击事件
                        volView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                        //    selectedState = device.spk + "_volume";
                        //    //new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
                        //    //{
                            //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); 

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs

@@ -121,7 +121,7 @@
                Y = Application.GetRealHeight(667 - 80),
                Height = Application.GetRealHeight(90),
                Radius = (uint)Application.GetRealWidth(22),
                Visible = false,
                //Visible =false,
            };
            bodyView.AddChidren(optionView);

@@ -147,7 +147,7 @@
                {
                    if (pack.Code == StateCode.SUCCESS)
                    {
                        btnComfirm.Visible = false;
                        optionView.Visible = false;
                    }
                }
                //var pack = http.Set3tyIotFunctionToHouse(function.deviceId, "0", brand_Iot.companyId);
@@ -327,6 +327,7 @@
                        btnCheckIcon.IsSelected = function.collect = true;
                        optionList.Add(function.deviceId);
                    }
                
                    optionView.Visible = true;
                };
                if (function.homeId == DB_ResidenceData.Instance.CurrentRegion.id )

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs

@@ -465,6 +465,7 @@

                EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
                {

                    new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
                    {
                        UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.DelDevice(this.function, (isBool) =>
@@ -521,7 +522,7 @@
                    TextAlignment = TextAlignment.Center,
                    TextColor = CSS_Color.WarningColor,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextID = StringId.DeleteDevice,
                    TextID = StringId.jiebangshebei,
                    Radius = (uint)Application.GetRealWidth(22),
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                };
@@ -529,6 +530,7 @@

                EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
                {

                    new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
                    {
                    HDL_ON.UI.UI2.FuntionControlView.HisenseTV.Send.Current.DelDevice(this.function.deviceId, (isBool) =>

 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs

@@ -29,6 +29,11 @@
        /// </summary>
        private Button btnRoomName;
        /// <summary>
        /// 上一级界面的收藏控件
        /// </summary>
        private Button btnCollectionIcon;
        
        /// <summary>
        /// 头部布局
        /// </summary>
        private TopView topView;
@@ -84,11 +89,13 @@
        /// <param name="function">设备</param>
        /// <param name="btnDeviceName">上一级界面的设备名字控件(注:不能传null,没有可以传new Button())</param>
        /// <param name="btnRoomName">上一级界面的房间名字控件(注:不能传null,没有可以传new Button())</param> 
        public HisenseTvPage(Function function, Button btnDeviceName, Button btnRoomName, CommonMethod.Comerom comerom, Action action)
        /// <param name="btnCollectionIcon">上一级界面的房间名字控件(注:不能传null,没有可以传new Button())</param> 
        public HisenseTvPage(Function function, Button btnDeviceName, Button btnRoomName, Button btnCollectionIcon, CommonMethod.Comerom comerom, Action action)
        {
            this.device = function;
            this.btnDeviceName = btnDeviceName;
            this.btnRoomName = btnRoomName;
            this.btnCollectionIcon = btnCollectionIcon;
            this.comerom = comerom;
            this.action = action;

@@ -159,6 +166,8 @@
            {
                btnOpenCollectIcon.IsSelected = this.device.collect = !btnOpenCollectIcon.IsSelected;
                this.device.CollectFunction();
                btnCloseCollectIcon.IsSelected = btnOpenCollectIcon.IsSelected;
                this.btnCollectionIcon.IsSelected = btnOpenCollectIcon.IsSelected;
            };

            //首页
@@ -169,7 +178,7 @@
            //关机
            kaiguanFL.SetClickListener((fl, btnImage, btnText) =>
            {
                ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "0", (isBool) =>
                ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "off", (isBool) =>
                {
                    if (isBool)
                    {
@@ -291,11 +300,13 @@
            {
                btnCloseCollectIcon.IsSelected = this.device.collect = !btnCloseCollectIcon.IsSelected;
                this.device.CollectFunction();
                btnOpenCollectIcon.IsSelected = btnCloseCollectIcon.IsSelected;
                this.btnCollectionIcon.IsSelected = btnCloseCollectIcon.IsSelected;
            };
            //开机
            clickBtn.MouseDownEventHandler += (sen, e) =>
            {
                ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "1", (isBool) =>
                ControlCommand(HisenseTVFunctionalAttributeConstant.on_off, "on", (isBool) =>
                {
                    if (isBool)
                    {
@@ -331,7 +342,7 @@
            catch { }
        }
        /// <summary>
        /// 初始数据
        /// 初始化数据
        /// </summary>
        private void ReadData()
        {
@@ -743,11 +754,13 @@
            this.AddChidren(topView.TopFLayoutView());
        }
        /// <summary>
        /// 根据设备开关状态显示指定显示界面
        /// 根据设备开关状态显示指定界面
        /// (进来的时候用到)
        /// </summary>
        /// <returns></returns>
        private void CurrentAssignPage()
        {
            CommonMethod.Current.MainThread(() =>
        {

            if (this.device == null)
@@ -756,7 +769,7 @@
                baseCloseFFL.Visible = true;
                return;
            }
            if (this.device.GetAttrState("on_off") == "on")
                if (this.device.GetAttrState("on_off") == "on" || this.device.GetAttrState("on_off") == "1")
            {
                vv.Visible = true;
                baseCloseFFL.Visible = false;
@@ -766,6 +779,7 @@
                vv.Visible = false;
                baseCloseFFL.Visible = true;
            }
            });

        }

@@ -875,7 +889,7 @@
        {
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                this.BackgroundColor = 0xFFF2F3F7;
                //this.BackgroundColor = 0xFFF2F3F7;
                action?.Invoke(this, btnImage, btnText);
            };
            this.MouseDownEventHandler += DownClick;
@@ -885,7 +899,7 @@

            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
             {
                 this.BackgroundColor = 0x00000000;
                 //this.BackgroundColor = 0x00000000;
             };
            this.MouseUpEventHandler += UpClick;
            btnImage.MouseUpEventHandler += UpClick;