From 46a177eb1acf7ce91af7fe9ff57af87228de938d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 十月 2023 10:03:24 +0800
Subject: [PATCH] IOS库更新
---
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 30765ca..dee191d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.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
@@ -70,45 +71,50 @@
private void EventListener()
{
//鍔熻兘閿帶鍒�
- cornerTopFram.selectAction += (value) =>
+ cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鏁板瓧閿帶鍒�
- numberFrame.selectAction += (s) =>
+ numberFrame.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("鎵撳嵃====" + s);
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鑿滃崟涓婃寜閿�
- menuFram.SetTopClickListener((b) =>
+ menuFram.SetTopClickListener((keypadEntity) =>
{
- Console.WriteLine("5");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟涓嬫寜閿�
- menuFram.SetBottomClickListener((b) =>
+ menuFram.SetBottomClickListener((keypadEntity) =>
{
- Console.WriteLine("6");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟宸︽寜閿�
- menuFram.SetLeftClickListener((b) =>
+ menuFram.SetLeftClickListener((keypadEntity) =>
{
- Console.WriteLine("7");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟鍙虫寜閿�
- menuFram.SetRightClickListener((b) =>
+ menuFram.SetRightClickListener((keypadEntity) =>
{
- Console.WriteLine("8");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟ok鎸夐敭
- menuFram.SetOkClickListener((b) =>
+ menuFram.SetOkClickListener((keypadEntity) =>
{
- Console.WriteLine("9");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鏃跺簭鍣�
typeMultiFramLayout.SetLeftFlClickListener((f) =>
{
- SxqPage sxqPage = new SxqPage(this.sequencerList,this.remoteControl.deviceId);
+ SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
MainPage.BasePageView.AddChidren(sxqPage);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
sxqPage.Show();
@@ -117,7 +123,6 @@
//璁惧鍒囨崲
typeMultiFramLayout.SetRightFlClickListener((f) =>
{
- Console.WriteLine("4");
action?.Invoke(IntType.TV);
});
@@ -135,16 +140,17 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.dianshi,
+ 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.GetTvKeypadList(),new List<int> { 5, 6 });
#region ----棰戦亾 鎺у埗----
FrameLayout middLayout = new FrameLayout
@@ -174,6 +180,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.pindao,
+ Padding = new Padding(0, 0, 0, 0),
};
leftLayout.AddChidren(leftBtnTitle);
@@ -216,6 +223,7 @@
SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
TextSize = TextSize.Text16,
TextID = StringId.kongzhi,
+ Padding = new Padding(0, 0, 0, 0),
};
rightLayout.AddChidren(rightBtnTitle);
@@ -254,7 +262,7 @@
//鑿滃崟瀹瑰櫒
- 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.BackgroundColor = MusicColor.WhiteColor;
@@ -267,7 +275,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.dianshi;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
@@ -310,5 +318,32 @@
this.AdjustRealHeight(16);
}
+
+
+ /// <summary>
+ /// 鎸夐敭鎺у埗
+ /// </summary>
+ /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
+ /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
+ private void KeyControl(string keypad, string keyName)
+ {
+ //CommonMethod.Current.Loading.Start();
+ CommonMethod.Current.SunThread(() =>
+ {
+ try
+ {
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ }
+ catch { }
+ finally
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ //CommonMethod.Current.Loading.Hide();
+ });
+ }
+ });
+
+ }
}
}
--
Gitblit v1.8.0