From b562a582ac3a288193e6e4f57c5eff8a344305a4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 13:52:17 +0800
Subject: [PATCH] Update AndroidManifest.xml

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs |  427 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 284 insertions(+), 143 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 4c96121..e246608 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -3,12 +3,13 @@
 using HDL_ON.UI.Music;
 using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
 using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 using Shared;
 using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
 namespace HDL_ON.UI.UI2.FuntionControlView.Aks
 {
     /// <summary>
-    ///閬ユ帶鍣ㄧ晫闈�
+    ///铏氭嫙閬ユ帶鍣ㄧ晫闈�
     /// </summary>
     public class YkqPage : BaseFramLayout
     {
@@ -35,6 +36,7 @@
         /// 鍒囨崲璁惧瀹瑰櫒
         /// </summary>
         TypeMultiFramLayout typeMultiFramLayout;
+        TypeSingleFramLayout tyySingleFramLayout;
 
         Button switchBtn;
         CustomFrameLayout xinxiFL;
@@ -62,14 +64,14 @@
         CustomFrameLayout zhuyeFL;
         FrameLayout okFl;
         Button btnLeft;
-        Button btnQian;
-        Button btnRight;
-        Button btnHou;
-        Button btnOk;
-        Button btnJia;
-        Button btnJian;
         Button btnShang;
+        Button btnRight;
         Button btnXia;
+        Button btnOk;
+        Button btnYingliangjia;
+        Button btnYingliangjian;
+        Button btnPindaojia;
+        Button btnPindaojian;
         CustomFrameLayout caidanFL;
         CustomFrameLayout fanhuiFL;
         CustomFrameLayout shanyibuFL;
@@ -104,239 +106,294 @@
         private void EventListener()
         {
             //寮�鍏�
-            switchBtn.MouseDownEventHandler += (senser, e) =>
+            switchBtn.MouseUpEventHandler += (senser, e) =>
             {
-
+                KeyControl("on_off", "寮�/鍏�");
+                this.SetButtonIsSelected(switchBtn);
             };
             //淇℃伅
             xinxiFL.SetClickListener(() =>
             {
-
+                KeyControl("info", "淇℃伅");
             });
             //鏀惰棌
             shoucangFL.SetClickListener(() =>
             {
+                KeyControl("collect", "鏀惰棌");
             });
             //鐢靛奖
             dianyingFL.SetClickListener(() =>
             {
-
+                KeyControl("movie", "鐢靛奖");
             });
             //濞变箰
             yuleFL.SetClickListener(() =>
             {
-
+                KeyControl("recreation", "濞变箰");
             });
             //鐢佃
             dianshiFL.SetClickListener(() =>
             {
-
+                KeyControl("tv", "鐢佃");
             });
             //绾㈣壊
             redFL.SetClickListener(() =>
             {
-
+                KeyControl("red", "绾㈣壊");
             });
             //榛勮壊
             yellowFL.SetClickListener(() =>
             {
-
+                KeyControl("yellow", "榛勮壊");
             });
             //钃濊壊
             blueFL.SetClickListener(() =>
             {
-
+                KeyControl("blue", "钃濊壊");
             });
             //1
             number1FL.SetClickListener(() =>
             {
-
+                KeyControl("number_1", "1");
             });
             //2
             number2FL.SetClickListener(() =>
             {
-
+                KeyControl("number_2", "2");
             });
             //3
             number3FL.SetClickListener(() =>
             {
+                KeyControl("number_3", "3");
 
             });
             //4
             number4FL.SetClickListener(() =>
             {
+                KeyControl("number_4", "4");
 
             });
             //5
             number5FL.SetClickListener(() =>
             {
+                KeyControl("number_5", "5");
 
             });
             //6
             number6FL.SetClickListener(() =>
             {
-
+                KeyControl("number_6", "6");
             });
             //7
             number7FL.SetClickListener(() =>
             {
-
+                KeyControl("number_7", "7");
             });
             //8
             number8FL.SetClickListener(() =>
             {
-
+                KeyControl("number_8", "8");
             });
             //9
             number9FL.SetClickListener(() =>
             {
+                KeyControl("number_9", "9");
 
             });
 
             //闊宠建
             yinguiFL.SetClickListener(() =>
             {
-
+                KeyControl("audio_track", "闊宠建");
             });
             //0
             number0FL.SetClickListener(() =>
             {
+                KeyControl("number_0", "0");
 
             });
             //瀛楀箷
             zimuFL.SetClickListener(() =>
             {
+                KeyControl("subtitle", "瀛楀箷");
 
             });
             //闈欓煶
             jingyinFL.SetClickListener(() =>
             {
+                KeyControl("mute", "闈欓煶");
 
             });
             //鎶曞睆
             toupingFL.SetClickListener(() =>
             {
+                KeyControl("main", "鎶曞睆");
 
             });
             //涓婚〉
             zhuyeFL.SetClickListener(() =>
             {
+                KeyControl("home", "涓婚〉");
 
             });
             //宸�
-            btnLeft.MouseDownEventHandler += (sender, e) =>
+            btnLeft.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
+               
+                KeyControl("key_left", "宸�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_left_selected.png", "AksIcon/ykq_ok.png");
 
             };
-            //鍓�
-            btnQian.MouseDownEventHandler += (sender, e) =>
+            //涓�
+            btnShang.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_qian_selected.png";
+                KeyControl("key_up", "涓�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_shang_selected.png", "AksIcon/ykq_ok.png");
 
             };
 
             //鍙�
             btnRight.MouseDownEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
+
+           
+                KeyControl("key_right", "鍙�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_right_selected.png", "AksIcon/ykq_ok.png");
 
             };
 
