From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs |  358 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 243 insertions(+), 115 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index 443c3e0..6595c4d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -2,6 +2,8 @@
 using HDL_ON.UI.Music;
 using Shared;
 using System.Collections.Generic;
+using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+
 
 namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
 {
@@ -14,18 +16,24 @@
         private int leftMargin;
         private int bottomMargin;
         private int rightMargin;
+        private int mWidth;
+        private int mHeight;
         /// <summary>
         /// 涓�琛屽嚑涓厓绱�
         /// </summary>
         private int mRowNumber;
-
-        private List<string> mList;
-
-        public Action<string> selectAction = null;
         /// <summary>
-        /// 褰撳墠閫夋嫨鐨勭储寮�(鍐呴儴浣跨敤)
+        /// 鍒楄〃鏈�澶у��
         /// </summary>
-        private int CurrnetSelectIndex = -1;
+        private int mListCount;
+        /// <summary>
+        /// 鎸夐敭鍥炶皟
+        /// </summary>
+        public Action<KeypadEntity> selectKeyAction = null; 
+        /// <summary>
+        /// 褰辩墖鍥炶皟
+        /// </summary>
+        public Action<MovieLibrary> selectImageAction = null;
 
 
         /// <summary>
@@ -40,6 +48,8 @@
             this.Width = Application.GetRealWidth(width);
             this.Height = Application.GetRealHeight(height);
             this.Radius = (uint)Application.GetRealHeight(radius);
+            this.mWidth = this.Width;
+            this.mHeight = this.Height;
 
 
         }
@@ -58,58 +68,42 @@
             this.rightMargin = right;
         }
 
-        /// <summary>
-        /// 璁剧疆鍒楄〃鏁版嵁(璇峰湪鍒濆鍖栧畬鎴愪箣鍓嶈皟鐢�)
-        /// </summary>
-        /// <param name="list"></param>
-        public void SetList(List<string> list)
-        {
-            if (list == null)
-            {
-                list = new List<string>();
-            }
-            this.mList = list;
-        }
+
 
         /// <summary>
         /// 鑾峰彇娴嬭瘯鍒楄〃鏁版嵁
         /// </summary>
-        public List<string> GetTestList(int count)
+        public List<KeypadEntity> GetTestList()
         {
-            var list = new List<string>();
-            for (int i = 1; i <= count; i++)
-            {
-                if (i % 2 == 0)
-                {
-                    list.Add("浣犲ソ鍌诲摝!");
-                }
-                else
-                {
-                    list.Add("鐪熺殑鏄繖鏍风殑鍚�?");
-                }
-            }
-            return list;
+            return AksCommonMethod.Current.GetTYYKeypadList(null);
         }
 
         /// <summary>
         /// 鍔ㄦ�佸姞杞芥寜閿晫闈�
         /// </summary>
+        /// <param name="mList">鍒楄〃</param>
         /// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
-        public void LoadButtonPage(int mRowNumber)
+        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
+        public void LoadButtonPage(List<KeypadEntity> mList, int mRowNumber, int defaultIndex = -1)
         {
+            if (mList == null || mList.Count == 0)
+            {
+                return;
+            }
             if (mRowNumber == 0)
             {
                 return;
             }
             this.mRowNumber = mRowNumber;
+            this.mListCount = mList.Count;
             int line = 0;
             int xCount = 0;
-            for (int i = 1; i <= this.mList.Count; i++)
+            for (int i = 1; i <= mList.Count; i++)
             {
-                var d = this.mList[i - 1];
+                var keypad = mList[i - 1];
                 ButtonFramLayout buttonFram = new ButtonFramLayout();
                 this.AddChidren(buttonFram);
-                buttonFram.Tag = d;
+                buttonFram.Tag = keypad;
                 buttonFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(ButtonFramLayout.heightFrameLayout * line);
                 buttonFram.X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(ButtonFramLayout.widthFrameLayout * xCount);
                 buttonFram.AddImageView();
@@ -122,7 +116,8 @@
                 {
                     buttonFram.AddBottomLine();
                 }
-                buttonFram.GetNameButton().Text = d;
+                buttonFram.GetImageButton().UnSelectedImagePath = keypad.localIconAddress;
+                buttonFram.GetNameButton().Text = keypad.name;
 
                 xCount++;
                 if (i % this.mRowNumber == 0)
@@ -131,17 +126,29 @@
                     line++;
                     xCount = 0;
                 }
+                //涓嶆敮鎸佹寜閿偣鍑昏儗鏅鑹�
+                if (!keypad.isClicked)
+                {
+                    buttonFram.GetImageButton().Alpha = 0.5f;
+                    buttonFram.GetNameButton().TextColor =unBackgroundColor;
+                    buttonFram.SetClick(false);
+
+                }
                 buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                 {
-                    if (buttonFram.Tag != null)
+                    if (buttonFram.Tag == null)
                     {
-                        selectAction?.Invoke(buttonFram.Tag.ToString());
+                        return;
                     }
+                    selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                 });
 
