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/CommonView/MenuFramLayout.cs | 103 +++++++++++++--------------------------------------
1 files changed, 27 insertions(+), 76 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
index c599ae8..50de22b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
@@ -14,7 +14,7 @@
{
this.Width = Application.GetRealWidth(width);
this.Height = Application.GetRealWidth(height);
- this.Radius = (uint)Application.GetRealHeight(cornerValue);
+ this.Radius = (uint)Application.GetRealWidth(cornerValue);
this.BackgroundColor = MusicColor.ViewColor;
this.Gravity = Gravity.CenterHorizontal;
}
@@ -22,8 +22,8 @@
{
Y = Application.GetRealWidth(16),
X = Application.GetRealWidth(78),
- Width = Application.GetRealWidth(24),
- Height = Application.GetRealHeight(20),
+ Width = Application.GetRealWidth(24),//楂樺害鍜屽楂樹笉涓�鏍�,浠ュ搴︿负缁村害璁＄畻,鍚﹀垯鍙樺舰
+ Height = Application.GetRealWidth(20),
UnSelectedImagePath = "AksIcon/shang.png",
SelectedImagePath = "AksIcon/shang_selected.png",
Name = "涓�",
@@ -40,7 +40,7 @@
Y = Application.GetRealWidth(144),
X = Application.GetRealWidth(78),
Width = Application.GetRealWidth(24),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealWidth(20),
UnSelectedImagePath = "AksIcon/xia.png",
SelectedImagePath = "AksIcon/xia_selected.png",
Name = "涓�",
@@ -57,7 +57,7 @@
Y = Application.GetRealWidth(78),
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(20),
- Height = Application.GetRealHeight(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "AksIcon/zuo.png",
SelectedImagePath = "AksIcon/zuo_selected.png",
Name = "宸�",
@@ -76,7 +76,7 @@
Y = Application.GetRealWidth(78),
X = Application.GetRealWidth(144),
Width = Application.GetRealWidth(20),
- Height = Application.GetRealHeight(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "AksIcon/you.png",
SelectedImagePath = "AksIcon/you_selected.png",
Name = "鍙�",
@@ -94,10 +94,10 @@
Button btnOkbj = new Button
{
- Gravity=Gravity.Center,
+ Gravity = Gravity.Center,
Width = Application.GetRealWidth(76),
Height = Application.GetRealWidth(76),
- Radius = (uint)Application.GetRealHeight(38),
+ Radius = (uint)Application.GetRealWidth(38),
BackgroundColor = MusicColor.WhiteColor,
@@ -107,7 +107,7 @@
Gravity = Gravity.Center,
Width = Application.GetRealWidth(28),
Height = Application.GetRealWidth(28),
- Radius = (uint)Application.GetRealHeight(14),
+ Radius = (uint)Application.GetRealWidth(14),
BackgroundColor = 0xff1B2D4D,
SelectedBackgroundColor = MusicColor.SelectedColor,
Name = "纭畾"
@@ -140,24 +140,15 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- btnTop.IsSelected = false;
- //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- };
- btnTop.MouseUpEventHandler += UpClick;
- btnTopClick.MouseUpEventHandler += UpClick;
-
-
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
- //鎸変笅鍘绘敼鍙樿儗鏅鑹�
- btnTop.IsSelected = true;
KeypadEntity keypadEntity = new KeypadEntity();
keypadEntity.name = btnTop.Name;
keypadEntity.keypad = "key_up";
action?.Invoke(keypadEntity);
+ SetButtonIsSelected(btnTop);
};
- btnTop.MouseDownEventHandler += DownClick;
- btnTopClick.MouseDownEventHandler += DownClick;
+ btnTop.MouseUpEventHandler += UpClick;
+ btnTopClick.MouseUpEventHandler += UpClick;
+
}
/// <summary>
@@ -168,26 +159,15 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- btnBottom.IsSelected = false;
-
-
- //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- };
- btnBottom.MouseUpEventHandler += UpClick;
- btnBottomClick.MouseUpEventHandler += UpClick;
-
-
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
- btnBottom.IsSelected = true;
KeypadEntity keypadEntity = new KeypadEntity();
keypadEntity.name = btnBottom.Name;
keypadEntity.keypad = "key_down";
action?.Invoke(keypadEntity);
- //鎸変笅鍘绘敼鍙樿儗鏅鑹�
+ SetButtonIsSelected(btnBottom);
};
- btnBottom.MouseDownEventHandler += DownClick;
- btnBottomClick.MouseDownEventHandler += DownClick;
+ btnBottom.MouseUpEventHandler += UpClick;
+ btnBottomClick.MouseUpEventHandler += UpClick;
+
}
/// <summary>
/// 宸�
@@ -197,24 +177,14 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- btnLeft.IsSelected = false;
- //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- };
- btnLeft.MouseUpEventHandler += UpClick;
- btnLeftClick.MouseUpEventHandler += UpClick;
-
-
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
- btnLeft.IsSelected = true;
KeypadEntity keypadEntity = new KeypadEntity();
keypadEntity.name = btnLeft.Name;
keypadEntity.keypad = "key_left";
action?.Invoke(keypadEntity);
- //鎸変笅鍘绘敼鍙樿儗鏅鑹�
+ SetButtonIsSelected(btnLeft);
};
- btnLeft.MouseDownEventHandler += DownClick;
- btnLeftClick.MouseDownEventHandler += DownClick;
+ btnLeft.MouseUpEventHandler += UpClick;
+ btnLeftClick.MouseUpEventHandler += UpClick;
}
/// <summary>
@@ -225,27 +195,16 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- btnRight.IsSelected = false;
- //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- };
- btnRight.MouseUpEventHandler += UpClick;
- btnRightClick.MouseUpEventHandler += UpClick;
-
-
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
- //鎸変笅鍘绘敼鍙樿儗鏅鑹�
- btnRight.IsSelected = true;
KeypadEntity keypadEntity = new KeypadEntity();
keypadEntity.name = btnRight.Name;
keypadEntity.keypad = "key_right";
action?.Invoke(keypadEntity);
+ SetButtonIsSelected(btnRight);
};
- btnRight.MouseDownEventHandler += DownClick;
- btnRightClick.MouseDownEventHandler += DownClick;
+ btnRight.MouseUpEventHandler += UpClick;
+ btnRightClick.MouseUpEventHandler += UpClick;
+
}
-
-
/// <summary>
/// ok
@@ -255,22 +214,14 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- btnOk.IsSelected = false;
- //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- };
- btnOk.MouseUpEventHandler += UpClick;
-
-
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
- btnOk.IsSelected = true;
KeypadEntity keypadEntity = new KeypadEntity();
keypadEntity.name = btnOk.Name;
keypadEntity.keypad = "key_ok";
action?.Invoke(keypadEntity);
- //鎸変笅鍘绘敼鍙樿儗鏅鑹�
+ SetButtonIsSelected(btnOk);
};
- btnOk.MouseDownEventHandler += DownClick;
+ btnOk.MouseUpEventHandler += UpClick;
+
}
}
--
Gitblit v1.8.0