From 8f9f20698e1256a58ee6894a9bc168a9dfb37861 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 14 九月 2023 13:32:14 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.0

---
 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs |   67 ++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
index a2dfbb0..83623d5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
+++ b/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,
         };
 

--
Gitblit v1.8.0