From 46a177eb1acf7ce91af7fe9ff57af87228de938d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 十月 2023 10:03:24 +0800
Subject: [PATCH] IOS库更新

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs |  109 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index c9f223b..f8242be 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -9,7 +9,7 @@
 namespace HDL_ON.UI.UI2.FuntionControlView.Aks
 {
     /// <summary>
-    ///閬ユ帶鍣ㄧ晫闈�
+    ///铏氭嫙閬ユ帶鍣ㄧ晫闈�
     /// </summary>
     public class YkqPage : BaseFramLayout
     {
@@ -107,6 +107,7 @@
             //寮�鍏�
             switchBtn.MouseDownEventHandler += (senser, e) =>
             {
+                switchBtn.IsSelected = true;
                 KeyControl("on_off", "寮�/鍏�");
             };
             //淇℃伅
@@ -244,7 +245,7 @@
             //涓�
             btnShang.MouseDownEventHandler += (sender, e) => 
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_qian_selected.png";
+                okFl.BackgroundImagePath = "AksIcon/ykq_shang_selected.png";
                 KeyControl("key_up", "涓�");
 
             };
@@ -260,7 +261,7 @@
             //涓�
             btnXia.MouseDownEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_hou_selected.png";
+                okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";
                 KeyControl("key_down", "涓�");
             };
             //OK
@@ -270,19 +271,23 @@
                 KeyControl("key_ok", "纭畾");
             };
             //闊抽噺+
-            btnYingliangjia.MouseDownEventHandler += (sen, e) => { 
+            btnYingliangjia.MouseDownEventHandler += (sen, e) => {
+                btnYingliangjia.IsSelected = true;
                 KeyControl("volume_up", "闊抽噺+");
             };
             //闊抽噺-
             btnYingliangjian.MouseDownEventHandler += (sen, e) => {
+                btnYingliangjian.IsSelected = true;
                 KeyControl("volume_down", "闊抽噺-");
             };
             //棰戦亾+
-            btnPindaojia.MouseDownEventHandler += (sen, e) => { 
+            btnPindaojia.MouseDownEventHandler += (sen, e) => {
+                btnPindaojia.IsSelected = true;
                 KeyControl("ch_up", "棰戦亾+");
             };
             //棰戦亾-
-            btnPindaojian.MouseDownEventHandler += (sen, e) => { 
+            btnPindaojian.MouseDownEventHandler += (sen, e) => {
+                btnPindaojian.IsSelected = true;
                 KeyControl("ch_down", "棰戦亾-");
             };
 
@@ -367,7 +372,9 @@
             });
 
         }
-
+        /// <summary>
+        /// 鍒濆鍖栫晫闈�
+        /// </summary>
         private void InitUI()
         {
             this.BackgroundColor = MusicColor.ViewColor;
@@ -380,7 +387,8 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
-                TextID = StringId.xuniyaokongqi,
+                Text= this.remoteControl.name,
+                IsBold = true,
             };
             this.AddChidren(btnTitle);
 
@@ -418,7 +426,7 @@
                 Width = Application.GetRealWidth(48),
                 Gravity = Gravity.CenterHorizontal,
                 BackgroundColor = 0xff201F25,
-                Radius = (uint)Application.GetRealHeight(24),
+                Radius = (uint)Application.GetRealWidth(24),
 
             };
             layout.AddChidren(switchFl);
@@ -429,8 +437,13 @@
                 Width = Application.GetRealWidth(32),
                 Gravity = Gravity.Center,
                 UnSelectedImagePath = "AksIcon/ykq_kai.png",
+                SelectedImagePath= "AksIcon/ykq_kaiguang_selected.png"
             };
             switchFl.AddChidren(switchBtn);
+            switchBtn.MouseUpEventHandler += (senser, e) =>
+            {
+                switchBtn.IsSelected = false;
+            };
 
             int h = 49;
             int offset = 28;//x杞村亸绉婚噺
@@ -450,6 +463,7 @@
             xinxiFL.AddImageView();
             xinxiFL.AddTextButtonView();
             xinxiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_xinxi.png";
