From 0c216014c649090d765902301cbfc9157f8f1ee4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 八月 2023 16:19:40 +0800
Subject: [PATCH] 2023年08月15日16:19:37

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index 25a64f5..a31a476 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -23,8 +23,14 @@
         /// 鍒楄〃鏈�澶у��
         /// </summary>
         private int mListCount;
-
-        public Action<KeypadEntity> selectAction = null;
+        /// <summary>
+        /// 鎸夐敭鍥炶皟
+        /// </summary>
+        public Action<KeypadEntity> selectKeyAction = null; 
+        /// <summary>
+        /// 褰辩墖鍥炶皟
+        /// </summary>
+        public Action<MovieLibrary> selectImageAction = null;
 
 
         /// <summary>
@@ -119,7 +125,7 @@
                 {
                     if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
                     {
-                        selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
+                        selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                     }
                 });
 
@@ -139,7 +145,7 @@
         /// 鍔ㄦ�佸姞杞芥寜閿晫闈�
         /// </summary>
         /// <param name="mList">鍒楄〃</param>
-        /// <param name="list">鍒楄〃涓储寮�,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�</param>
+        /// <param name="list"> 鍒楄〃涓储寮�,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�,娌℃湁榛樿(new List<int>)</param>
         /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
         public void LoadButtonPage(List<KeypadEntity> mList, List<int> list,int defaultIndex=-1)
         {
@@ -200,7 +206,7 @@
                 {
                     if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
                     {
-                        selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
+                        selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                     }
                 });
 
@@ -248,7 +254,8 @@
                     IsBold = true,
                     Tag = keypad,
                     BackgroundColor = MusicColor.WhiteColor,
-                    SelectedBackgroundColor = 0xff454635,
+                    SelectedBackgroundColor = 0xFFEFEFEF,
+                    Radius = (uint)Application.GetRealHeight(8),
                 };
                 this.AddChidren(button);
 
@@ -265,7 +272,7 @@
                         return;
                     }
                     button.IsSelected = true;
-                    selectAction?.Invoke((KeypadEntity)button.Tag);
+                    selectKeyAction?.Invoke((KeypadEntity)button.Tag);
                 };
                 button.MouseUpEventHandler += (sen, e) =>
                 {
@@ -318,14 +325,14 @@
 
                 imageFram.SetClickListener((fl) =>
                 {
-                    if (imageFram.Tag != null&& imageFram.Tag is KeypadEntity)
+                    if (imageFram.Tag != null&& imageFram.Tag is MovieLibrary)
                     {
-                        selectAction?.Invoke((KeypadEntity)imageFram.Tag);
+                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
                     }
                 });
                 //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
                 //{
-                //    selectAction?.Invoke((int)imageFram.Tag);
+                //    selectImageAction?.Invoke((int)imageFram.Tag);
                 //}
             }
         }
@@ -335,7 +342,7 @@
         /// </summary>
         /// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
         /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
-        public void LoadImagePage(List<KeypadEntity> mList, int mRowNumber)
+        public void LoadImagePage(List<MovieLibrary> mList, int mRowNumber)
         {
             if (mList == null || mList.Count == 0)
             {
@@ -368,15 +375,15 @@
                 }
                 imageFram.SetClickListener((fl) =>
                 {
-                    if (imageFram.Tag != null)
+                    if (imageFram.Tag != null && imageFram.Tag is MovieLibrary)
                     {
-                        selectAction?.Invoke((KeypadEntity)imageFram.Tag);
+                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
                     }
                 });
 
                 //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
                 //{
-                //    selectAction?.Invoke((int)imageFram.Tag);
+                //    selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
                 //}
 
 
@@ -428,7 +435,7 @@
                     keypad.category = filters.category;
                     keypad.filterValue = filters.filterValue;
                     keypad.filterName = filters.filterName;
-                    selectAction?.Invoke(keypad);
+                    selectKeyAction?.Invoke(keypad);
                 };
                 horizontal.InitControl(filterCategory.filters, defaultIndex);
 

--
Gitblit v1.8.0