From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index 6a3ce56..ad0a05c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -2,6 +2,8 @@
using System.Collections.Generic;
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
@@ -11,11 +13,25 @@
/// </summary>
public class JdhPage:BaseFramLayout
{
- public JdhPage()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
+ /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
+ public JdhPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
{
+ this.remoteControl = remoteControlEntity;
+ this.sequencerList = sequencerList;
}
+ /// <summary>
+ /// 鏃跺簭鍣ㄥ垪琛�
+ /// </summary>
+ private List<SequencerEntity> sequencerList;
+ /// <summary>
+ /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
+ /// </summary>
+ private RemoteControlEntity remoteControl;
-
public Action<IntType> action;
/// <summary>
/// 鏈�涓婇潰鍔熻兘閿鍣�
@@ -56,45 +72,44 @@
private void EventListener()
{
//鍔熻兘閿帶鍒�
- cornerTopFram.selectAction += (value) =>
+ cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鏁板瓧閿帶鍒�
- numberFrame.selectAction += (s) =>
+ numberFrame.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("鎵撳嵃====" + s);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鑿滃崟涓婃寜閿�
- menuFram.SetTopClickListener((b) =>
+ menuFram.SetTopClickListener((keypadEntity) =>
{
-
- Console.WriteLine("5");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟涓嬫寜閿�
- menuFram.SetBottomClickListener((b) =>
+ menuFram.SetBottomClickListener((keypadEntity) =>
{
- Console.WriteLine("6");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟宸︽寜閿�
- menuFram.SetLeftClickListener((b) =>
+ menuFram.SetLeftClickListener((keypadEntity) =>
{
- Console.WriteLine("7");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟鍙虫寜閿�
- menuFram.SetRightClickListener((b) =>
+ menuFram.SetRightClickListener((keypadEntity) =>
{
- Console.WriteLine("8");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟ok鎸夐敭
- menuFram.SetOkClickListener((b) =>
+ menuFram.SetOkClickListener((keypadEntity) =>
{
- Console.WriteLine("9");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鏃跺簭鍣�
typeMultiFramLayout.SetLeftFlClickListener((f) =>
{
- SxqPage sxqPage = new SxqPage();
+ SxqPage sxqPage = new SxqPage(this.sequencerList,this.remoteControl.deviceId);
MainPage.BasePageView.AddChidren(sxqPage);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
sxqPage.Show();
@@ -125,12 +140,12 @@
};
this.AddChidren(btnTitle);
- cornerTopFram = new CornerFramLayout(343, 452, 17);
+ cornerTopFram = new CornerFramLayout(343, 368, 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(),new List<int> { 5, 6 });
#region ----棰戦亾 鎺у埗----
FrameLayout middLayout = new FrameLayout
@@ -253,7 +268,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.shixuqi;
+ typeMultiFramLayout.btnBottonRightName.TextID = StringId.jidinghe;
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
@@ -296,5 +311,31 @@
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