-            //鍚�
-            btnHou.MouseDownEventHandler += (sender, e) =>
+            //涓�
+            btnXia.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_hou_selected.png";
+               
+
+                KeyControl("key_down", "涓�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_xia_selected.png", "AksIcon/ykq_ok.png");
             };
             //OK
             btnOk.MouseDownEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
+
+                KeyControl("key_ok", "纭畾");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_ok_selected.png", "AksIcon/ykq_ok.png");
             };
-            //鍔�
-            btnJia.MouseDownEventHandler += (sen, e) => { };
-            //鍑�
-            btnJian.MouseDownEventHandler += (sen, e) => { };
-            //涓�
-            btnShang.MouseDownEventHandler += (sen, e) => { };
-            //涓�
-            btnXia.MouseDownEventHandler += (sen, e) => { };
+            //闊抽噺+
+            btnYingliangjia.MouseUpEventHandler += (sen, e) =>
+            {
+                KeyControl("volume_up", "闊抽噺+");
+                this.SetButtonIsSelected(btnYingliangjia);
+            };
+            //闊抽噺-
+            btnYingliangjian.MouseUpEventHandler += (sen, e) =>
+            {
+                KeyControl("volume_down", "闊抽噺-");
+                this.SetButtonIsSelected(btnYingliangjian);
+            };
+            //棰戦亾+
+            btnPindaojia.MouseUpEventHandler += (sen, e) =>
+            {
+                KeyControl("ch_up", "棰戦亾+");
+                this.SetButtonIsSelected(btnPindaojia);
+            };
+            //棰戦亾-
+            btnPindaojian.MouseUpEventHandler += (sen, e) =>
+            {
+                KeyControl("ch_down", "棰戦亾-");
+                this.SetButtonIsSelected(btnPindaojian);
+            };
 
             //鑿滃崟
             caidanFL.SetClickListener(() =>
             {
+                KeyControl("menu", "鑿滃崟");
 
             });
             //杩斿洖
             fanhuiFL.SetClickListener(() =>
             {
+                KeyControl("cancel", "杩斿洖");
 
             });
             //涓婁竴閮�
             shanyibuFL.SetClickListener(() =>
             {
+                KeyControl("part_up", "涓婁竴閮�");
 
             });
             //鎾斁
             bofangFL.SetClickListener(() =>
             {
+                KeyControl("play", "鎾斁");
 
             });
             //涓嬩竴閮�
             xiayibuFL.SetClickListener(() =>
             {
-
+                KeyControl("part_down", "涓嬩竴閮�");
             });
             //蹇��
             kuaituiFL.SetClickListener(() =>
             {
-
+                KeyControl("fast_rewind", "蹇��");
             });
             //鏆傚仠
             zantingFL.SetClickListener(() =>
             {
-
+                KeyControl("pause", "鏆傚仠");
             });
             //蹇繘
             kusinjinFL.SetClickListener(() =>
             {
-
+                KeyControl("fast_forward", "蹇繘");
             });
             //鐏叧
             dengguanFL.SetClickListener(() =>
             {
+                KeyControl("lamp", "鐏叧");
 
             });
             //鍋滄
             tingzhiFL.SetClickListener(() =>
             {
+                KeyControl("stop", "鍋滄");
 
             });
             //鍗曟帶鐏�
             dankongdengFL.SetClickListener(() =>
             {
+                KeyControl("lamp_plc", "鍗曟帶鐏�");
 
             });
 
