From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs | 94 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 87 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
index c494ed2..ececc69 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
@@ -35,6 +35,7 @@
/// </summary>
public void ClearData() {
movieLibraryInfoEntities.Clear();
+ CollectList.Clear();
}
/// <summary>
/// 褰辩墖璇︽儏鍒楄〃
@@ -112,6 +113,11 @@
{
return;
}
+ if (CollectList.Count == 0)
+ {
+ CollectList.Add(movieLibrary);
+ return;
+ }
for (int i = 0; i < CollectList.Count; i++)
{
if (CollectList[i].movieId == movieLibrary.movieId)
@@ -148,6 +154,9 @@
}
return true;
}
+
+
+
/// <summary>
/// 鑾峰彇褰遍煶涓帶灞忓垪琛�
@@ -189,11 +198,11 @@
keypads.Add(new KeypadEntity { keypad = "play", name = "鎾斁", localIconAddress = $"{aksIcon}bofang.png" });
keypads.Add(new KeypadEntity { keypad = "in_out_warehouse", name = "杩涘嚭浠�", localIconAddress = $"{aksIcon}jinchucang.png" });
keypads.Add(new KeypadEntity { keypad = "subtitle", name = "瀛楀箷", localIconAddress = $"{aksIcon}zimu.png" });
- keypads.Add(new KeypadEntity { keypad = "key_up", name = "涓�", localIconAddress = $"{aksIcon}shang.png" });
- keypads.Add(new KeypadEntity { keypad = "key_down", name = "涓�", localIconAddress = $"{aksIcon}xia.png" });
- keypads.Add(new KeypadEntity { keypad = "key_left", name = "宸�", localIconAddress = $"{aksIcon}zuo.png" });
- keypads.Add(new KeypadEntity { keypad = "key_right", name = "鍙�", localIconAddress = $"{aksIcon}you.png" });
- keypads.Add(new KeypadEntity { keypad = "key_ok", name = "纭", localIconAddress = $"{aksIcon}ok.png" });
+ //keypads.Add(new KeypadEntity { keypad = "key_up", name = "涓�", localIconAddress = $"{aksIcon}shang.png" });
+ //keypads.Add(new KeypadEntity { keypad = "key_down", name = "涓�", localIconAddress = $"{aksIcon}xia.png" });
+ //keypads.Add(new KeypadEntity { keypad = "key_left", name = "宸�", localIconAddress = $"{aksIcon}zuo.png" });
+ //keypads.Add(new KeypadEntity { keypad = "key_right", name = "鍙�", localIconAddress = $"{aksIcon}you.png" });
+ //keypads.Add(new KeypadEntity { keypad = "key_ok", name = "纭", localIconAddress = $"{aksIcon}ok.png" });
return keypads;
}
/// <summary>
@@ -208,7 +217,7 @@
keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
- keypads.Add(new KeypadEntity { keypad = "HDMI_", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_1", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi.png" });
keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi.png" });
keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi.png" });
@@ -232,7 +241,7 @@
keypads.Add(new KeypadEntity { keypad = "signal_source", name = "淇″彿婧�", localIconAddress = $"{aksIcon}xinhaoyuan.png" });
keypads.Add(new KeypadEntity { keypad = "curtain_up", name = "骞曞竷鍗�", localIconAddress = $"{aksIcon}mubusheng.png" });
keypads.Add(new KeypadEntity { keypad = "curtain_down", name = "骞曞竷闄�", localIconAddress = $"{aksIcon}mubujiang.png" });
- keypads.Add(new KeypadEntity { keypad = "HDMI_", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_1", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi.png" });
keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi.png" });
keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi.png" });
keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi.png" });
@@ -245,6 +254,60 @@
keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian.png" });
keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian.png" });
return keypads;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇銆愮數瑙嗐�戦仴鎺у櫒鎸夐敭鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetTvKeypadList()
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ string aksIcon = "AksIcon/";
+ keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai.png" });
+ keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
+ keypads.Add(new KeypadEntity { keypad = "signal_source", name = "淇″彿婧�", localIconAddress = $"{aksIcon}xinhaoyuan.png" });
+ keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}jingyin.png" });
+ keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
+ keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan.png" });
+ keypads.Add(new KeypadEntity { keypad = "return", name = "杩斿洖", localIconAddress = $"{aksIcon}fanhui.png" });
+ keypads.Add(new KeypadEntity { keypad = "look_back", name = "鍥炵湅", localIconAddress = $"{aksIcon}huikan.png" });
+ keypads.Add(new KeypadEntity { keypad = "cancel", name = "鍙栨秷", localIconAddress = $"{aksIcon}quxiao.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ return keypads;
+
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇銆愭満椤剁洅銆戦仴鎺у櫒鎸夐敭鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetJdhKeypadList()
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ string aksIcon = "AksIcon/";
+ keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai.png" });
+ keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan.png" });
+ keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan.png" });
+ keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}jingyin.png" });
+ keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia.png" });
+ keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "look_back", name = "鍥炵湅", localIconAddress = $"{aksIcon}huikan.png" });
+ keypads.Add(new KeypadEntity { keypad = "cancel", name = "鍙栨秷", localIconAddress = $"{aksIcon}quxiao.png" });
+ keypads.Add(new KeypadEntity { keypad = "amplifier_volume_up", name = "鍔熸斁闊抽噺 +", localIconAddress = $"{aksIcon}gfyingliangjia.png" });
+ keypads.Add(new KeypadEntity { keypad = "amplifier_volume_down", name = "鍔熸斁闊抽噺 -", localIconAddress = $"{aksIcon}gf_ingliangjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ return keypads;
+
}
@@ -271,5 +334,22 @@
keypads.Add(new KeypadEntity { keypad = "number_0", name = "0" });
return keypads;
}
+
+ /// <summary>
+ /// 鑾峰彇銆愯彍鍗曘�戞寜閿垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetMenuKeypadList()
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ string aksIcon = "AksIcon/";
+ keypads.Add(new KeypadEntity { keypad = "key_up", name = "涓�", localIconAddress = $"{aksIcon}shang.png" });
+ keypads.Add(new KeypadEntity { keypad = "key_down", name = "涓�", localIconAddress = $"{aksIcon}xia.png" });
+ keypads.Add(new KeypadEntity { keypad = "key_left", name = "宸�", localIconAddress = $"{aksIcon}zuo.png" });
+ keypads.Add(new KeypadEntity { keypad = "key_right", name = "鍙�", localIconAddress = $"{aksIcon}you.png" });
+ keypads.Add(new KeypadEntity { keypad = "key_ok", name = "纭", localIconAddress = $"{aksIcon}ok.png" });
+ return keypads;
+ }
+
}
}
--
Gitblit v1.8.0