-                //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
+                //if (defaultIndex != -1 && defaultIndex == i)
                 //{
-                //    selectAction?.Invoke((int)buttonFram.Tag);
+                //    if (buttonFram.Tag != null && buttonFram.Tag is KeypadEntity)
+                //    {
+                //        selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
+                //    }
                 //}
 
 
@@ -151,18 +158,23 @@
         /// <summary>
         /// 鍔ㄦ�佸姞杞芥寜閿晫闈�
         /// </summary>
-        /// <param name="list">绱㈠紩鍒楄〃,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�</param>
-        public void LoadButtonPage(List<int> list)
+        /// <param name="mList">鍒楄〃</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)
         {
-
+            if (mList == null || mList.Count == 0)
+            {
+                return;
+            }
             int currnetheightValue = 0;
             int currnetWidthValue = 0;
             //鑾峰彇鐩稿涓�涓含搴﹀��
             int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(ButtonFramLayout.heightFrameLayout / 2);
             int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(ButtonFramLayout.widthFrameLayout / 2);
-            for (int i = 1; i <= this.mList.Count; i++)
+            for (int i = 1; i <= mList.Count; i++)
             {
-                var d = this.mList[i - 1];
+                var keypad = mList[i - 1];
                 ButtonFramLayout buttonFram = null;
                 if (list.Contains(i))
                 {
@@ -183,8 +195,9 @@
                 this.AddChidren(buttonFram);
                 buttonFram.AddImageView();
                 buttonFram.AddNameView();
-                buttonFram.Tag = d;//鏍囪鏁版嵁
-                buttonFram.GetNameButton().Text = d.ToString();
+                buttonFram.Tag = keypad;//鏍囪鏁版嵁
+                buttonFram.GetImageButton().UnSelectedImagePath = keypad.localIconAddress;
+                buttonFram.GetNameButton().Text = keypad.name;
                 if (widthDimensionValue > Application.GetRealWidth(currnetWidthValue))
                 {
                     //鍔犲彸绾�
@@ -202,18 +215,29 @@
                     currnetheightValue += ButtonFramLayout.heightFrameLayout;
                     currnetWidthValue = 0;
                 }
-
+                //涓嶆敮鎸佹寜閿偣鍑昏儗鏅鑹�
+                if (!keypad.isClicked)
+                {
+                    buttonFram.GetImageButton().Alpha = 0.5f;
+                    buttonFram.GetNameButton().TextColor = unBackgroundColor;
+                    buttonFram.SetClick(false);
+                }
                 buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                 {
-                    if (buttonFram.Tag != null)
+                    if (buttonFram.Tag == null)
                     {
-                        selectAction?.Invoke(buttonFram.Tag.ToString());
+                        return;
                     }
+                    selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
+                  
                 });
 
-                //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
+                //if (defaultIndex != -1 && defaultIndex == i)
                 //{
-                //    selectAction?.Invoke((int)buttonFram.Tag);
+                //    if (buttonFram.Tag != null && buttonFram.Tag is KeypadEntity)
+                //    {
+                //        selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
+                //    }
                 //}
             }
         }
@@ -221,32 +245,40 @@
         /// <summary>
         ///鍔ㄦ�佸姞杞芥暟瀛楁寜閿晫闈�
         /// </summary>