-
-            //鏃跺簭鍣�
-            typeMultiFramLayout.SetLeftFlClickListener((f) =>
+            if (typeMultiFramLayout != null)
             {
-                SxqPage sxqPage = new SxqPage(this.sequencerList,this.remoteControl.deviceId);
-                MainPage.BasePageView.AddChidren(sxqPage);
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                sxqPage.Show();
+                //鏃跺簭鍣�
+                typeMultiFramLayout.SetLeftFlClickListener((f) =>
+                {
+                    SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
+                    MainPage.BasePageView.AddChidren(sxqPage);
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    sxqPage.Show();
 
-            });
-            //璁惧鍒囨崲
-            typeMultiFramLayout.SetRightFlClickListener((f) =>
+                });
+                //璁惧鍒囨崲
+                typeMultiFramLayout.SetRightFlClickListener((f) =>
+                {
+                    action?.Invoke(IntType.Control);
+                });
+            }
+            if (tyySingleFramLayout != null)
             {
-                Console.WriteLine("4");
-                action?.Invoke(IntType.Control);
-            });
+                tyySingleFramLayout.SetClickListener((f) =>
+                {
+                    action?.Invoke(IntType.Control);
+                });
+            }
 
         }
-
+        /// <summary>
+        /// 鍒濆鍖栫晫闈�
+        /// </summary>
         private void InitUI()
         {
             this.BackgroundColor = MusicColor.ViewColor;
@@ -349,7 +406,8 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
-                TextID = StringId.xuniyaokongqi,
+                Text = this.remoteControl.name,
+                IsBold = true,
             };
             this.AddChidren(btnTitle);
 
@@ -358,7 +416,7 @@
             {
                 Y = btnTitle.Bottom + Application.GetRealHeight(16),
                 Width = Application.GetRealWidth(240),
-                Height = Application.GetRealHeight(1095),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+                Height = Application.GetRealHeight(1095 - 122 - 60),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
                 Radius = (uint)Application.GetRealHeight(17),
                 BackgroundColor = 0xff798394,
                 Gravity = Gravity.CenterHorizontal,
@@ -371,7 +429,7 @@
                 Y = btnTitle.Bottom + Application.GetRealHeight(16),
                 //X = Application.GetRealWidth(71),
                 Width = Application.GetRealWidth(232),
-                Height = Application.GetRealHeight(1095),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+                Height = Application.GetRealHeight(1095 - 122 - 60),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
                 Radius = (uint)Application.GetRealHeight(17),
                 BackgroundColor = 0xff19181E,
                 Gravity = Gravity.CenterHorizontal,
@@ -387,21 +445,30 @@
                 Width = Application.GetRealWidth(48),
                 Gravity = Gravity.CenterHorizontal,
                 BackgroundColor = 0xff201F25,
-                Radius = (uint)Application.GetRealHeight(24),
+                Radius = (uint)Application.GetRealWidth(24),
 
             };
             layout.AddChidren(switchFl);
 
             switchBtn = new Button
             {
-                Height = Application.GetRealWidth(32),
-                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(48),
+                Width = Application.GetRealWidth(48),
                 Gravity = Gravity.Center,
                 UnSelectedImagePath = "AksIcon/ykq_kai.png",
+                SelectedImagePath = "AksIcon/ykq_kaiguang_selected.png"
             };
             switchFl.AddChidren(switchBtn);
