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/AksPage.cs | 136 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 113 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
index b2d9217..40156ef 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
@@ -9,6 +9,7 @@
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using HDL_ON.UI.UI2.Intelligence.Automation;
using System.Linq;
+using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
@@ -18,6 +19,14 @@
public class AksPage : FrameLayout
{
#region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 閬ユ帶鍣ㄥ垪琛�
+ /// </summary>
+ private List<RemoteControlEntity> remoteControlList;
+
+ /// 鏃跺簭鍣ㄥ垪琛�
+ /// </summary>
+ private List<SequencerEntity> sequencerList;
/// <summary>
/// 璁惧
/// </summary>
@@ -55,6 +64,8 @@
/// 璁板綍褰撳墠璁惧
/// </summary>
public IntType currnetIntType= IntType.none;
+
+
public VerticalScrolViewLayout vv;
#endregion
@@ -114,7 +125,7 @@
};
this.AddChidren(vv);
//杩涙潵榛樿鎾斁鍣ㄧ晫闈�
- this.SwitchUI(IntType.Player);
+ //this.SwitchUI(IntType.Player);
}
/// <summary>
/// 娉ㄥ唽浜嬩欢
@@ -124,6 +135,8 @@
//杩斿洖
this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
+ //娓呯┖鎵�鏈夌紦瀛樻暟鎹�
+ AksCommonMethod.Current.ClearData();
this.RemoveFromParent();
};
//璁剧疆
@@ -171,14 +184,30 @@
{
try
{
-
+ this.remoteControlList = SendMethod.Current.GetRemoteControlLits(this.device.deviceId);
+ this.sequencerList = SendMethod.Current.GetSequencerLits(this.device.deviceId);
}
catch { }
finally
{
- Application.RunOnMainThread(() =>
+ CommonMethod.Current.MainThread(() =>
{
CommonMethod.Current.Loading.Hide();
+
+ if (this.remoteControlList.Count > 0)
+ {
+ if (string.IsNullOrEmpty(this.GetValueString(IntType.Player)))
+ {
+ //榛樿鍙栫涓�浣�
+ this.SwitchUI((IntType)this.remoteControlList[0].type);
+ }
+ else
+ {
+ //鏈夋挱鏀剧被鍨嬮仴鎺у櫒浼樺厛鏄剧ず
+ this.SwitchUI(IntType.Player);
+ }
+ }
+
});
}
});
@@ -196,19 +225,20 @@
{
return;
}
- if (vv != null)
+ if (this.vv == null)
{
- vv.RemoveAll();
+ return;
}
+ this.vv.RemoveAll();
this.currnetIntType = type;
switch (type)
{
case IntType.Player:
{
- MusicPage musicPage = new MusicPage();
+ MusicPage musicPage = new MusicPage(GetRemoteControl((int)IntType.Player),this.sequencerList);
this.vv.AddChidren(musicPage);
musicPage.Show();
- musicPage.action += (type) =>
+ musicPage.action += (deviceType) =>
{
SelectedType();
};
@@ -216,10 +246,10 @@
break;
case IntType.HiFi:
{
- GfPage gfPage = new GfPage();
+ GfPage gfPage = new GfPage(GetRemoteControl((int)IntType.HiFi), this.sequencerList);
this.vv.AddChidren(gfPage);
gfPage.Show();
- gfPage.action += (type) =>
+ gfPage.action += (deviceType) =>
{
SelectedType();
};
@@ -229,10 +259,10 @@
case IntType.TV:
{
- TvPage tvPage = new TvPage();
+ TvPage tvPage = new TvPage(GetRemoteControl((int)IntType.TV), this.sequencerList);
this.vv.AddChidren(tvPage);
tvPage.Show();
- tvPage.action += (type) =>
+ tvPage.action += (deviceType) =>
{
SelectedType();
};
@@ -240,10 +270,10 @@
break;
case IntType.STB:
{
- JdhPage jdhPage = new JdhPage();
+ JdhPage jdhPage = new JdhPage(GetRemoteControl((int)IntType.STB), this.sequencerList);
this.vv.AddChidren(jdhPage);
jdhPage.Show();
- jdhPage.action += (type) =>
+ jdhPage.action += (deviceType) =>
{
SelectedType();
};
@@ -251,10 +281,10 @@
break;
case IntType.Projector:
{
- TyyPage tyyPage = new TyyPage();
+ TyyPage tyyPage = new TyyPage(GetRemoteControl((int)IntType.Projector), this.sequencerList);
this.vv.AddChidren(tyyPage);
tyyPage.Show();
- tyyPage.action += (type) =>
+ tyyPage.action += (deviceType) =>
{
SelectedType();
};
@@ -263,10 +293,10 @@
case IntType.Control:
{
- YkqPage ykqPage = new YkqPage();
+ YkqPage ykqPage = new YkqPage(GetRemoteControl((int)IntType.Control), this.sequencerList);
this.vv.AddChidren(ykqPage);
ykqPage.Show();
- ykqPage.action += (type) =>
+ ykqPage.action += (deviceType) =>
{
SelectedType();
};
@@ -295,6 +325,27 @@
});
}
+
+ /// <summary>
+ /// 鏌ユ壘閬ユ帶鍣�
+ /// </summary>
+ /// <param name="type">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
+ /// <returns>涓嶄細涓簄ull</returns>
+ private RemoteControlEntity GetRemoteControl(int type)
+ {
+ if (this.remoteControlList == null || this.remoteControlList.Count == 0)
+ {
+ return new RemoteControlEntity();
+ }
+ var re = this.remoteControlList.Find((o) => o.type == type);
+ if (re == null)
+ {
+ re = new RemoteControlEntity();
+ }
+ //re.deviceId = this.device.deviceId;
+ return re;
+ }
+
public enum IntType
{
@@ -334,13 +385,48 @@
/// <returns></returns>
private Dictionary<IntType, string> GetTypeDictionary()
{
+ if (this.remoteControlList == null || this.remoteControlList.Count == 0)
+ {
+ return new Dictionary<IntType, string>();
+ }
var dic = new Dictionary<IntType, string>();
- dic.Add(IntType.Player, Language.StringByID(StringId.bofangqi));
- dic.Add(IntType.HiFi, Language.StringByID(StringId.gongfan));
- dic.Add(IntType.TV, Language.StringByID(StringId.dianshi));
- dic.Add(IntType.STB, Language.StringByID(StringId.jidinghe));
- dic.Add(IntType.Projector, Language.StringByID(StringId.touyingyi));
- dic.Add(IntType.Control, Language.StringByID(StringId.xuniyaokongqi));
+ foreach (var o in this.remoteControlList)
+ {
+ switch (o.type)
+ {
+ case (int)IntType.Player:
+ {
+ dic.Add(IntType.Player, Language.StringByID(StringId.bofangqi));
+ }
+ break;
+ case (int)IntType.HiFi:
+ {
+ dic.Add(IntType.HiFi, Language.StringByID(StringId.gongfan));
+ }
+ break;
+ case (int)IntType.TV:
+ {
+ dic.Add(IntType.TV, Language.StringByID(StringId.dianshi));
+ }
+ break;
+
+ case (int)IntType.STB:
+ {
+ dic.Add(IntType.STB, Language.StringByID(StringId.jidinghe));
+ }
+ break;
+ case (int)IntType.Projector:
+ {
+ dic.Add(IntType.Projector, Language.StringByID(StringId.touyingyi));
+ }
+ break;
+ case (int)IntType.Control:
+ {
+ dic.Add(IntType.Control, Language.StringByID(StringId.xuniyaokongqi));
+ }
+ break;
+ }
+ }
return dic;
}
/// <summary>
@@ -378,5 +464,9 @@
return "";
}
+
+
+
+
}
}
--
Gitblit v1.8.0