+            xinxiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_xinxi_selected.png";
             xinxiFL.GetTextButton().Text = "淇℃伅";
             xinxiFL.AddClickView();
 
@@ -460,6 +474,7 @@
             shoucangFL.AddImageView();
             shoucangFL.AddTextButtonView();
             shoucangFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_shoucang.png";
+            shoucangFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_shoucang_selected.png";
             shoucangFL.GetTextButton().Text = "鏀惰棌";
             shoucangFL.AddClickView();
 
@@ -477,6 +492,7 @@
             dianyingFL.AddImageView();
             dianyingFL.AddTextButtonView();
             dianyingFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dianying.png";
+            dianyingFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dianying_selected.png";
             dianyingFL.GetTextButton().Text = "鐢靛奖";
             dianyingFL.AddClickView();
 
@@ -487,6 +503,7 @@
             yuleFL.AddImageView();
             yuleFL.AddTextButtonView();
             yuleFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_yule.png";
+            yuleFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_yule_selected.png";
             yuleFL.GetTextButton().Text = "濞变箰";
             yuleFL.AddClickView();
 
@@ -496,6 +513,7 @@
             dianshiFL.AddImageView();
             dianshiFL.AddTextButtonView();
             dianshiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dianshi.png";
+            dianshiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dianshi_selected.png";
             dianshiFL.GetTextButton().Text = "鐢佃";
             dianshiFL.AddClickView();
 
@@ -648,6 +666,7 @@
             yinguiFL.AddImageView();
             yinguiFL.AddTextButtonView();
             yinguiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_yingui.png";
+            yinguiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_yingui_selected.png";
             yinguiFL.GetTextButton().Text = "闊宠建";
             yinguiFL.AddClickView();
 
@@ -666,6 +685,7 @@
             zimuFL.AddImageView();
             zimuFL.AddTextButtonView();
             zimuFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_zimu.png";
+            zimuFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_zimu_selected.png";
             zimuFL.GetTextButton().Text = "瀛楀箷";
             zimuFL.AddClickView();
             zimuFL.AddClickView();
@@ -687,6 +707,7 @@
             jingyinFL.AddImageView();
             jingyinFL.AddTextButtonView();
             jingyinFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_jingyin.png";
+            jingyinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_jingyin_selected.png";
             jingyinFL.GetTextButton().Text = "闈欓煶";
             jingyinFL.AddClickView();
 
@@ -696,7 +717,8 @@
             toupingFL.X = jingyinFL.Right + Application.GetRealWidth(septal);
             toupingFL.AddImageView();
             toupingFL.AddTextButtonView();
-            toupingFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_youpin.png";
+            toupingFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_toupin.png";
+            toupingFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_touping_selected.png";
             toupingFL.GetTextButton().Text = "鎶曞睆";
             toupingFL.AddClickView();
 
@@ -707,6 +729,7 @@
             zhuyeFL.AddImageView();
             zhuyeFL.AddTextButtonView();
             zhuyeFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_zhuye.png";
+            zhuyeFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_zhuye_selected.png";
             zhuyeFL.GetTextButton().Text = "涓婚〉";
             zhuyeFL.AddClickView();
 
@@ -729,9 +752,14 @@
                 X = Application.GetRealWidth(26),
                 Width = Application.GetRealWidth(36),
                 Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_jia.png",
+                UnSelectedImagePath = "AksIcon/ykq_yingliangjia.png",
+                SelectedImagePath = "AksIcon/ykq_yingliangjia_selected.png",
             };
             baseFl.AddChidren(btnYingliangjia);
+            btnYingliangjia.MouseUpEventHandler += (sen,e) => {
+
+                btnYingliangjia.IsSelected = false;
+            };
 
 
             btnYingliangjian = new Button
@@ -740,9 +768,15 @@
                 X = Application.GetRealWidth(26),
                 Width = Application.GetRealWidth(36),
                 Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_jian.png",