-        public void LoadNumberButtonPage()
+        /// <param name="mList">鍒楄〃</param>
+        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
+        public void LoadNumberButtonPage(List<KeypadEntity> mList)
         {
+            if (mList == null || mList.Count == 0)
+            {
+                return;
+            }
             int currnetheightValue = 0;
             int currnetWidthValue = 0;
-            int heightMaxValue = 84;
+            int heightMaxValue = 84 - 6;
             int widthMaxValue = 78;
             //鑾峰彇鐩稿涓�涓含搴﹀��
             int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
             int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
-            for (int i = 1; i <= this.GetNumberTextList().Count; i++)
+            for (int i = 0; i < mList.Count; i++)
             {
-                var d = this.GetNumberTextList()[i - 1];
+                var keypad = mList[i];
                 Button button = new Button
                 {
                     Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue),
                     X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(currnetWidthValue),
                     Width = Application.GetRealWidth(widthMaxValue),
                     Height = Application.GetRealHeight(heightMaxValue),
-                    Text = d,
+                    Text = keypad.name,
                     TextSize = TextSize.Text20,
                     TextColor = MusicColor.TextColor,
                     TextAlignment = TextAlignment.Center,
                     IsBold = true,
-                    Tag = d,
+                    Tag = keypad,
                     BackgroundColor = MusicColor.WhiteColor,
-                    SelectedBackgroundColor = 0xff454635,
+                    SelectedBackgroundColor = 0xFFF2F3F7,
+                    Radius = (uint)Application.GetRealHeight(8),
+                    SelectedTextColor = MusicColor.TextColor,
                 };
                 this.AddChidren(button);
 
@@ -256,21 +288,25 @@
                     currnetheightValue += heightMaxValue;
                     currnetWidthValue = 0;
                 }
-                button.MouseDownEventHandler += (sen, e) =>
+                //涓嶆敮鎸佹寜閿偣鍑昏儗鏅鑹�
+                if (!keypad.isClicked)
                 {
-                    if (button.Tag == null || string.IsNullOrEmpty(button.Tag.ToString()))
+                    button.TextColor =unBackgroundColor;
+
+                }
+
+
+                button.MouseUpEventHandler += (sen, e) =>
+                {
+                    if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none"|| !((KeypadEntity)button.Tag).isClicked)
                     {
                         return;
                     }
-                    button.IsSelected = true;
-                    selectAction?.Invoke(button.Tag.ToString());
-                };
-                button.MouseUpEventHandler += (sen, e) =>
-                {
-                    button.IsSelected = false;
+                    selectKeyAction?.Invoke((KeypadEntity)button.Tag);
+                    SetButtonIsSelected(button);
                 };
 
-                //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
+                //if (defaultIndex != -1 && defaultIndex == i)
                 //{
                 //    selectAction?.Invoke((int)buttonFram.Tag);
                 //}
@@ -279,9 +315,16 @@
 
         /// <summary>
         /// 鍔ㄦ�佸姞杞藉浘鐗囩晫闈�
+        /// 褰辩墖甯冨眬
         /// </summary>
-        public void LoadImagePage()
+        /// <param name="mList">鍒楄〃</param>
+        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
+        public void LoadImagePage(List<MovieLibrary> mList)
         {
+            if (mList == null || mList.Count == 0)
+            {
+                return;
+            }
             int currnetheightValue = 0;
             int currnetWidthValue = 0;
             int heightMaxValue = ImageFramlayout.heightFrameLayout;
@@ -289,15 +332,17 @@
             //鑾峰彇鐩稿涓�涓含搴﹀��
             int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
             int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
-            for (int i = 1; i <= this.mList.Count; i++)
+            for (int i = 0; i < mList.Count; i++)
             {
-                var d = this.mList[i - 1];
+                var movieLibrary = mList[i];
                 ImageFramlayout imageFram = new ImageFramlayout();
                 imageFram.AddView(this);
-                imageFram.Tag = d;
+                imageFram.Tag = movieLibrary;
                 imageFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue);
                 imageFram.X = Application.GetRealWidth(currnetWidthValue);
-                imageFram.btnName.Text = d;
+                imageFram.btnName.Text = movieLibrary.name;
+                imageFram.btnImage.ImageBytes = movieLibrary.imageBytes;
+                imageFram.btnScore.Text = movieLibrary.rating;
                 currnetWidthValue += (widthMaxValue + 8);//8鏄殧闂村��
                 if (widthDimensionValue < Application.GetRealWidth(currnetWidthValue))
                 {
@@ -307,39 +352,46 @@
 
                 imageFram.SetClickListener((fl) =>
                 {
-                    if (imageFram.Tag != null)
+                    if (imageFram.Tag != null&& imageFram.Tag is MovieLibrary)
                     {
-                        selectAction?.Invoke(imageFram.Tag.ToString());
+                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
                     }
                 });
                 //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
                 //{
-                //    selectAction?.Invoke((int)imageFram.Tag);
+                //    selectImageAction?.Invoke((int)imageFram.Tag);
                 //}
             }
         }
         /// <summary>
         /// 鍔ㄦ�佸姞杞藉浘鐗囩晫闈�
+        /// 褰辩墖甯冨眬
         /// </summary>
         /// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
-        public void LoadImagePage(int mRowNumber)
+        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
+        public void LoadImagePage(List<MovieLibrary> mList, int mRowNumber)
         {
+            if (mList == null || mList.Count == 0)
+            {
+                return;
+            }
             if (mRowNumber == 0)
             {
                 return;
             }
+            this.mListCount = mList.Count;
             this.mRowNumber = mRowNumber;
             int line = 0;
             int xCount = 0;
-            for (int i = 1; i <= this.mList.Count; i++)
+            for (int i = 1; i <= mList.Count; i++)
             {
-                var d = this.mList[i - 1];
+                var keypad = mList[i - 1];
                 ImageFramlayout imageFram = new ImageFramlayout();
                 imageFram.AddView(this);
-                imageFram.Tag = d;
+                imageFram.Tag = keypad;
                 imageFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight((ImageFramlayout.heightFrameLayout + 20) * line);
                 imageFram.X = Application.GetRealWidth((ImageFramlayout.widthFrameLayout + 8) * xCount);
-                imageFram.btnName.Text = d;
+                imageFram.btnName.Text = keypad.name;
 
                 xCount++;
                 if (i % this.mRowNumber == 0)
@@ -350,30 +402,127 @@
                 }
                 imageFram.SetClickListener((fl) =>
                 {
-                    if (imageFram.Tag != null)
+                    if (imageFram.Tag != null && imageFram.Tag is MovieLibrary)
                     {
-                        selectAction?.Invoke(imageFram.Tag.ToString());
+                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
                     }
                 });
 
                 //if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
                 //{
-                //    selectAction?.Invoke((int)imageFram.Tag);
+                //    selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
                 //}
 
 
             }
         }
-        /// <summary> 
-        /// 璁剧疆鍒濆閫夋嫨(璇峰湪鍒濆鍖栧畬鎴愪箣鍓嶈皟鐢�)
+
+       private int currnetheightValue1 = 0;
+       private int currnetWidthValue1 = 0;
+       private int heightMaxValue1 = ImageFramlayout.heightFrameLayout;
+       private int widthMaxValue1 = ImageFramlayout.widthFrameLayout;
+        //鑾峰彇鐩稿涓�涓含搴﹀��
+       private int widthDimensionValue1 = Application.GetRealWidth(343) - Application.GetRealHeight(ImageFramlayout.widthFrameLayout / 2);
+        /// <summary>
+        /// 鍔犺浇褰辩墖鍒楄〃甯冨眬
+        /// (鐗规畩甯冨眬)
         /// </summary>
