Merge branch 'Dev-Branch' into wxr-2.0

wxr

2023-09-14 8f9f20698e1256a58ee6894a9bc168a9dfb37861

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

@@ -93,7 +93,7 @@
            this.btnRoomName = btnRoomName;
            this.btnCollectionIcon = btnCollectionIcon;
            this.comerom = comerom;
            this.action = action; 
            this.action = action;

        }

@@ -105,7 +105,7 @@
            //初始化事件
            this.EventListener();
            //读取数据
            //this.ReadData();
            this.ReadData();

        }

@@ -192,11 +192,11 @@
                ControlCommand(HisenseTVFunctionalAttributeConstant.volume_subtract, "");
            };
            //菜单
           caidanBtn.SetClickListener((btn) =>
            {
                ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "11");
            caidanBtn.SetClickListener((btn) =>
             {
                 ControlCommand(HisenseTVFunctionalAttributeConstant.operation, "11");

            });
             });
            //播放
            bofangBtn.SetClickListener((btn) =>
            {
@@ -293,6 +293,26 @@
        {
            try
            {
                if (this.device == null)
                {
                    //设备不在线控制失败
                    Application.RunOnMainThread(() =>
                    {
                        CommonMethod.Current.ShowTip(Language.StringByID(StringId.shebeibuzaixian), 3);
                    });
                    return;
                }

                if (!this.device.online)
                {
                    //设备不在线控制失败
                    Application.RunOnMainThread(() =>
                    {
                        CommonMethod.Current.ShowTip(Language.StringByID(StringId.shebeibuzaixian), 3);
                    });
                    return;
                }

                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add(key, value);
                Send.Current.SendControlCommand(this.device, dic, action);
@@ -304,14 +324,27 @@
        /// </summary>
        private void ReadData()
        {
            if (this.device == null)
            {
                return;
            }
            CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    CommonMethod.Current.MainThread(() =>

                    var isRefreshDeviceStatus = Send.Current.RefreshDeviceStatus(new List<string> { this.device.deviceId });
                    if (isRefreshDeviceStatus)
                    {
                    });
                        var fun = Send.Current.GetDeviceInfo(this.device.deviceId);
                        if (fun != null)
                        {
                            //更新真实在线状态
                            this.device.online = fun.online;
                        }

                    }
                }
                catch { }
                finally
@@ -413,7 +446,7 @@
            kaijiFL.GetImageButton().SelectedImagePath = "HisenseTv/kaiguanSelected.png";
            kaijiFL.GetTextButton().TextID = StringId.kaiji;

            guanFL = new CustomFrameLayout(); 
            guanFL = new CustomFrameLayout();
            backgroundOpenFl.AddChidren(guanFL);
            guanFL.X = kaijiFL.Right + Application.GetRealWidth(37);
            guanFL.Y = yHeight;
@@ -431,7 +464,7 @@
            yinliangFL.Y = Application.GetRealHeight(260);
            yinliangFL.X = shouyeFL.X;
            yinliangFL.BackgroundColor = 0xffF2F3F7;
            yinliangFL.Radius = (uint)Application.GetRealHeight(34);
            yinliangFL.Radius = (uint)Application.GetRealWidth(34);

            btn_jia = new Button
            {
@@ -580,7 +613,7 @@
            #endregion

        }
     

        /// <summary>
        /// 初始化头部
        /// </summary>
@@ -592,7 +625,7 @@
            this.topView.topNameBtn.TextID = StringId.dianshi;
            this.AddChidren(topView.TopFLayoutView());
        }
       


        /// <summary>
        /// 重新计算宽度(设备名称,房间控件)
@@ -650,7 +683,7 @@
            TextID = StringId.dangqianmenweiguan,
            TextSize = TextSize.Text14,
            TextColor = MusicColor.TextColor,
            SelectedTextColor= MusicColor.MusicTxet14SelectedColor,
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextAlignment = TextAlignment.Center,
            Gravity = Gravity.CenterHorizontal,
            Name = "btnText",
@@ -723,8 +756,10 @@
            this.IsMoreLines = true;
            this.BackgroundColor = 0xffECEDEE;
            this.SelectedBackgroundColor = 0xFFF2F3F7;
            this.Radius = (uint)Application.GetRealHeight(30);
            this.Radius = (uint)Application.GetRealHeight(19);
            this.Padding = new Padding(0, 0, 0, 0);
        }


        /// <summary>
        /// 事件监听方法
@@ -781,6 +816,7 @@
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextSize = TextSize.Text16,
            TextID = StringId.kongzhi,
            Padding = new Padding(0, 0, 0, 0),
            IsBold = true,
        };

@@ -814,7 +850,8 @@
            TextColor = MusicColor.TextColor,
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextSize = TextSize.Text16,
            Text = "信号源",
            TextID = StringId.xinhaoyuan,
            Padding = new Padding(0, 0, 0, 0),
            IsBold = true,
        };