+                UnSelectedImagePath = "AksIcon/ykq_yingliangjian.png",
+                SelectedImagePath = "AksIcon/ykq_yingliangjian_selected.png",
             };
             baseFl.AddChidren(btnYingliangjian);
+            btnYingliangjian.MouseUpEventHandler += (sen, e) => {
+
+                btnYingliangjian.IsSelected = false;
+            };
+
 
 
             btnPindaojia = new Button 
@@ -751,9 +785,14 @@
                 X = Application.GetRealWidth(170),
                 Width = Application.GetRealWidth(36),
                 Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_shang.png",
+                UnSelectedImagePath = "AksIcon/ykq_pindaojia.png",
+                SelectedImagePath = "AksIcon/ykq_pindaojia_selected.png",
             };
             baseFl.AddChidren(btnPindaojia);
+            btnPindaojia.MouseUpEventHandler += (sen, e) => {
+
+                btnPindaojia.IsSelected = false;
+            };
 
 
             btnPindaojian = new Button
@@ -762,9 +801,14 @@
                 X = Application.GetRealWidth(170),
                 Width = Application.GetRealWidth(36),
                 Height = Application.GetRealWidth(36),
-                UnSelectedImagePath = "AksIcon/ykq_xia.png",
+                UnSelectedImagePath = "AksIcon/ykq_pindaojian.png",
+                SelectedImagePath = "AksIcon/ykq_pindaojian_selected.png",
             };
             baseFl.AddChidren(btnPindaojian);
+            btnPindaojian.MouseUpEventHandler += (sen, e) => {
+
+                btnPindaojian.IsSelected = false;
+            };
 
 
 
@@ -876,6 +920,7 @@
             caidanFL.AddImageView();
             caidanFL.AddTextButtonView();
             caidanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_caidan.png";
+            caidanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_caidan_selected.png";
             caidanFL.GetTextButton().Text = "鑿滃崟";
             caidanFL.AddClickView();
 
@@ -886,6 +931,7 @@
             fanhuiFL.AddImageView();
             fanhuiFL.AddTextButtonView();
             fanhuiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_fanhui.png";
+            fanhuiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_fanhui_selected.png";
             fanhuiFL.GetTextButton().Text = "杩斿洖";
             fanhuiFL.AddClickView();
 
@@ -904,6 +950,7 @@
             shanyibuFL.AddImageView();
             shanyibuFL.AddTextButtonView();
             shanyibuFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_shangyibu.png";
+            shanyibuFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_shangyibu_selected.png";
             shanyibuFL.GetTextButton().Text = "涓婁竴閮�";
             shanyibuFL.AddClickView();
 
@@ -913,7 +960,8 @@
             bofangFL.X = shanyibuFL.Right + Application.GetRealWidth(septal);
             bofangFL.AddImageView();
             bofangFL.AddTextButtonView();
-            bofangFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_bofang.png";
+            bofangFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_bofan.png";
+            bofangFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_bofan_selected.png";
             bofangFL.GetTextButton().Text = "鎾斁";
             bofangFL.AddClickView();
 
@@ -924,6 +972,7 @@
             xiayibuFL.AddImageView();
             xiayibuFL.AddTextButtonView();
             xiayibuFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_xiayibu.png";
+            xiayibuFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_xiayibu_selected.png";
             xiayibuFL.GetTextButton().Text = "涓嬩竴閮�";
             xiayibuFL.AddClickView();
 
@@ -945,6 +994,7 @@
             kuaituiFL.AddImageView();
             kuaituiFL.AddTextButtonView();
             kuaituiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaitui.png";
+            kuaituiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaijin_selected.png";
             kuaituiFL.GetTextButton().Text = "蹇��";
             kuaituiFL.AddClickView();
 
@@ -957,6 +1007,7 @@
             zantingFL.AddImageView();
             zantingFL.AddTextButtonView();
             zantingFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_zanting.png";
+            zantingFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_zanting_selected.png";
             zantingFL.GetTextButton().Text = "鏆傚仠";
             zantingFL.AddClickView();
 
