From b55fe675d1dd17748a29e4e7de60d14e36740a6e Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 14 十月 2023 13:01:30 +0800
Subject: [PATCH] 2023年10月14日13:01:27
---
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs | 11 +
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs | 17 +++
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs | 32 ++++--
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs | 56 +++++-----
HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs | 21 ++--
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 28 ++--
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs | 12 ++
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 10 +
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs | 24 +++-
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs | 28 +++--
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs | 17 +++
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs | 30 ++++-
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 8 +
15 files changed, 192 insertions(+), 104 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
index 77ae5fb..70fa9ff 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
@@ -158,6 +158,7 @@
btnName.TextColor = CSS_Color.FirstLevelTitleColor;
btnName.TextAlignment = TextAlignment.CenterLeft;
btnName.Text = i_device.name;
+ btnName.TextSize = CSS_FontSize.TextFontSize;
frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);
var btnCollection = new Button()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
index 1642d9c..4e23d82 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
@@ -11,6 +11,7 @@
using System.Linq;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using System.Reflection;
+using System.Collections;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
@@ -64,7 +65,7 @@
/// <summary>
/// 璁板綍褰撳墠璁惧
/// </summary>
- public IntType currnetIntType= IntType.none;
+ public IntType currnetIntType = IntType.none;
/// <summary>
/// 璁板綍褰撳墠閫夋嫨鐨勭储寮曞��
/// </summary>
@@ -191,6 +192,7 @@
{
this.remoteControlList = SendMethod.Current.GetRemoteControlLits(this.device.deviceId);
this.sequencerList = SendMethod.Current.GetSequencerLits(this.device.deviceId);
+ TestData(this.remoteControlList);
}
catch { }
finally
@@ -213,7 +215,7 @@
var type = (IntType)this.remoteControlList[this.indexValue].type;
this.SwitchUI(type);
}
-
+
}
});
@@ -324,11 +326,12 @@
var deviceTypeList = GetRemoteControlList();
///涔嬪墠鐨勭姸鎬佹枃鏈�
string ccurrnetDeviceStr = "";
- if (indexValue!=-1&& indexValue< deviceTypeList.Count) {
- ccurrnetDeviceStr= deviceTypeList[indexValue].name;
+ if (indexValue != -1 && indexValue < deviceTypeList.Count)
+ {
+ ccurrnetDeviceStr = deviceTypeList[indexValue].name;
}
PublicInterface conditionView = new PublicInterface();
- conditionView.SingleSelectionShow(this, deviceTypeList,"璁惧閫夋嫨", ccurrnetDeviceStr
+ conditionView.SingleSelectionShow(this, deviceTypeList, "璁惧閫夋嫨", ccurrnetDeviceStr
, (index) =>
{
var remoteControl = deviceTypeList[index];
@@ -339,7 +342,7 @@
});
}
-
+
public enum IntType
@@ -392,9 +395,9 @@
/// </summary>
/// <param name="type">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
/// <returns></returns>
- private bool isExistType(IntType type)
+ private bool isExistType(IntType type)
{
-
+
var remoteControls = this.GetRemoteControlList();
for (int i = 0; i < remoteControls.Count; i++)
{
@@ -410,5 +413,16 @@
}
+ private void TestData(List<RemoteControlEntity> list)
+ {
+ list.Add(new RemoteControlEntity { deviceId = "33331", rcId = "1", type = 1, name = "鎾斁鍣�" });
+ list.Add(new RemoteControlEntity { deviceId = "33332", rcId = "2", type = 2, name = "鍔熸斁" });
+ list.Add(new RemoteControlEntity { deviceId = "33333", rcId = "3", type = 3, name = "鐢佃" });
+ list.Add(new RemoteControlEntity { deviceId = "33334", rcId = "4", type = 4, name = "鏈洪《鐩�" });
+ list.Add(new RemoteControlEntity { deviceId = "33335", rcId = "5", type = 5, name = "鎶曞奖浠�" });
+ list.Add(new RemoteControlEntity { deviceId = "33336", rcId = "6", type = 6, name = "涓囪兘閬ユ帶鍣�" });
+ }
+
+
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs
index 505a6ef..375ce96 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs
@@ -7,8 +7,20 @@
public BaseFramLayout()
{
}
+ /// <summary>
+ /// 鏄惁鍙互鐐瑰嚮
+ /// </summary>
+ private bool mIsClick = true;
/// <summary>
+ /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
+ public void setClick(bool isClick)
+ {
+ this.mIsClick = isClick;
+ }
+ /// <summary>
/// 璋冩暣鐪熷疄楂樺害
/// </summary>
/// <param name="bottomSpace">搴曢儴楂樺害(闈炵湡瀹炲��)</param>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
index 038c9b5..8cf0576 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -14,6 +14,8 @@
public const int lineW = 1;
public const int cornerValue = 8;
+
+
public ButtonFramLayout(int width= widthFrameLayout, int height= heightFrameLayout)
{
this.Width = Application.GetRealWidth(width);
@@ -39,7 +41,7 @@
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
- Padding = new Padding(0, 10, 0, 10),
+ Padding = new Padding(0, 0, 0, 0),
Name = "btnName",
@@ -150,33 +152,33 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+
this.BackgroundColor = 0x00000000;
+ action?.Invoke(this, btnImage, btnName);
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnImage.Tag = this.Tag;
btnName.Tag = this.Tag;
-
this.MouseUpEventHandler += UpClick;
btnImage.MouseUpEventHandler += UpClick;
btnName.MouseUpEventHandler += UpClick;
-
- //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
- //{
- // this.BackgroundColor = 0x00000000;
- // //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- //};
- //this.MouseMoveEventHandler += MoveClick;
- //btnImage.MouseMoveEventHandler += MoveClick;
- //btnName.MouseMoveEventHandler += MoveClick;
+ EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
+ {
+ this.BackgroundColor = 0x00000000;
+ //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
+ };
+ this.MouseUpOutsideEventHandler += CancelClick;
+ btnImage.MouseUpOutsideEventHandler += CancelClick;
+ btnName.MouseUpOutsideEventHandler += CancelClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
-
+
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
- action?.Invoke(this, btnImage, btnName);
+
};
this.MouseDownEventHandler += DownClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index 8fda857..7a4446d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -131,7 +131,7 @@
buttonFram.Enable = false;
buttonFram.GetImageButton().Enable = false;
buttonFram.GetNameButton().Enable = false;
- buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
+ buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
}
buttonFram.SetClickListener((fl, btnIcon, btnName) =>
{
@@ -219,7 +219,7 @@
buttonFram.Enable = false;
buttonFram.GetImageButton().Enable = false;
buttonFram.GetNameButton().Enable = false;
- buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
+ buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
}
buttonFram.SetClickListener((fl, btnIcon, btnName) =>
{
@@ -252,7 +252,7 @@
}
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);
@@ -289,19 +289,27 @@
if (!keypad.isClicked)
{
button.Enable = false;
- button.BackgroundColor = AksCommonMethod.unBackgroundColor;
+ button.TextColor = AksCommonMethod.unBackgroundColor;
}
button.MouseDownEventHandler += (sen, e) =>
+ {
+
+ button.IsSelected = true;
+
+ };
+ button.MouseUpOutsideEventHandler += (sen, e) =>
+ {
+
+ button.IsSelected = true;
+
+ };
+ button.MouseUpEventHandler += (sen, e) =>
{
if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none")
{
return;
}
- button.IsSelected = true;
selectKeyAction?.Invoke((KeypadEntity)button.Tag);
- };
- button.MouseUpEventHandler += (sen, e) =>
- {
button.IsSelected = false;
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs
index a69b5e8..1bf713b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs
@@ -68,8 +68,8 @@
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
//this.BackgroundColor = 0x00000000;
-
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
+ action?.Invoke(this);
};
this.MouseUpEventHandler += UpClick;
btnImage.MouseUpEventHandler += UpClick;
@@ -77,20 +77,21 @@
btnName.MouseUpEventHandler += UpClick;
- //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
- //{
- // this.BackgroundColor = 0x00000000;
- // //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- //};
- //this.MouseMoveEventHandler += MoveClick;
- //btnImage.MouseMoveEventHandler += MoveClick;
- //btnName.MouseMoveEventHandler += MoveClick;
+ EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
+ {
+ //this.BackgroundColor = 0x00000000;
+ //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
+ };
+ this.MouseUpOutsideEventHandler += CancelClick;
+ btnImage.MouseUpOutsideEventHandler += CancelClick;
+ btnScore.MouseUpOutsideEventHandler += CancelClick;
+ btnName.MouseUpOutsideEventHandler += CancelClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
//this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
- action?.Invoke(this);
+
};
this.MouseUpEventHandler += DownClick;
btnImage.MouseUpEventHandler += DownClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
index 8b4b089..60900e6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
@@ -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,7 +94,7 @@
Button btnOkbj = new Button
{
- Gravity=Gravity.Center,
+ Gravity = Gravity.Center,
Width = Application.GetRealWidth(76),
Height = Application.GetRealWidth(76),
Radius = (uint)Application.GetRealWidth(38),
@@ -140,6 +140,10 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnTop.Name;
+ keypadEntity.keypad = "key_up";
+ action?.Invoke(keypadEntity);
btnTop.IsSelected = false;
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
@@ -151,10 +155,6 @@
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
btnTop.IsSelected = true;
- KeypadEntity keypadEntity = new KeypadEntity();
- keypadEntity.name = btnTop.Name;
- keypadEntity.keypad = "key_up";
- action?.Invoke(keypadEntity);
};
btnTop.MouseDownEventHandler += DownClick;
btnTopClick.MouseDownEventHandler += DownClick;
@@ -168,9 +168,11 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnBottom.Name;
+ keypadEntity.keypad = "key_down";
+ action?.Invoke(keypadEntity);
btnBottom.IsSelected = false;
-
-
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnBottom.MouseUpEventHandler += UpClick;
@@ -180,10 +182,7 @@
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
btnBottom.IsSelected = true;
- KeypadEntity keypadEntity = new KeypadEntity();
- keypadEntity.name = btnBottom.Name;
- keypadEntity.keypad = "key_down";
- action?.Invoke(keypadEntity);
+
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
};
btnBottom.MouseDownEventHandler += DownClick;
@@ -197,6 +196,10 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnLeft.Name;
+ keypadEntity.keypad = "key_left";
+ action?.Invoke(keypadEntity);
btnLeft.IsSelected = false;
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
@@ -207,10 +210,6 @@
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
btnLeft.IsSelected = true;
- KeypadEntity keypadEntity = new KeypadEntity();
- keypadEntity.name = btnLeft.Name;
- keypadEntity.keypad = "key_left";
- action?.Invoke(keypadEntity);
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
};
btnLeft.MouseDownEventHandler += DownClick;
@@ -225,6 +224,10 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnRight.Name;
+ keypadEntity.keypad = "key_right";
+ action?.Invoke(keypadEntity);
btnRight.IsSelected = false;
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
@@ -236,10 +239,7 @@
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
btnRight.IsSelected = true;
- KeypadEntity keypadEntity = new KeypadEntity();
- keypadEntity.name = btnRight.Name;
- keypadEntity.keypad = "key_right";
- action?.Invoke(keypadEntity);
+
};
btnRight.MouseDownEventHandler += DownClick;
btnRightClick.MouseDownEventHandler += DownClick;
@@ -255,6 +255,10 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnOk.Name;
+ keypadEntity.keypad = "key_ok";
+ action?.Invoke(keypadEntity);
btnOk.IsSelected = false;
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
@@ -264,10 +268,6 @@
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
btnOk.IsSelected = true;
- KeypadEntity keypadEntity = new KeypadEntity();
- keypadEntity.name = btnOk.Name;
- keypadEntity.keypad = "key_ok";
- action?.Invoke(keypadEntity);
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
};
btnOk.MouseDownEventHandler += DownClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
index c6104ec..9c3ddc1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
@@ -5,7 +5,19 @@
{
public class TypeMultiFramLayout
{
+ /// <summary>
+ /// 鏄惁鍙互鐐瑰嚮
+ /// </summary>
+ private bool mIsClick = true;
+ /// <summary>
+ /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
+ public void setClick(bool isClick)
+ {
+ this.mIsClick = isClick;
+ }
private uint UpBackgroundColor = MusicColor.ViewColor;
private uint DownBackgroundColor = AksCommonMethod.seleBackgroundColor;
@@ -164,8 +176,9 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ action?.Invoke(rightFramLayout);
//rightFramLayout.BackgroundColor = this.UpBackgroundColor;
-
+
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
rightFramLayout.MouseUpEventHandler += UpClick;
@@ -177,7 +190,7 @@
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
//rightFramLayout.BackgroundColor =AksCommonMethod.seleBackgroundColor;
- action?.Invoke(rightFramLayout);
+
};
rightFramLayout.MouseDownEventHandler += DownClick;
btnBottonRightImage.MouseDownEventHandler += DownClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs
index ee5e6ac..cc9cd29 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs
@@ -6,7 +6,19 @@
{
public class TypeSingleFramLayout
{
+ /// <summary>
+ /// 鏄惁鍙互鐐瑰嚮
+ /// </summary>
+ private bool mIsClick = true;
+ /// <summary>
+ /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
+ public void setClick(bool isClick)
+ {
+ this.mIsClick = isClick;
+ }
private uint UpBackgroundColor = MusicColor.ViewColor;
private uint DownBackgroundColor = AksCommonMethod.seleBackgroundColor;
/// <summary>
@@ -88,8 +100,9 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ action?.Invoke(singleFramLayout);
//singleFramLayout.BackgroundColor = this.UpBackgroundColor;
-
+
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
singleFramLayout.MouseUpEventHandler += UpClick;
@@ -101,7 +114,7 @@
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
//singleFramLayout.BackgroundColor = this.DownBackgroundColor;
- action?.Invoke(singleFramLayout);
+
};
singleFramLayout.MouseDownEventHandler += DownClick;
btnLeftImage.MouseDownEventHandler += DownClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
index 5f17c9e..2ca711c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
@@ -5,7 +5,19 @@
{
public class VerticalBoutonFLayout:BaseFramLayout
{
+ /// <summary>
+ /// 鏄惁鍙互鐐瑰嚮
+ /// </summary>
+ private bool mIsClick = true;
+ /// <summary>
+ /// 璁剧疆鎺у埗鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="isClick">false鐐瑰嚮鏃犳晥</param>
+ public void setClick(bool isClick)
+ {
+ this.mIsClick = isClick;
+ }
public const int widthFrameLayout = 80;
public const int heightFrameLayout = 140-15;
public const int cornerValue = 12;
@@ -133,30 +145,30 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
+ action?.Invoke(OFFFLayout, OFFButton);
OFFFLayout.BackgroundColor = MusicColor.WhiteColor;
OFFButton.TextColor = 0xFFA5AEBC;
-
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
OFFFLayout.MouseUpEventHandler += UpClick;
OFFButton.MouseUpEventHandler += UpClick;
- //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
- //{
- // this.BackgroundColor = 0x00000000;
- // //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
- //};
- //this.MouseMoveEventHandler += MoveClick;
- //btnImage.MouseMoveEventHandler += MoveClick;
- //btnName.MouseMoveEventHandler += MoveClick;
+ EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
+ {
+ OFFFLayout.BackgroundColor = MusicColor.WhiteColor;
+ OFFButton.TextColor = 0xFFA5AEBC;
+ //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
+ };
+ OFFFLayout.MouseUpOutsideEventHandler += CancelClick;
+ OFFButton.MouseUpOutsideEventHandler += CancelClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
OFFFLayout.BackgroundColor = MusicColor.MusicTxet14SelectedColor;
OFFButton.TextColor = MusicColor.WhiteColor;
- action?.Invoke(OFFFLayout, OFFButton);
+
};
OFFFLayout.MouseDownEventHandler += DownClick;
OFFButton.MouseDownEventHandler += DownClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index a0aa7e9..11bb451 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -177,6 +177,7 @@
TextSize = TextSize.Text16,
TextID = StringId.pindao,
Padding = new Padding(0, 0, 0, 0),
+ IsBold = true,
};
leftLayout.AddChidren(leftBtnTitle);
@@ -220,6 +221,7 @@
TextSize = TextSize.Text16,
TextID = StringId.kongzhi,
Padding = new Padding(0, 0, 0, 0),
+ IsBold=true,
};
rightLayout.AddChidren(rightBtnTitle);
@@ -248,9 +250,9 @@
//鏁板瓧鎸夐敭瀹瑰櫒
- numberFrame = new CornerFramLayout(343, 368, 17);
+ numberFrame = new CornerFramLayout(343, 368-24, 17);
numberFrame.X = Application.GetRealWidth(16);
- numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
+ numberFrame.Y = middLayout.Bottom;
numberFrame.BackgroundColor = MusicColor.WhiteColor;
numberFrame.SetMargin(16, 0, 16, 0);
numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
@@ -260,7 +262,7 @@
//鑿滃崟瀹瑰櫒
CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
cornerBottomFram.X = Application.GetRealWidth(16);
- cornerBottomFram.Y = middLayout.Bottom + Application.GetRealHeight(16);
+ cornerBottomFram.Y = middLayout.Bottom;
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
this.AddChidren(cornerBottomFram);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
index fe4a21d..c3c0b36 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
@@ -119,6 +119,7 @@
remoteControl.deviceId = deviceId;
}
}
+
return list;
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
index 4015f81..2662f4d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
@@ -47,6 +47,13 @@
public SxqPage(List<SequencerEntity> sequencerList, string deviceId)
{
this.sequencerList = sequencerList;
+ for (int i = 0; i < 12; i++) {
+ this.sequencerList.Add(new SequencerEntity {seqId=i.ToString(),name=i.ToString(),type=1 });
+ }
+ for (int i = 0; i < 4; i++)
+ {
+ this.sequencerList.Add(new SequencerEntity { seqId = i.ToString(), name = i.ToString(), type = 2 });
+ }
this.deviceId = deviceId;
}
public void Show()
@@ -97,7 +104,7 @@
VerticalBoutonFLayout buttonFram = new VerticalBoutonFLayout();
buttonFram.AddView(fLayout);
buttonFram.Tag = sequencer;
- buttonFram.Y = Application.GetRealWidth(16) + Application.GetRealHeight((VerticalBoutonFLayout.heightFrameLayout + 16) * line);
+ buttonFram.Y = Application.GetRealWidth(16) + Application.GetRealHeight((VerticalBoutonFLayout.heightFrameLayout + 8) * line);
buttonFram.X = Application.GetRealWidth(16) + Application.GetRealWidth((VerticalBoutonFLayout.widthFrameLayout + 8) * xCount);
buttonFram.btnName.Text = sequencer.name;
xCount++;
@@ -127,7 +134,7 @@
}
- fLayout.AdjustRealHeight(16);
+ fLayout.AdjustRealHeight(8);
var list2 = this.sequencerList.FindAll((o) => o.type == 2);
for (int i = 0; i < list2.Count; i++)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 05b3f49..566d607 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -181,6 +181,7 @@
TextSize = TextSize.Text16,
TextID = StringId.pindao,
Padding = new Padding(0, 0, 0, 0),
+ IsBold = true,
};
leftLayout.AddChidren(leftBtnTitle);
@@ -224,6 +225,7 @@
TextSize = TextSize.Text16,
TextID = StringId.kongzhi,
Padding = new Padding(0, 0, 0, 0),
+ IsBold = true,
};
rightLayout.AddChidren(rightBtnTitle);
@@ -250,11 +252,11 @@
#endregion
-
+
//鏁板瓧鎸夐敭瀹瑰櫒
- numberFrame = new CornerFramLayout(343, 368, 17);
+ numberFrame = new CornerFramLayout(343, 368-24, 17);
numberFrame.X = Application.GetRealWidth(16);
- numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
+ numberFrame.Y = middLayout.Bottom;
numberFrame.BackgroundColor = MusicColor.WhiteColor;
numberFrame.SetMargin(16,0,16,0);
numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
@@ -264,7 +266,7 @@
//鑿滃崟瀹瑰櫒
CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
cornerBottomFram.X = Application.GetRealWidth(16);
- cornerBottomFram.Y = middLayout.Bottom + Application.GetRealHeight(16);
+ cornerBottomFram.Y = middLayout.Bottom;
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
this.AddChidren(cornerBottomFram);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index f8242be..55b3559 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -397,7 +397,7 @@
{
Y = btnTitle.Bottom + Application.GetRealHeight(16),
Width = Application.GetRealWidth(240),
- Height = Application.GetRealHeight(1095),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+ Height = Application.GetRealHeight(1095-122),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
Radius = (uint)Application.GetRealHeight(17),
BackgroundColor = 0xff798394,
Gravity = Gravity.CenterHorizontal,
@@ -410,7 +410,7 @@
Y = btnTitle.Bottom + Application.GetRealHeight(16),
//X = Application.GetRealWidth(71),
Width = Application.GetRealWidth(232),
- Height = Application.GetRealHeight(1095),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+ Height = Application.GetRealHeight(1095-122),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
Radius = (uint)Application.GetRealHeight(17),
BackgroundColor = 0xff19181E,
Gravity = Gravity.CenterHorizontal,
@@ -445,7 +445,7 @@
switchBtn.IsSelected = false;
};
- int h = 49;
+ int h = 49-6;
int offset = 28;//x杞村亸绉婚噺
int septal = 36;//闂撮殧
#region
@@ -481,7 +481,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 +521,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 +554,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 +696,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 +741,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),
@@ -781,7 +781,7 @@
btnPindaojia = new Button
{
- Y = Application.GetRealHeight(32),
+ Y = Application.GetRealHeight(16),
X = Application.GetRealWidth(170),
Width = Application.GetRealWidth(36),
Height = Application.GetRealWidth(36),
@@ -814,7 +814,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",
@@ -939,7 +939,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 +983,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 +1031,7 @@
var line12Fl = new FrameLayout
{
- Y = line11Fl.Bottom + Application.GetRealHeight(16),
+ Y = line11Fl.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(h),
};
layout.AddChidren(line12Fl);
--
Gitblit v1.8.0