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/GfPage.cs | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index b385592..a77cf49 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -1,7 +1,9 @@
-锘縰sing System;
+锘� using System;
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,10 +13,24 @@
/// </summary>
public class GfPage : BaseFramLayout
{
- public GfPage()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
+ /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
+ public GfPage(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;
CornerFramLayout cornerFram;
TypeMultiFramLayout typeMultiFramLayout;
@@ -37,14 +53,14 @@
private void EventListener()
{
- cornerFram.selectAction += (value) =>
+ cornerFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ 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();
@@ -53,7 +69,6 @@
//璁惧鍒囨崲
typeMultiFramLayout.SetRightFlClickListener((f) =>
{
- Console.WriteLine("4");
action?.Invoke(IntType.HiFi);
});
@@ -71,11 +86,14 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.gongfan,
+ Text= this.remoteControl.name,
+ IsBold = true,
};
this.AddChidren(btnTitle);
- cornerFram = new CornerFramLayout(343, 452, 17);
+
+
+ cornerFram = new CornerFramLayout(343, 284-18, 17);
cornerFram.X = Application.GetRealWidth(16);
cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerFram);
@@ -93,9 +111,35 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.gongfan;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
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