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 | 124 ++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index 2c20418..6595c4d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+
namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
{
/// <summary>
@@ -15,6 +16,8 @@
private int leftMargin;
private int bottomMargin;
private int rightMargin;
+ private int mWidth;
+ private int mHeight;
/// <summary>
/// 涓�琛屽嚑涓厓绱�
/// </summary>
@@ -45,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;
}
@@ -70,7 +75,7 @@
/// </summary>
public List<KeypadEntity> GetTestList()
{
- return AksCommonMethod.Current.GetTYYKeypadList();
+ return AksCommonMethod.Current.GetTYYKeypadList(null);
}
/// <summary>
@@ -78,7 +83,7 @@
/// </summary>
/// <param name="mList">鍒楄〃</param>
/// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
- /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
+ /// <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)
@@ -121,12 +126,21 @@
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&& buttonFram.Tag is KeypadEntity)
+ if (buttonFram.Tag == null)
{
- selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
+ return;
}
+ selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
});
//if (defaultIndex != -1 && defaultIndex == i)
@@ -146,7 +160,7 @@
/// </summary>
/// <param name="mList">鍒楄〃</param>
/// <param name="list"> 鍒楄〃涓储寮�,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�,娌℃湁榛樿(new List<int>)</param>
- /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</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)
@@ -201,13 +215,21 @@
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&& buttonFram.Tag is KeypadEntity)
+ if (buttonFram.Tag == null)
{
- selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
+ return;
}
+ selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
+
});
//if (defaultIndex != -1 && defaultIndex == i)
@@ -224,7 +246,7 @@
///鍔ㄦ�佸姞杞芥暟瀛楁寜閿晫闈�
/// </summary>
/// <param name="mList">鍒楄〃</param>
- /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
+ /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
public void LoadNumberButtonPage(List<KeypadEntity> mList)
{
if (mList == null || mList.Count == 0)
@@ -233,12 +255,12 @@
}
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 = 0; i <mList.Count; i++)
+ for (int i = 0; i < mList.Count; i++)
{
var keypad = mList[i];
Button button = new Button
@@ -254,7 +276,9 @@
IsBold = true,
Tag = keypad,
BackgroundColor = MusicColor.WhiteColor,
- SelectedBackgroundColor = 0xff454635,
+ SelectedBackgroundColor = 0xFFF2F3F7,
+ Radius = (uint)Application.GetRealHeight(8),
+ SelectedTextColor = MusicColor.TextColor,
};
this.AddChidren(button);
@@ -264,18 +288,22 @@
currnetheightValue += heightMaxValue;
currnetWidthValue = 0;
}
- button.MouseDownEventHandler += (sen, e) =>
+ //涓嶆敮鎸佹寜閿偣鍑昏儗鏅鑹�
+ if (!keypad.isClicked)
{
- if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none")
+ button.TextColor =unBackgroundColor;
+
+ }
+
+
+ button.MouseUpEventHandler += (sen, e) =>
+ {
+ if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none"|| !((KeypadEntity)button.Tag).isClicked)
{
return;
}
- button.IsSelected = true;
selectKeyAction?.Invoke((KeypadEntity)button.Tag);
- };
- button.MouseUpEventHandler += (sen, e) =>
- {
- button.IsSelected = false;
+ SetButtonIsSelected(button);
};
//if (defaultIndex != -1 && defaultIndex == i)
@@ -290,7 +318,7 @@
/// 褰辩墖甯冨眬
/// </summary>
/// <param name="mList">鍒楄〃</param>
- /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
+ /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
public void LoadImagePage(List<MovieLibrary> mList)
{
if (mList == null || mList.Count == 0)
@@ -340,7 +368,7 @@
/// 褰辩墖甯冨眬
/// </summary>
/// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
- /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
+ /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
public void LoadImagePage(List<MovieLibrary> mList, int mRowNumber)
{
if (mList == null || mList.Count == 0)
@@ -388,11 +416,63 @@
}
}
+
+ 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="mList">鍒楄〃</param>
+ public void LoadImagePage(List<ImageFramlayout> imageFramlayoutList)
+ {
+
+ 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>
+ /// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],鍊艰秴鍑鸿寖鍥磋涓烘棤鏁�</param>
public void LoadHorizontalPage(List<FilterCategoryEntity> mList, int defaultIndex = -1)
{
if (mList == null || mList.Count == 0)
--
Gitblit v1.8.0