+            switchBtn.MouseDownEventHandler += (senser, e) =>
+            {
+                switchBtn.IsSelected = true;
+            };
+            switchBtn.MouseUpOutsideEventHandler += (senser, e) =>
+            {
+                switchBtn.IsSelected = false;
+            };
 
-            int h = 49;
+            int h = 49 - 6;
             int offset = 28;//x杞村亸绉婚噺
             int septal = 36;//闂撮殧
             #region
@@ -419,6 +486,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();
 
@@ -429,13 +497,14 @@
             shoucangFL.AddImageView();
             shoucangFL.AddTextButtonView();
             shoucangFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_shoucang.png";
+            shoucangFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_shoucang_selected.png";
             shoucangFL.GetTextButton().Text = "鏀惰棌";
             shoucangFL.AddClickView();
 
 
             var line2Fl = new FrameLayout
             {
-                Y = line1Fl.Bottom + Application.GetRealHeight(16),
+                Y = line1Fl.Bottom + Application.GetRealHeight(8),
                 Height = Application.GetRealHeight(h),
             };
             layout.AddChidren(line2Fl);
@@ -446,6 +515,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();
 
@@ -456,6 +526,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();
 
@@ -465,6 +536,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();
 
@@ -472,7 +544,7 @@
 
             var line3Fl = new FrameLayout
             {
-                Y = line2Fl.Bottom + Application.GetRealHeight(16),
+                Y = line2Fl.Bottom + Application.GetRealHeight(8),
                 Height = Application.GetRealHeight(h),
             };
             layout.AddChidren(line3Fl);
@@ -505,7 +577,7 @@
 
             var line4Fl = new FrameLayout
             {
-                Y = line3Fl.Bottom + Application.GetRealHeight(16),
+                Y = line3Fl.Bottom + Application.GetRealHeight(8),
                 Height = Application.GetRealHeight(h),
             };
             layout.AddChidren(line4Fl);
@@ -617,6 +689,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();
 
@@ -635,6 +708,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();
@@ -645,7 +719,7 @@
 
             var line8Fl = new FrameLayout
             {
-                Y = line7Fl.Bottom + Application.GetRealHeight(32),
+                Y = line7Fl.Bottom + Application.GetRealHeight(16),
                 Height = Application.GetRealHeight(h),
             };
             layout.AddChidren(line8Fl);
@@ -656,6 +730,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();
 
@@ -665,7 +740,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();
 
@@ -676,6 +752,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();
 
@@ -687,59 +764,67 @@
             var baseFl = new BaseFramLayout
             {
                 Y = line8Fl.Bottom,
-                Height = Application.GetRealHeight(207),
+                Height = Application.GetRealHeight(207 - 32 - 12),
             };
             layout.AddChidren(baseFl);
 
 
