From 5ec581e5d37b108fc9d59e89afd8e94e21b32080 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 17 十月 2023 17:33:36 +0800
Subject: [PATCH] 2023年10月17日17:33:33
---
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 268 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 193 insertions(+), 75 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 270b1e6..5dcca72 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -36,6 +36,7 @@
/// 鍒囨崲璁惧瀹瑰櫒
/// </summary>
TypeMultiFramLayout typeMultiFramLayout;
+ TypeSingleFramLayout tyySingleFramLayout;
Button switchBtn;
CustomFrameLayout xinxiFL;
@@ -105,9 +106,9 @@
private void EventListener()
{
//寮�鍏�
- switchBtn.MouseDownEventHandler += (senser, e) =>
+ switchBtn.MouseUpEventHandler += (senser, e) =>
{
- switchBtn.IsSelected = true;
+ switchBtn.IsSelected = false;
KeyControl("on_off", "寮�/鍏�");
};
//淇℃伅
@@ -153,7 +154,7 @@
//1
number1FL.SetClickListener(() =>
{
- KeyControl("number_1", "1");
+ KeyControl("number_1", "1");
});
//2
number2FL.SetClickListener(() =>
@@ -236,16 +237,16 @@
});
//宸�
- btnLeft.MouseDownEventHandler += (sender, e) =>
+ btnLeft.MouseUpEventHandler += (sender, e) =>
{
- okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
+ okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
KeyControl("key_left", "宸�");
};
//涓�
- btnShang.MouseDownEventHandler += (sender, e) =>
+ btnShang.MouseUpEventHandler += (sender, e) =>
{
- okFl.BackgroundImagePath = "AksIcon/ykq_shang_selected.png";
+ okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
KeyControl("key_up", "涓�");
};
@@ -253,41 +254,48 @@
//鍙�
btnRight.MouseDownEventHandler += (sender, e) =>
{
- okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
+
+ okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
KeyControl("key_right", "鍙�");
};
//涓�
- btnXia.MouseDownEventHandler += (sender, e) =>
+ btnXia.MouseUpEventHandler += (sender, e) =>
{
- okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";
+ okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
+
KeyControl("key_down", "涓�");
};
//OK
btnOk.MouseDownEventHandler += (sender, e) =>
{
- okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
+ okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
+
KeyControl("key_ok", "纭畾");
};
//闊抽噺+
- btnYingliangjia.MouseDownEventHandler += (sen, e) => {
- btnYingliangjia.IsSelected = true;
+ btnYingliangjia.MouseUpEventHandler += (sen, e) =>
+ {
+ btnYingliangjia.IsSelected = false;
KeyControl("volume_up", "闊抽噺+");
};
//闊抽噺-
- btnYingliangjian.MouseDownEventHandler += (sen, e) => {
- btnYingliangjian.IsSelected = true;
+ btnYingliangjian.MouseUpEventHandler += (sen, e) =>
+ {
+ btnYingliangjian.IsSelected = false;
KeyControl("volume_down", "闊抽噺-");
};
//棰戦亾+
- btnPindaojia.MouseDownEventHandler += (sen, e) => {
- btnPindaojia.IsSelected = true;
+ btnPindaojia.MouseUpEventHandler += (sen, e) =>
+ {
+ btnPindaojia.IsSelected = false;
KeyControl("ch_up", "棰戦亾+");
};
//棰戦亾-
- btnPindaojian.MouseDownEventHandler += (sen, e) => {
- btnPindaojian.IsSelected = true;
+ btnPindaojian.MouseUpEventHandler += (sen, e) =>
+ {
+ btnPindaojian.IsSelected = false;
KeyControl("ch_down", "棰戦亾-");
};
@@ -354,22 +362,30 @@
});
-
- //鏃跺簭鍣�
- 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>
@@ -387,7 +403,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- Text= this.remoteControl.name,
+ Text = this.remoteControl.name,
IsBold = true,
};
this.AddChidren(btnTitle);
@@ -397,7 +413,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,
@@ -410,7 +426,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,
@@ -426,26 +442,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"
+ SelectedImagePath = "AksIcon/ykq_kaiguang_selected.png"
};
switchFl.AddChidren(switchBtn);
- switchBtn.MouseUpEventHandler += (senser, e) =>
+ 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
@@ -481,7 +501,7 @@
var line2Fl = new FrameLayout
{
- Y = line1Fl.Bottom + Application.GetRealHeight(16),
+ Y = line1Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line2Fl);
@@ -521,7 +541,7 @@
var line3Fl = new FrameLayout
{
- Y = line2Fl.Bottom + Application.GetRealHeight(16),
+ Y = line2Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line3Fl);
@@ -554,7 +574,7 @@
var line4Fl = new FrameLayout
{
- Y = line3Fl.Bottom + Application.GetRealHeight(16),
+ Y = line3Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line4Fl);
@@ -696,7 +716,7 @@
var line8Fl = new FrameLayout
{
- Y = line7Fl.Bottom + Application.GetRealHeight(32),
+ Y = line7Fl.Bottom + Application.GetRealHeight(16),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line8Fl);
@@ -741,14 +761,14 @@
var baseFl = new BaseFramLayout
{
Y = line8Fl.Bottom,
- Height = Application.GetRealHeight(207),
+ Height = Application.GetRealHeight(207 - 32 - 12),
};
layout.AddChidren(baseFl);
btnYingliangjia = new Button
{
- Y = Application.GetRealHeight(32),
+ Y = Application.GetRealHeight(16),
X = Application.GetRealWidth(26),
Width = Application.GetRealWidth(36),
Height = Application.GetRealWidth(36),
@@ -756,7 +776,12 @@
SelectedImagePath = "AksIcon/ykq_yingliangjia_selected.png",
};
baseFl.AddChidren(btnYingliangjia);
- btnYingliangjia.MouseUpEventHandler += (sen,e) => {
+ btnYingliangjia.MouseDownEventHandler += (sen, e) =>
+ {
+ btnYingliangjia.IsSelected = true;
+ };
+ btnYingliangjia.MouseUpOutsideEventHandler += (sen, e) =>
+ {
btnYingliangjia.IsSelected = false;
};
@@ -772,16 +797,22 @@
SelectedImagePath = "AksIcon/ykq_yingliangjian_selected.png",
};
baseFl.AddChidren(btnYingliangjian);
- btnYingliangjian.MouseUpEventHandler += (sen, e) => {
+ btnYingliangjian.MouseDownEventHandler += (sen, e) =>
+ {
+
+ btnYingliangjian.IsSelected = true;
+ };
+ btnYingliangjian.MouseUpOutsideEventHandler += (sen, e) =>
+ {
btnYingliangjian.IsSelected = false;
};
- btnPindaojia = 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),
@@ -789,7 +820,13 @@
SelectedImagePath = "AksIcon/ykq_pindaojia_selected.png",
};
baseFl.AddChidren(btnPindaojia);
- btnPindaojia.MouseUpEventHandler += (sen, e) => {
+ btnPindaojia.MouseDownEventHandler += (sen, e) =>
+ {
+
+ btnPindaojia.IsSelected = true;
+ };
+ btnPindaojia.MouseUpOutsideEventHandler += (sen, e) =>
+ {
btnPindaojia.IsSelected = false;
};
@@ -805,7 +842,14 @@
SelectedImagePath = "AksIcon/ykq_pindaojian_selected.png",
};
baseFl.AddChidren(btnPindaojian);
- btnPindaojian.MouseUpEventHandler += (sen, e) => {
+ btnPindaojian.MouseDownEventHandler += (sen, e) =>
+ {
+
+ btnPindaojian.IsSelected = true;
+ };
+
+ btnPindaojian.MouseUpOutsideEventHandler += (sen, e) =>
+ {
btnPindaojian.IsSelected = false;
};
@@ -814,7 +858,7 @@
okFl = new FrameLayout
{
- Y = Application.GetRealHeight(32),
+ Y = Application.GetRealHeight(16),
Height = Application.GetRealWidth(143),
Width = Application.GetRealWidth(143),
BackgroundImagePath = "AksIcon/ykq_ok.png",
@@ -873,27 +917,57 @@
- btnLeft.MouseUpEventHandler += (sender, e) =>
+
+
+ btnLeft.MouseUpOutsideEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
};
- btnShang.MouseUpEventHandler += (sender, e) =>
+ btnLeft.MouseDownEventHandler += (sender, e) =>
+ {
+ okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
+
+ };
+ btnShang.MouseDownEventHandler += (sender, e) =>
+ {
+ okFl.BackgroundImagePath = "AksIcon/ykq_shang_selected.png";
+
+
+ };
+ btnShang.MouseUpOutsideEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
};
- btnRight.MouseUpEventHandler += (sender, e) =>
+ btnRight.MouseDownEventHandler += (sender, e) =>
+ {
+ okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
+
+ };
+ btnRight.MouseUpOutsideEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
};
- btnXia.MouseUpEventHandler += (sender, e) =>
+
+ btnXia.MouseDownEventHandler += (sender, e) =>
+ {
+ okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";
+
+ };
+
+ btnXia.MouseUpOutsideEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
};
- btnOk.MouseUpEventHandler += (sender, e) =>
+ btnOk.MouseDownEventHandler += (sender, e) =>
+ {
+ okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
+
+ };
+ btnOk.MouseUpOutsideEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
@@ -939,7 +1013,7 @@
var line10Fl = new FrameLayout
{
- Y = line9Fl.Bottom + Application.GetRealHeight(16),
+ Y = line9Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line10Fl);
@@ -983,7 +1057,7 @@
var line11Fl = new FrameLayout
{
- Y = line10Fl.Bottom + Application.GetRealHeight(16),
+ Y = line10Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line11Fl);
@@ -1031,7 +1105,7 @@
var line12Fl = new FrameLayout
{
- Y = line11Fl.Bottom + Application.GetRealHeight(16),
+ Y = line11Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line12Fl);
@@ -1043,7 +1117,7 @@
dengguanFL.AddTextButtonView();
dengguanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dengguan.png";
dengguanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dengguang_selected.png";
- dengguanFL.GetTextButton().Text = "鐏叧";
+ dengguanFL.GetTextButton().Text = "鐏厜1";
dengguanFL.AddClickView();
@@ -1066,7 +1140,7 @@
dankongdengFL.AddTextButtonView();
dankongdengFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dankongdeng.png";
dankongdengFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dankongdeng_selected.png";
- dankongdengFL.GetTextButton().Text = "鍗曟帶鐏�";
+ dankongdengFL.GetTextButton().Text = "鐏厜2";
dankongdengFL.AddClickView();
#endregion
@@ -1081,10 +1155,42 @@
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
this.AddChidren(cornerBottomFram);
- typeMultiFramLayout = new TypeMultiFramLayout();
- typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
- typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+
+ 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;
+
+ if (tyySingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48))
+ {
+ tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101 - 48) + tyySingleFramLayout.btnName.GetTextWidth();
+ tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226 + 48) - tyySingleFramLayout.btnName.GetTextWidth();
+ tyySingleFramLayout.btnName.Width = tyySingleFramLayout.btnName.GetTextWidth();
+ tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
+ }
+
+ }
+ else
+ {
+
+ typeMultiFramLayout = new TypeMultiFramLayout();
+ typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
+ typeMultiFramLayout.AddView(cornerBottomFram);
+ typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
+ }
this.AdjustRealHeight(16);
}
@@ -1094,14 +1200,15 @@
/// </summary>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
- private void KeyControl(string keypad, string keyName)
+
+ 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);
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
}
catch { }
finally
@@ -1123,7 +1230,7 @@
class CustomFrameLayout : FrameLayout
{
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);
@@ -1145,6 +1252,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
+ Padding = new Padding(0, 0, 0, 0),
};
Button btnNumber = new Button
{
@@ -1162,9 +1270,9 @@
Width = Application.GetRealWidth(12),
Height = Application.GetRealWidth(12),
Gravity = Gravity.Center,
- Radius = (uint)Application.GetRealHeight(6),
- BackgroundColor=0x00000000,
- SelectedBackgroundColor = 0xFFEFEFEF,
+ Radius = (uint)Application.GetRealWidth(6),
+ BackgroundColor = 0x00000000,
+ SelectedBackgroundColor = 0xFFF2F3F7,
};
public FrameLayout clickFl = new FrameLayout
@@ -1232,7 +1340,7 @@
btnNumber.IsSelected = true;
btn.IsSelected = true;
- action?.Invoke();
+
};
clickFl.MouseUpEventHandler += (sender, e) =>
@@ -1242,6 +1350,16 @@
btnText.IsSelected = false;
btnNumber.IsSelected = false;
btn.IsSelected = false;
+ action?.Invoke();
+ };
+
+ clickFl.MouseUpOutsideEventHandler += (sender, e) =>
+ {
+ //this.BackgroundColor = 0x00000000;
+ btnImage.IsSelected = false;
+ btnText.IsSelected = false;
+ btnNumber.IsSelected = false;
+ btn.IsSelected = false;
};
}
--
Gitblit v1.8.0