-        /// <param name="index">浠庡垪琛�0寮�濮嬭绠楃涓�涓厓绱�,璁剧疆瓒呰繃鍒楄〃鏈�澶�(new List().count-1)鍊艰涓烘棤鏁�</param>
-        public void SetIndex(int index = -1)
+        /// <param name="mList">鍒楄〃</param>
+        public void LoadImagePage(List<ImageFramlayout> imageFramlayoutList)
         {
-            if (index == -1) { return; }
-            this.CurrnetSelectIndex = index;
+
+            if (imageFramlayoutList==null||imageFramlayoutList.Count == 0)
+            {
+                return;
+            }
+            //int currnetheightValue = 0;
+            //int currnetWidthValue = 0;
+            //int heightMaxValue = ImageFramlayout.heightFrameLayout;
+            //int widthMaxValue = ImageFramlayout.widthFrameLayout;
+            ////鑾峰彇鐩稿涓�涓含搴﹀��
+            //int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
+            //int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
+            for (int i = 0; i < imageFramlayoutList.Count; i++)
+            {
+                var imageFram = imageFramlayoutList[i];
+                if (imageFram == null)
+                {
+                    continue;
+                }
+                imageFram.AddView(this);
+                imageFram.Y =Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue1);
+                imageFram.X = Application.GetRealWidth(currnetWidthValue1);
+                currnetWidthValue1 += (widthMaxValue1 + 8);//8鏄殧闂村��
+                if (widthDimensionValue1 < Application.GetRealWidth(currnetWidthValue1))
+                {
+                    currnetheightValue1 += (heightMaxValue1 + 20);//20鏄殧闂村��
+                    currnetWidthValue1 = 0;
+                }
+
+                imageFram.SetClickListener((fl) =>
+                {
+                    if (imageFram.Tag != null && imageFram.Tag is MovieLibrary)
+                    {
+                        selectImageAction?.Invoke((MovieLibrary)imageFram.Tag);
+                    }
+                });
+            }
+        }
+        /// <summary>
+        /// 姘村钩婊戝姩甯冨眬
+        /// </summary>
+        /// <param name="mList">鍒楄〃</param>
+        /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
+        public void LoadHorizontalPage(List<FilterCategoryEntity> mList, int defaultIndex = -1)
+        {
+            if (mList == null || mList.Count == 0)
+            {
+                return;
+            }
+            for (int i = 0; i < mList.Count; i++)
+            {
+                var filterCategory = mList[i];
+                BaseFramLayout horizontalFL = new BaseFramLayout
+                {
+                    Y = Application.GetRealHeight(i * 75),
+                    Height = Application.GetRealHeight(75),
+                    Width = this.Width,
+                };
+                this.AddChidren(horizontalFL);
+                Button btnTitleType = new Button
+                {
+                    X = Application.GetRealWidth(16),
+                    Y = Application.GetRealHeight(16),
+                    Height = Application.GetRealHeight(22),
+                    Width = Application.GetRealWidth(200),
+                    Text = filterCategory.name,
+                    TextSize = TextSize.Text16,
+                    TextColor = MusicColor.TextColor,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    IsBold = true,
+                    Tag = filterCategory,
+                };
+                horizontalFL.AddChidren(btnTitleType);
+
+                HorizontalFramLayout horizontal = new HorizontalFramLayout(375 - 16, 28);
+                horizontalFL.AddChidren(horizontal);
+                horizontal.Y = btnTitleType.Bottom + Application.GetRealHeight(8);
+                horizontal.X = Application.GetRealWidth(16);
+                horizontal.SelectTypeEvent += (filters) =>
+                {
+                    KeypadEntity keypad = new KeypadEntity();
+                    keypad.category = filters.category;
+                    keypad.filterValue = filters.filterValue;
+                    keypad.filterName = filters.filterName;
+                    selectKeyAction?.Invoke(keypad);
+                };
+                horizontal.InitControl(filterCategory.filters, defaultIndex);
+
+
+            }
 
         }
+
         /// <summary>
         /// 鏈�鍚庝竴琛�
         /// </summary>
@@ -381,12 +530,12 @@
         /// <returns></returns>
         private bool IsLastColumn(int index)
         {
-            if (this.mRowNumber == 0 || this.mList == null || this.mList.Count == 0)
+            if (this.mRowNumber == 0 || mListCount == 0)
             {
                 return false;
             }
-            int lineCount = this.mList.Count / this.mRowNumber;//寰楀嚭琛屾暟
-            int number = this.mList.Count % this.mRowNumber;
+            int lineCount = mListCount / this.mRowNumber;//寰楀嚭琛屾暟
+            int number = mListCount % this.mRowNumber;
             if (number != 0)
             {
                 if (index > lineCount * this.mRowNumber)
@@ -462,27 +611,6 @@
 
 
 
-        public List<string> GetNumberTextList()
-        {
-            return new List<string>
-            {
-                "1",
-                "2",
-                "3",
-                Language.StringByID(StringId.pindaojia),
-                "4",
-                "5",
-                "6",
-                Language.StringByID(StringId.pindaojian),
-                "7",
-                "8",
-                "9",
-                "-/--",
-                "",//杩欎釜鏄负浜嗗崰浣嶇疆
-                "0"
 
-            };
-
-        }
     }
 }

--
Gitblit v1.8.0