-            btnJia = new Button
+            btnYingliangjia = new Button
             {
-                Y = Application.GetRealHeight(32),
+                Y = Application.GetRealHeight(16),
                 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(btnJia);
+            baseFl.AddChidren(btnYingliangjia);
+           
 
 
-            btnJian = new Button
+            btnYingliangjian = new Button
             {
-                Y = btnJia.Bottom + Application.GetRealHeight(71),
+                Y = btnYingliangjia.Bottom + Application.GetRealHeight(71),
                 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(btnJian);
+            baseFl.AddChidren(btnYingliangjian);
+            
 
 
-            btnShang = new Button
+            btnPindaojia = new Button
             {
-                Y = Application.GetRealHeight(32),
+                Y = Application.GetRealHeight(16),
                 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(btnShang);
+            baseFl.AddChidren(btnPindaojia);
+           
 
 
-            btnXia = new Button
+            btnPindaojian = new Button
             {
-                Y = btnShang.Bottom + Application.GetRealHeight(71),
+                Y = btnPindaojia.Bottom + Application.GetRealHeight(71),
                 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(btnXia);
+            baseFl.AddChidren(btnPindaojian);
+           
 
 
 
             okFl = new FrameLayout
             {
-                Y = Application.GetRealHeight(32),
+                Y = Application.GetRealHeight(16),
                 Height = Application.GetRealWidth(143),
                 Width = Application.GetRealWidth(143),
                 BackgroundImagePath = "AksIcon/ykq_ok.png",
@@ -760,14 +845,14 @@
 
 
 
-            btnQian = new Button
+            btnShang = new Button
             {
                 Width = Application.GetRealWidth(40),
                 Height = Application.GetRealHeight(30),
                 Gravity = Gravity.CenterHorizontal,
             };
 
-            okFl.AddChidren(btnQian);
+            okFl.AddChidren(btnShang);
 
             btnRight = new Button
             {
@@ -778,13 +863,13 @@
 
             okFl.AddChidren(btnRight);
 
-            btnHou = new Button
+            btnXia = new Button
             {
                 Width = Application.GetRealWidth(40),
                 Height = Application.GetRealHeight(30),
                 Gravity = Gravity.BottomCenter,
             };
-            okFl.AddChidren(btnHou);
+            okFl.AddChidren(btnXia);
 
 
 
@@ -795,37 +880,6 @@
                 Gravity = Gravity.Center,
             };
             okFl.AddChidren(btnOk);
-
-
-
-            btnLeft.MouseUpEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-            btnQian.MouseUpEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-            btnRight.MouseUpEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-            btnHou.MouseUpEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-            btnOk.MouseUpEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-
-
-
 
             #endregion
 
@@ -845,6 +899,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();
 
@@ -855,6 +910,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();
 
@@ -862,7 +918,7 @@
 
             var line10Fl = new FrameLayout
             {
-                Y = line9Fl.Bottom + Application.GetRealHeight(16),
+                Y = line9Fl.Bottom + Application.GetRealHeight(8),
                 Height = Application.GetRealHeight(h),
             };
             layout.AddChidren(line10Fl);
@@ -873,6 +929,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();
 
@@ -882,7 +939,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();
 
@@ -893,6 +951,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();
 
@@ -903,7 +962,7 @@
 
             var line11Fl = new FrameLayout
             {
-                Y = line10Fl.Bottom + Application.GetRealHeight(16),
+                Y = line10Fl.Bottom + Application.GetRealHeight(8),
                 Height = Application.GetRealHeight(h),
             };
             layout.AddChidren(line11Fl);
@@ -914,6 +973,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();
 
@@ -926,6 +986,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();
 
@@ -938,6 +999,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();
 
@@ -948,7 +1010,7 @@
 
             var line12Fl = new FrameLayout
             {
-                Y = line11Fl.Bottom + Application.GetRealHeight(16),
+                Y = line11Fl.Bottom + Application.GetRealHeight(8),
                 Height = Application.GetRealHeight(h),
             };
             layout.AddChidren(line12Fl);
@@ -959,7 +1021,8 @@
             dengguanFL.AddImageView();
             dengguanFL.AddTextButtonView();
             dengguanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dengguan.png";
-            dengguanFL.GetTextButton().Text = "鐏叧";
+            dengguanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dengguang_selected.png";
+            dengguanFL.GetTextButton().Text = "鐏厜1";
             dengguanFL.AddClickView();
 
 
@@ -969,6 +1032,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();
 
@@ -980,7 +1044,8 @@
             dankongdengFL.AddImageView();
             dankongdengFL.AddTextButtonView();
             dankongdengFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dankongdeng.png";
-            dankongdengFL.GetTextButton().Text = "鍗曟帶鐏�";
+            dankongdengFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dankongdeng_selected.png";
+            dankongdengFL.GetTextButton().Text = "鐏厜2";
             dankongdengFL.AddClickView();
 
             #endregion
@@ -995,12 +1060,69 @@
             cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
             this.AddChidren(cornerBottomFram);
 
-            typeMultiFramLayout = new TypeMultiFramLayout();
-            typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
-            typeMultiFramLayout.AddView(cornerBottomFram);
-            typeMultiFramLayout.btnBottonRightName.TextID = StringId.xuniyaokongqi;
+
+            if (sequencerList.Count == 0)
+            {
+                //娌℃湁鏃跺簭鍣�
+                tyySingleFramLayout = new TypeSingleFramLayout();
+                tyySingleFramLayout.AddView(cornerBottomFram);
+                tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
+                tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
+                tyySingleFramLayout.singleFramLayout.Gravity = Gravity.CenterVertical;
+                tyySingleFramLayout.btnName.Text = this.remoteControl.name;
+                tyySingleFramLayout.btnName.X = Application.GetRealWidth(16);
+                tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48);
+                tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
+                tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
+                tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
+                tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
+                tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
+                tyySingleFramLayout.btnLeftImage.Visible = false;
+
+                tyySingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+                  tyySingleFramLayout.singleFramLayout,
+                  tyySingleFramLayout.btnName,
+                   tyySingleFramLayout.btnRightImage,
+                   48, 200);
+
+            }
+            else
+            {
+
+                typeMultiFramLayout = new TypeMultiFramLayout();
+                typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
+                typeMultiFramLayout.AddView(cornerBottomFram);
+                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
+            }
 
             this.AdjustRealHeight(16);
+        }
+
+        /// <summary>
+        /// 鎸夐敭鎺у埗
+        /// </summary>
+        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
+        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
+
+        private void KeyControl(string keypad, string keyName, bool isSupport = true)
+        {
+            //CommonMethod.Current.Loading.Start();
+            CommonMethod.Current.SunThread(() =>
+            {
+                try
+                {
+                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
+                }
+                catch { }
+                finally
+                {
+                    CommonMethod.Current.MainThread(() =>
+                    {
+                        //CommonMethod.Current.Loading.Hide();
+                    });
+                }
+            });
+
         }
 
     }
@@ -1008,10 +1130,10 @@
     /// <summary>
     /// 鑷繁寮勪竴涓狥rameLayout
     /// </summary>
-    class CustomFrameLayout : FrameLayout
+    class CustomFrameLayout : BaseFramLayout
     {
         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);
@@ -1030,8 +1152,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
         {
@@ -1040,6 +1164,7 @@
             Gravity = Gravity.Center,
             TextSize = 20,
             TextColor = MusicColor.WhiteColor,
+            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
             IsBold = true,
 
         };
@@ -1048,7 +1173,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
@@ -1108,17 +1235,31 @@
         /// <param name="action">鍥炶皟(鐖剁被瀵硅薄)</param>
         public void SetClickListener(Action action)
         {
-            clickFl.MouseDownEventHandler += (sender, e) =>
-            {
-                //this.BackgroundColor = 0xff484378;
-                action?.Invoke();
-            };
-
             clickFl.MouseUpEventHandler += (sender, e) =>
             {
-                //this.BackgroundColor = 0xff484378;
+                action?.Invoke();
+                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
+                btnImage.IsSelected = true;
+                btnText.IsSelected = true;
+                btnNumber.IsSelected = true;
+                btn.IsSelected = true;
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(millisecondsTimeout);
+                    Application.RunOnMainThread(() =>
+                    {
+                        //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
+                        btnImage.IsSelected = false;
+                        btnText.IsSelected = false;
+                        btnNumber.IsSelected = false;
+                        btn.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
+              
             };
 
+            
 
         }
 

--
Gitblit v1.8.0