From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 153 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 113 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index 7d8ca90..a635f30 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -49,6 +50,8 @@
/// </summary>
TypeMultiFramLayout typeMultiFramLayout;
+ TypeSingleFramLayout jdhSingleFramLayout;
+
public void Show()
{
@@ -71,56 +74,67 @@
private void EventListener()
{
//鍔熻兘閿帶鍒�
- cornerTopFram.selectAction += (value) =>
+ cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鏁板瓧閿帶鍒�
- numberFrame.selectAction += (s) =>
+ numberFrame.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("鎵撳嵃====" + s);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鑿滃崟涓婃寜閿�
- menuFram.SetTopClickListener((b) =>
+ menuFram.SetTopClickListener((keypadEntity) =>
{
-
- Console.WriteLine("5");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟涓嬫寜閿�
- menuFram.SetBottomClickListener((b) =>
+ menuFram.SetBottomClickListener((keypadEntity) =>
{
- Console.WriteLine("6");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟宸︽寜閿�
- menuFram.SetLeftClickListener((b) =>
+ menuFram.SetLeftClickListener((keypadEntity) =>
{
- Console.WriteLine("7");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟鍙虫寜閿�
- menuFram.SetRightClickListener((b) =>
+ menuFram.SetRightClickListener((keypadEntity) =>
{
- Console.WriteLine("8");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟ok鎸夐敭
- menuFram.SetOkClickListener((b) =>
+ menuFram.SetOkClickListener((keypadEntity) =>
{
- Console.WriteLine("9");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
- //鏃跺簭鍣�
- 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) =>
+ if (jdhSingleFramLayout != null)
{
- Console.WriteLine("4");
- action?.Invoke(IntType.STB);
- });
+
+ //璁惧鍒囨崲
+ jdhSingleFramLayout.SetClickListener((f) =>
+ {
+ action?.Invoke(IntType.STB);
+ });
+ }
+ if (typeMultiFramLayout != null)
+ {
+ //鏃跺簭鍣�
+ 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) =>
+ {
+ action?.Invoke(IntType.STB);
+ });
+ }
}
@@ -136,16 +150,17 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.jidinghe,
+ Text= this.remoteControl.name,
+ IsBold = true,
};
this.AddChidren(btnTitle);
- cornerTopFram = new CornerFramLayout(343, 452, 17);
+ cornerTopFram = new CornerFramLayout(343, 368-24, 17);
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
cornerTopFram.SetMargin(16, 0, 16, 0);
- cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 5, 6 });
+ cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetJdhKeypadList(this.remoteControl),new List<int> { 5, 6 });
#region ----棰戦亾 鎺у埗----
FrameLayout middLayout = new FrameLayout
@@ -175,6 +190,8 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.pindao,
+ Padding = new Padding(0, 0, 0, 0),
+ IsBold = true,
};
leftLayout.AddChidren(leftBtnTitle);
@@ -217,6 +234,8 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.kongzhi,
+ Padding = new Padding(0, 0, 0, 0),
+ IsBold=true,
};
rightLayout.AddChidren(rightBtnTitle);
@@ -245,19 +264,19 @@
//鏁板瓧鎸夐敭瀹瑰櫒
- 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());
+ numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
this.AddChidren(numberFrame);
//鑿滃崟瀹瑰櫒
- CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 17);
+ 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);
@@ -265,10 +284,37 @@
menuFram.Y = Application.GetRealHeight(24);
menuFram.AddView(cornerBottomFram);
- typeMultiFramLayout = new TypeMultiFramLayout();
- typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
- typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.shixuqi;
+ if (sequencerList.Count == 0)
+ {
+ //娌℃湁鏃跺簭鍣�
+ jdhSingleFramLayout = new TypeSingleFramLayout();
+ jdhSingleFramLayout.AddView(cornerBottomFram);
+ jdhSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
+ jdhSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
+ jdhSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
+ jdhSingleFramLayout.btnName.Text = this.remoteControl.name;
+ jdhSingleFramLayout.btnName.X = Application.GetRealWidth(16);
+ jdhSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
+ jdhSingleFramLayout.btnRightImage.X = jdhSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
+ jdhSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
+ jdhSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
+ jdhSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
+ jdhSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
+ jdhSingleFramLayout.btnLeftImage.Visible = false;
+ jdhSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+ jdhSingleFramLayout.singleFramLayout,
+ jdhSingleFramLayout.btnName,
+ jdhSingleFramLayout.btnRightImage,
+ 48, 200);
+ }
+ else
+ {
+
+ typeMultiFramLayout = new TypeMultiFramLayout();
+ typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
+ typeMultiFramLayout.AddView(cornerBottomFram);
+ typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
+ }
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
@@ -311,5 +357,32 @@
this.AdjustRealHeight(16);
}
+
+ /// <summary>
+ /// 鎸夐敭鎺у埗
+ /// </summary>
+ /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
+ /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
+ /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
+ private void KeyControl(string keypad, string keyName, bool isSupport)
+ {
+ //CommonMethod.Current.Loading.Start();
+ CommonMethod.Current.SunThread(() =>
+ {
+ try
+ {
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
+ }
+ catch { }
+ finally
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ //CommonMethod.Current.Loading.Hide();
+ });
+ }
+ });
+
+ }
}
}
--
Gitblit v1.8.0