@@ -969,6 +1020,7 @@
             kusinjinFL.AddImageView();
             kusinjinFL.AddTextButtonView();
             kusinjinFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_kuaijin.png";
+            kusinjinFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_kuaitui_selected.png";
             kusinjinFL.GetTextButton().Text = "蹇繘";
             kusinjinFL.AddClickView();
 
@@ -990,6 +1042,7 @@
             dengguanFL.AddImageView();
             dengguanFL.AddTextButtonView();
             dengguanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dengguan.png";
+            dengguanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dengguang_selected.png";
             dengguanFL.GetTextButton().Text = "鐏叧";
             dengguanFL.AddClickView();
 
@@ -1000,6 +1053,7 @@
             tingzhiFL.AddImageView();
             tingzhiFL.AddTextButtonView();
             tingzhiFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_tingzhi.png";
+            tingzhiFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_tingzhi_selected.png";
             tingzhiFL.GetTextButton().Text = "鍋滄";
             tingzhiFL.AddClickView();
 
@@ -1011,6 +1065,7 @@
             dankongdengFL.AddImageView();
             dankongdengFL.AddTextButtonView();
             dankongdengFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dankongdeng.png";
+            dankongdengFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dankongdeng_selected.png";
             dankongdengFL.GetTextButton().Text = "鍗曟帶鐏�";
             dankongdengFL.AddClickView();
 
@@ -1029,7 +1084,7 @@
             typeMultiFramLayout = new TypeMultiFramLayout();
             typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
             typeMultiFramLayout.AddView(cornerBottomFram);
-            typeMultiFramLayout.btnBottonRightName.TextID = StringId.xuniyaokongqi;
+            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
 
             this.AdjustRealHeight(16);
         }
@@ -1068,7 +1123,7 @@
     class CustomFrameLayout : FrameLayout
     {
         public const int widthFrameLayout = 36;
-        public const int heightFrameLayout = 49;
+        public const int heightFrameLayout = 49-6;
         public CustomFrameLayout(int width = widthFrameLayout, int height = heightFrameLayout)
         {
             this.Width = Application.GetRealWidth(width);
@@ -1087,8 +1142,10 @@
             Height = Application.GetRealHeight(16),
             TextSize = TextSize.Text12,
             TextColor = MusicColor.WhiteColor,
+            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
             TextAlignment = TextAlignment.Center,
             Gravity = Gravity.CenterHorizontal,
+            Padding=new Padding(0,0,0,0),
         };
         Button btnNumber = new Button
         {
@@ -1097,6 +1154,7 @@
             Gravity = Gravity.Center,
             TextSize = 20,
             TextColor = MusicColor.WhiteColor,
+            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
             IsBold = true,
 
         };
@@ -1105,7 +1163,9 @@
             Width = Application.GetRealWidth(12),
             Height = Application.GetRealWidth(12),
             Gravity = Gravity.Center,
-            Radius = (uint)Application.GetRealHeight(6),
+            Radius = (uint)Application.GetRealWidth(6),
+            BackgroundColor=0x00000000,
+            SelectedBackgroundColor = 0xFFF2F3F7,
         };
 
         public FrameLayout clickFl = new FrameLayout
@@ -1167,13 +1227,22 @@
         {
             clickFl.MouseDownEventHandler += (sender, e) =>
             {
-                this.BackgroundColor = 0xff798394;
+                //this.BackgroundColor = 0xff798394;
+                btnImage.IsSelected = true;
+                btnText.IsSelected = true;
+                btnNumber.IsSelected = true;
+                btn.IsSelected = true;
+
                 action?.Invoke();
             };
 
             clickFl.MouseUpEventHandler += (sender, e) =>
             {
-                this.BackgroundColor = 0x00000000;
+                //this.BackgroundColor = 0x00000000;
+                btnImage.IsSelected = false;
+                btnText.IsSelected = false;
+                btnNumber.IsSelected = false;
+                btn.IsSelected = false;
             };
 
         }

--
Gitblit v1.8.0