From 922dcfb535b7c9d8bd4ab1d97ebc50b49237b0df Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 八月 2023 14:36:42 +0800
Subject: [PATCH] 2023年08月09日14:36:17
---
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 3
HDL-ON_Android/Assets/Phone/AksIcon/hdmi.png | 0
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs | 3
HDL_ON/Common/ApiUtlis.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs | 3
HDL_ON/Entity/FunctionList.cs | 2
HDL-ON_Android/HDL-ON_Android.csproj | 1
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 5
HDL_ON/DAL/Server/HttpUtil.cs | 9
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs | 135 +++++++------------
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs | 3
HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs | 3
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs | 80 +++++++++-
HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs | 115 ++++++++++++++++
HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs | 8 +
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 7
17 files changed, 259 insertions(+), 122 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/AksIcon/hdmi.png b/HDL-ON_Android/Assets/Phone/AksIcon/hdmi.png
new file mode 100644
index 0000000..b30f495
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/AksIcon/hdmi.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 4ddbdd7..b407030 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -546,6 +546,7 @@
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_qian_selected.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_right_selected.png" />
<AndroidAsset Include="Assets\Phone\AksIcon\ykq_hou_selected.png" />
+ <AndroidAsset Include="Assets\Phone\AksIcon\hdmi.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index e6f4a51..ec8dcc4 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -193,7 +193,7 @@
FunctionList.List.ClearDatas();
//MainPage.Log($"============璁惧============寮�濮�" + FunctionList.List.Functions.Count);
//MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
- MainPage.Log($"sid鍒楄〃鑾峰彇====" + deviceResult.Data.ToString());
+ MainPage.Log($"sid鍒楄〃鑾峰彇====\r\n" , deviceResult.Data.ToString());
var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
if (deviceList == null)
{
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 4766d4f..099e550 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -19,12 +19,13 @@
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
//public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
- //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
- //const string APP_KEY = "CPEVRLRT";
- //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
+
+ public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//寮�鍙戠幆澧�
+ //const string APP_KEY = "CPEVRLRT";//寮�鍙戠幆澧傾PP_KEY
+ //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";//寮�鍙戠幆澧僑ECRET_KEY
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 5dbf0f1..2ee8ce7 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -190,7 +190,7 @@
/// <returns></returns>
public List<Function> GetVideoControlsList()
{
- var spkList = SPK.GetVideoDoorLockSPKList();
+ var spkList = SPK.GetVideoControlsSPKList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
index c9b4115..65536cf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
@@ -3,6 +3,8 @@
using System.Collections.Generic;
using Shared;
using HDL_ON.DAL.Server;
+using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
/// <summary>
@@ -38,10 +40,119 @@
{
var list = FunctionList.List.GetVideoControlsList();
#if DEBUG
- list.Add(new Function { name = "褰遍煶涓帶灞忎竴", sid = "11111111", spk = SPK.AvZkAiks });
- list.Add(new Function { name = "褰遍煶涓帶灞忎簩", sid = "22222222", spk = SPK.AvZkAiks });
+ //list.Add(new Function { name = "褰遍煶涓帶灞忎竴", sid = "11111111", spk = SPK.AvZkAiks });
+ //list.Add(new Function { name = "褰遍煶涓帶灞忎簩", sid = "22222222", spk = SPK.AvZkAiks });
#endif
return list;
}
+
+
+ /// <summary>
+ /// 鑾峰彇銆愰煶涔愩�戦仴鎺у櫒鎸夐敭鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetMusicKeypadList()
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ string aksIcon = "AksIcon/";
+ keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai" });
+ keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan" });
+ keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan" });
+ keypads.Add(new KeypadEntity { keypad = "return", name = "杩斿洖", localIconAddress = $"{aksIcon}fanhui" });
+ keypads.Add(new KeypadEntity { keypad = "sound_channel", name = "澹伴亾", localIconAddress = $"{aksIcon}shengdao" });
+ keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia" });
+ keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian" });
+ keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}jingyin" });
+ keypads.Add(new KeypadEntity { keypad = "part_up", name = "涓婁竴閮�", localIconAddress = $"{aksIcon}shangyibu" });
+ keypads.Add(new KeypadEntity { keypad = "part_down", name = "涓嬩竴閮�", localIconAddress = $"{aksIcon}xiayibu" });
+ keypads.Add(new KeypadEntity { keypad = "fast_rewind", name = "蹇��", localIconAddress = $"{aksIcon}kuaitui" });
+ keypads.Add(new KeypadEntity { keypad = "fast_forward", name = "蹇繘", localIconAddress = $"{aksIcon}kuaijin" });
+ keypads.Add(new KeypadEntity { keypad = "stop", name = "鍋滄", localIconAddress = $"{aksIcon}tingzhi" });
+ keypads.Add(new KeypadEntity { keypad = "pause", name = "鏆傚仠", localIconAddress = $"{aksIcon}zanting" });
+ keypads.Add(new KeypadEntity { keypad = "play", name = "鎾斁", localIconAddress = $"{aksIcon}bofang" });
+ keypads.Add(new KeypadEntity { keypad = "in_out_warehouse", name = "杩涘嚭浠�", localIconAddress = $"{aksIcon}jinchucang" });
+ keypads.Add(new KeypadEntity { keypad = "subtitle", name = "瀛楀箷", localIconAddress = $"{aksIcon}zimu" });
+ keypads.Add(new KeypadEntity { keypad = "key_up", name = "涓�", localIconAddress = $"{aksIcon}shang" });
+ keypads.Add(new KeypadEntity { keypad = "key_down", name = "涓�", localIconAddress = $"{aksIcon}xia" });
+ keypads.Add(new KeypadEntity { keypad = "key_left", name = "宸�", localIconAddress = $"{aksIcon}zuo" });
+ keypads.Add(new KeypadEntity { keypad = "key_right", name = "鍙�", localIconAddress = $"{aksIcon}you" });
+ keypads.Add(new KeypadEntity { keypad = "key_ok", name = "纭", localIconAddress = $"{aksIcon}ok" });
+ return keypads;
+ }
+ /// <summary>
+ /// 鑾峰彇銆愬姛鏀俱�戦仴鎺у櫒鎸夐敭鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetGFKeypadList()
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ string aksIcon = "AksIcon/";
+ keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai" });
+ keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan" });
+ keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia" });
+ keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian" });
+ keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian" });
+ keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian" });
+ keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian" });
+ return keypads;
+ }
+
+ /// <summary>
+ /// 鑾峰彇銆愭姇褰变华銆戦仴鎺у櫒鎸夐敭鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetTYYKeypadList()
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ string aksIcon = "AksIcon/";
+ keypads.Add(new KeypadEntity { keypad = "on", name = "寮�", localIconAddress = $"{aksIcon}kai" });
+ keypads.Add(new KeypadEntity { keypad = "off", name = "鍏�", localIconAddress = $"{aksIcon}guan" });
+ keypads.Add(new KeypadEntity { keypad = "signal_source", name = "淇″彿婧�", localIconAddress = $"{aksIcon}xinhaoyuan" });
+ keypads.Add(new KeypadEntity { keypad = "curtain_up", name = "骞曞竷鍗�", localIconAddress = $"{aksIcon}mubusheng" });
+ keypads.Add(new KeypadEntity { keypad = "curtain_down", name = "骞曞竷闄�", localIconAddress = $"{aksIcon}mubujiang.png" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_", name = "HDMI 1", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_2", name = "HDMI 2", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_3", name = "HDMI 3", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "HDMI_4", name = "HDMI 4", localIconAddress = $"{aksIcon}hdmi" });
+ keypads.Add(new KeypadEntity { keypad = "volume_up", name = "闊抽噺+", localIconAddress = $"{aksIcon}yinliangjia" });
+ keypads.Add(new KeypadEntity { keypad = "volume_down", name = "闊抽噺-", localIconAddress = $"{aksIcon}yinliangjian" });
+ keypads.Add(new KeypadEntity { keypad = "menu", name = "鑿滃崟", localIconAddress = $"{aksIcon}caidan" });
+ keypads.Add(new KeypadEntity { keypad = "return", name = "杩斿洖", localIconAddress = $"{aksIcon}fanhui" });
+ keypads.Add(new KeypadEntity { keypad = "custom_1", name = "鑷畾涔夋寜閿�1", localIconAddress = $"{aksIcon}zdyanjian" });
+ keypads.Add(new KeypadEntity { keypad = "custom_2", name = "鑷畾涔夋寜閿�2", localIconAddress = $"{aksIcon}zdyanjian" });
+ keypads.Add(new KeypadEntity { keypad = "custom_3", name = "鑷畾涔夋寜閿�3", localIconAddress = $"{aksIcon}zdyanjian" });
+ keypads.Add(new KeypadEntity { keypad = "custom_4", name = "鑷畾涔夋寜閿�4", localIconAddress = $"{aksIcon}zdyanjian" });
+ return keypads;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇銆愭暟瀛椼�戞寜閿垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetNumberKeypadList()
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ keypads.Add(new KeypadEntity { keypad = "number_1", name = "1" });
+ keypads.Add(new KeypadEntity { keypad = "number_2", name = "2" });
+ keypads.Add(new KeypadEntity { keypad = "number_3", name = "3" });
+ keypads.Add(new KeypadEntity { keypad = "ch_up", name = Language.StringByID(StringId.pindaojia) });
+ keypads.Add(new KeypadEntity { keypad = "number_4", name = "4" });
+ keypads.Add(new KeypadEntity { keypad = "number_5", name = "5" });
+ keypads.Add(new KeypadEntity { keypad = "number_6", name = "6" });
+ keypads.Add(new KeypadEntity { keypad = "ch_down", name = Language.StringByID(StringId.pindaojian) });
+ keypads.Add(new KeypadEntity { keypad = "number_7", name = "7" });
+ keypads.Add(new KeypadEntity { keypad = "number_8", name = "8" });
+ keypads.Add(new KeypadEntity { keypad = "number_9", name = "9" });
+ keypads.Add(new KeypadEntity { keypad = "number_continuous", name = "-/--" });
+ keypads.Add(new KeypadEntity { keypad = "none", name = "" });//杩欎釜鏄负浜嗗崰浣嶇疆
+ keypads.Add(new KeypadEntity { keypad = "number_0", name = "0" });
+ return keypads;
+ }
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
index b2d9217..3c9bb3f 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,10 @@
public class AksPage : FrameLayout
{
#region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 閬ユ帶鍣ㄥ垪琛�
+ /// </summary>
+ private List<RemoteControlEntity> remoteControlList;
/// <summary>
/// 璁惧
/// </summary>
@@ -55,6 +60,8 @@
/// 璁板綍褰撳墠璁惧
/// </summary>
public IntType currnetIntType= IntType.none;
+
+
public VerticalScrolViewLayout vv;
#endregion
@@ -114,7 +121,7 @@
};
this.AddChidren(vv);
//杩涙潵榛樿鎾斁鍣ㄧ晫闈�
- this.SwitchUI(IntType.Player);
+ //this.SwitchUI(IntType.Player);
}
/// <summary>
/// 娉ㄥ唽浜嬩欢
@@ -171,14 +178,29 @@
{
try
{
-
+ this.remoteControlList = SendMethod.Current.GetRemoteControlLits(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,10 +218,11 @@
{
return;
}
- if (vv != null)
+ if (this.vv == null)
{
- vv.RemoveAll();
+ return;
}
+ this.vv.RemoveAll();
this.currnetIntType = type;
switch (type)
{
@@ -334,13 +357,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>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
index d23582a..0837457 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
@@ -76,8 +76,7 @@
CornerFramLayout imageFLayout = new CornerFramLayout(343, 20 * 168, 0);
vv.AddChidren(imageFLayout);
imageFLayout.X = Application.GetRealWidth(16);
- imageFLayout.SetList(imageFLayout.GetTestList(20));
- imageFLayout.LoadImagePage();
+ imageFLayout.LoadImagePage(new List<Entity.KeypadEntity>());
imageFLayout.selectAction += (index) =>
{
CommonMethod.Current.MainThread(() =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index 443c3e0..9f4dac2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -2,6 +2,7 @@
using HDL_ON.UI.Music;
using Shared;
using System.Collections.Generic;
+using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
{
@@ -18,10 +19,12 @@
/// 涓�琛屽嚑涓厓绱�
/// </summary>
private int mRowNumber;
+ /// <summary>
+ /// 鍒楄〃鏈�澶у��
+ /// </summary>
+ private int mListCount;
- private List<string> mList;
-
- public Action<string> selectAction = null;
+ public Action<KeypadEntity> selectAction = null;
/// <summary>
/// 褰撳墠閫夋嫨鐨勭储寮�(鍐呴儴浣跨敤)
/// </summary>
@@ -58,58 +61,37 @@
this.rightMargin = right;
}
- /// <summary>
- /// 璁剧疆鍒楄〃鏁版嵁(璇峰湪鍒濆鍖栧畬鎴愪箣鍓嶈皟鐢�)
- /// </summary>
- /// <param name="list"></param>
- public void SetList(List<string> list)
- {
- if (list == null)
- {
- list = new List<string>();
- }
- this.mList = list;
- }
+
/// <summary>
/// 鑾峰彇娴嬭瘯鍒楄〃鏁版嵁
/// </summary>
- public List<string> GetTestList(int count)
+ public List<KeypadEntity> GetTestList()
{
- var list = new List<string>();
- for (int i = 1; i <= count; i++)
- {
- if (i % 2 == 0)
- {
- list.Add("浣犲ソ鍌诲摝!");
- }
- else
- {
- list.Add("鐪熺殑鏄繖鏍风殑鍚�?");
- }
- }
- return list;
+ return AksCommonMethod.Current.GetTYYKeypadList();
}
/// <summary>
/// 鍔ㄦ�佸姞杞芥寜閿晫闈�
/// </summary>
+ /// <param name="mList">鍒楄〃</param>
/// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
- public void LoadButtonPage(int mRowNumber)
+ public void LoadButtonPage(List<KeypadEntity> mList, int mRowNumber)
{
if (mRowNumber == 0)
{
return;
}
this.mRowNumber = mRowNumber;
+ this.mListCount = mList.Count;
int line = 0;
int xCount = 0;
- for (int i = 1; i <= this.mList.Count; i++)
+ for (int i = 1; i <= mList.Count; i++)
{
- var d = this.mList[i - 1];
+ var keypad = mList[i - 1];
ButtonFramLayout buttonFram = new ButtonFramLayout();
this.AddChidren(buttonFram);
- buttonFram.Tag = d;
+ buttonFram.Tag = keypad;
buttonFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(ButtonFramLayout.heightFrameLayout * line);
buttonFram.X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(ButtonFramLayout.widthFrameLayout * xCount);
buttonFram.AddImageView();
@@ -122,7 +104,7 @@
{
buttonFram.AddBottomLine();
}
- buttonFram.GetNameButton().Text = d;
+ buttonFram.GetNameButton().Text = keypad.name;
xCount++;
if (i % this.mRowNumber == 0)
@@ -135,7 +117,7 @@
{
if (buttonFram.Tag != null)
{
- selectAction?.Invoke(buttonFram.Tag.ToString());
+ selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
}
});
@@ -151,8 +133,9 @@
/// <summary>
/// 鍔ㄦ�佸姞杞芥寜閿晫闈�
/// </summary>
- /// <param name="list">绱㈠紩鍒楄〃,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�</param>
- public void LoadButtonPage(List<int> list)
+ /// <param name="mList">鍒楄〃</param>
+ /// <param name="list">鍒楄〃涓储寮�,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�</param>
+ public void LoadButtonPage(List<KeypadEntity> mList, List<int> list)
{
int currnetheightValue = 0;
@@ -160,9 +143,9 @@
//鑾峰彇鐩稿涓�涓含搴﹀��
int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(ButtonFramLayout.heightFrameLayout / 2);
int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(ButtonFramLayout.widthFrameLayout / 2);
- for (int i = 1; i <= this.mList.Count; i++)
+ for (int i = 1; i <= mList.Count; i++)
{
- var d = this.mList[i - 1];
+ var keypad = mList[i - 1];
ButtonFramLayout buttonFram = null;
if (list.Contains(i))
{
@@ -183,8 +166,8 @@
this.AddChidren(buttonFram);
buttonFram.AddImageView();
buttonFram.AddNameView();
- buttonFram.Tag = d;//鏍囪鏁版嵁
- buttonFram.GetNameButton().Text = d.ToString();
+ buttonFram.Tag = keypad;//鏍囪鏁版嵁
+ buttonFram.GetNameButton().Text = keypad.name;
if (widthDimensionValue > Application.GetRealWidth(currnetWidthValue))
{
//鍔犲彸绾�
@@ -207,7 +190,7 @@
{
if (buttonFram.Tag != null)
{
- selectAction?.Invoke(buttonFram.Tag.ToString());
+ selectAction?.Invoke((KeypadEntity)buttonFram.Tag);
}
});
@@ -221,8 +204,9 @@
/// <summary>
///鍔ㄦ�佸姞杞芥暟瀛楁寜閿晫闈�
/// </summary>
- public void LoadNumberButtonPage()
+ public void LoadNumberButtonPage(List<KeypadEntity> mList)
{
+
int currnetheightValue = 0;
int currnetWidthValue = 0;
int heightMaxValue = 84;
@@ -230,21 +214,21 @@
//鑾峰彇鐩稿涓�涓含搴﹀��
int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
- for (int i = 1; i <= this.GetNumberTextList().Count; i++)
+ for (int i = 1; i <= mList.Count; i++)
{
- var d = this.GetNumberTextList()[i - 1];
+ var keypad = mList[i - 1];
Button button = new Button
{
Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue),
X = Application.GetRealWidth(this.leftMargin) + Application.GetRealWidth(currnetWidthValue),
Width = Application.GetRealWidth(widthMaxValue),
Height = Application.GetRealHeight(heightMaxValue),
- Text = d,
+ Text = keypad.name,
TextSize = TextSize.Text20,
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.Center,
IsBold = true,
- Tag = d,
+ Tag = keypad,
BackgroundColor = MusicColor.WhiteColor,
SelectedBackgroundColor = 0xff454635,
};
@@ -258,12 +242,12 @@
}
button.MouseDownEventHandler += (sen, e) =>
{
- if (button.Tag == null || string.IsNullOrEmpty(button.Tag.ToString()))
+ if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none")
{
return;
}
button.IsSelected = true;
- selectAction?.Invoke(button.Tag.ToString());
+ selectAction?.Invoke((KeypadEntity)button.Tag);
};
button.MouseUpEventHandler += (sen, e) =>
{
@@ -280,7 +264,7 @@
/// <summary>
/// 鍔ㄦ�佸姞杞藉浘鐗囩晫闈�
/// </summary>
- public void LoadImagePage()
+ public void LoadImagePage(List<KeypadEntity> mList)
{
int currnetheightValue = 0;
int currnetWidthValue = 0;
@@ -289,15 +273,15 @@
//鑾峰彇鐩稿涓�涓含搴﹀��
int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
int widthDimensionValue = this.Width - Application.GetRealWidth(this.leftMargin) - Application.GetRealWidth(this.rightMargin) - Application.GetRealHeight(widthMaxValue / 2);
- for (int i = 1; i <= this.mList.Count; i++)
+ for (int i = 1; i <= mList.Count; i++)
{
- var d = this.mList[i - 1];
+ var keypad = mList[i - 1];
ImageFramlayout imageFram = new ImageFramlayout();
imageFram.AddView(this);
- imageFram.Tag = d;
+ imageFram.Tag = keypad;
imageFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight(currnetheightValue);
imageFram.X = Application.GetRealWidth(currnetWidthValue);
- imageFram.btnName.Text = d;
+ imageFram.btnName.Text = keypad.name;
currnetWidthValue += (widthMaxValue + 8);//8鏄殧闂村��
if (widthDimensionValue < Application.GetRealWidth(currnetWidthValue))
{
@@ -309,7 +293,7 @@
{
if (imageFram.Tag != null)
{
- selectAction?.Invoke(imageFram.Tag.ToString());
+ selectAction?.Invoke((KeypadEntity)imageFram.Tag);
}
});
//if (CurrnetSelectIndex != -1 && CurrnetSelectIndex == i)
@@ -322,24 +306,26 @@
/// 鍔ㄦ�佸姞杞藉浘鐗囩晫闈�
/// </summary>
/// <param name="mRowNumber">涓�琛屽灏戜釜鍏冪礌</param>
- public void LoadImagePage(int mRowNumber)
+ public void LoadImagePage(List<KeypadEntity> mList, int mRowNumber)
{
+
if (mRowNumber == 0)
{
return;
}
+ this.mListCount = mList.Count;
this.mRowNumber = mRowNumber;
int line = 0;
int xCount = 0;
- for (int i = 1; i <= this.mList.Count; i++)
+ for (int i = 1; i <= mList.Count; i++)
{
- var d = this.mList[i - 1];
+ var keypad = mList[i - 1];
ImageFramlayout imageFram = new ImageFramlayout();
imageFram.AddView(this);
- imageFram.Tag = d;
+ imageFram.Tag = keypad;
imageFram.Y = Application.GetRealHeight(this.topMargin) + Application.GetRealHeight((ImageFramlayout.heightFrameLayout + 20) * line);
imageFram.X = Application.GetRealWidth((ImageFramlayout.widthFrameLayout + 8) * xCount);
- imageFram.btnName.Text = d;
+ imageFram.btnName.Text = keypad.name;
xCount++;
if (i % this.mRowNumber == 0)
@@ -352,7 +338,7 @@
{
if (imageFram.Tag != null)
{
- selectAction?.Invoke(imageFram.Tag.ToString());
+ selectAction?.Invoke((KeypadEntity)imageFram.Tag);
}
});
@@ -381,12 +367,12 @@
/// <returns></returns>
private bool IsLastColumn(int index)
{
- if (this.mRowNumber == 0 || this.mList == null || this.mList.Count == 0)
+ if (this.mRowNumber == 0 || mListCount == 0)
{
return false;
}
- int lineCount = this.mList.Count / this.mRowNumber;//寰楀嚭琛屾暟
- int number = this.mList.Count % this.mRowNumber;
+ int lineCount = mListCount / this.mRowNumber;//寰楀嚭琛屾暟
+ int number = mListCount % this.mRowNumber;
if (number != 0)
{
if (index > lineCount * this.mRowNumber)
@@ -462,27 +448,6 @@
- public List<string> GetNumberTextList()
- {
- return new List<string>
- {
- "1",
- "2",
- "3",
- Language.StringByID(StringId.pindaojia),
- "4",
- "5",
- "6",
- Language.StringByID(StringId.pindaojian),
- "7",
- "8",
- "9",
- "-/--",
- "",//杩欎釜鏄负浜嗗崰浣嶇疆
- "0"
- };
-
- }
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs
index 7bbfc12..a625c8c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/KeypadEntity.cs
@@ -14,5 +14,13 @@
/// 鎸夐敭鍚嶇О
/// </summary>
public string name = string.Empty;
+ /// <summary>
+ /// 鎸夐敭鏈湴鍥炬爣鍦板潃(鑷畾涔�)
+ /// </summary>
+ public string localIconAddress = string.Empty;
+ /// <summary>
+ /// 鏄惁鍙互鐐瑰嚮(鑷畾涔�)
+ /// </summary>
+ public bool isClicked = true;
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index e50696e..b385592 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -79,9 +79,8 @@
cornerFram.X = Application.GetRealWidth(16);
cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerFram);
- cornerFram.SetList(cornerFram.GetTestList(17));
cornerFram.SetMargin(16, 0, 16, 0);
- cornerFram.LoadButtonPage(4);
+ cornerFram.LoadButtonPage(AksCommonMethod.Current.GetGFKeypadList(),4);
CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 72, 17);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index bf68ccb..6a3ce56 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -129,9 +129,8 @@
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
- cornerTopFram.SetList(cornerTopFram.GetTestList(17));
cornerTopFram.SetMargin(16, 0, 16, 0);
- cornerTopFram.LoadButtonPage(new List<int> { 5, 6 });
+ cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 5, 6 });
#region ----棰戦亾 鎺у埗----
FrameLayout middLayout = new FrameLayout
@@ -236,7 +235,7 @@
numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
numberFrame.BackgroundColor = MusicColor.WhiteColor;
numberFrame.SetMargin(16, 0, 16, 0);
- numberFrame.LoadNumberButtonPage();
+ numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList());
this.AddChidren(numberFrame);
@@ -254,7 +253,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.dianshi;
+ typeMultiFramLayout.btnBottonRightName.TextID = StringId.shixuqi;
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index da805cf..2aee513 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -113,9 +113,8 @@
cornerFram.X = Application.GetRealWidth(16);
cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerFram);
- cornerFram.SetList(cornerFram.GetTestList(16));
cornerFram.SetMargin(16, 0, 16, 0);
- cornerFram.LoadButtonPage(4);
+ cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(),4);
CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364, 17);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
index 0409d16..cc599f9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
@@ -372,7 +372,7 @@
// Text = responsePackNew.message + "(" + responsePackNew.Code + ")",
// Direction = AMPopTipDirection.None,
//}.Show(MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1));
- CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")");
+ CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")",3);
});
}
return false;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 316ad5b..1aa4786 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -127,9 +127,8 @@
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
- cornerTopFram.SetList(cornerTopFram.GetTestList(17));
cornerTopFram.SetMargin(16, 0, 16, 0);
- cornerTopFram.LoadButtonPage(new List<int> { 5, 6 });
+ cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 5, 6 });
#region ----棰戦亾 鎺у埗----
FrameLayout middLayout = new FrameLayout
@@ -234,7 +233,7 @@
numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
numberFrame.BackgroundColor = MusicColor.WhiteColor;
numberFrame.SetMargin(16,0,16,0);
- numberFrame.LoadNumberButtonPage();
+ numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList());
this.AddChidren(numberFrame);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index 15c0d28..8933aa9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -112,9 +112,8 @@
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
- cornerTopFram.SetList(cornerTopFram.GetTestList(17));
cornerTopFram.SetMargin(16, 0, 16, 0);
- cornerTopFram.LoadButtonPage(new List<int> { 3, 4, 5 });
+ cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 3, 4, 5 });
CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 17);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
index cdbfed9..e10a4f5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
@@ -137,8 +137,7 @@
CornerFramLayout imageFLayout = new CornerFramLayout(343, 20 * 168, 0);
vv.AddChidren(imageFLayout);
imageFLayout.X = Application.GetRealWidth(16);
- imageFLayout.SetList(imageFLayout.GetTestList(20));
- imageFLayout.LoadImagePage();
+ imageFLayout.LoadImagePage(new List<Entity.KeypadEntity>());
imageFLayout.selectAction += (index) =>
{
CommonMethod.Current.MainThread(() =>
--
Gitblit v1.8.0