From a4e9d02ce5cfc501ef9fecac0047c332b5426df2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 14 八月 2023 15:16:01 +0800
Subject: [PATCH] 2023年08月14日15:15:49
---
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 36 ++
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs | 7
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs | 41 ++
HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs | 57 +++-
HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs | 17 +
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 166 ++++++++++-----
HDL_ON/DAL/Server/NewAPI.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 68 ++++-
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs | 72 ++++--
HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs | 5
HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs | 89 +++++++
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 62 ++++-
13 files changed, 466 insertions(+), 158 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 9a8e150..348e8cb 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -563,7 +563,7 @@
/// <summary>
/// 褰辩墖鏀惰棌/鍙栨秷鏀惰棌
/// </summary>
- public const string Api_Post_Aks_MovieLibraryCollect = "/home-wisdom/app/device/avcc/movieLibrary/Collect";
+ public const string Api_Post_Aks_MovieLibraryCollect = "/home-wisdom/app/device/avcc/movieLibrary/collect";
/// <summary>
/// 鏀惰棌褰辩墖鍒嗛〉鑾峰彇
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
index c494ed2..96eecee 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>
/// 褰辩墖璇︽儏鍒楄〃
@@ -149,6 +150,9 @@
return true;
}
+
+
+
/// <summary>
/// 鑾峰彇褰遍煶涓帶灞忓垪琛�
/// </summary>
@@ -189,11 +193,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 +212,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 +236,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 +249,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}gongfang1.png" });
+ keypads.Add(new KeypadEntity { keypad = "amplifier_volume_down", name = "鍔熸斁闊抽噺 -", localIconAddress = $"{aksIcon}gongfang2.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 +329,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;
+ }
+
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
index 86a8cdb..6ad5cc9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CollectPage.cs
@@ -16,12 +16,13 @@
{
this.remoteControl = remoteControlEntity;
//璇荤紦瀛樻暟鎹�
- this.mMovieLibraryList.AddRange(AksCommonMethod.Current.CollectList);
+ var collectList = AksCommonMethod.Current.CollectList;
+ this.mMovieLibraryList.AddRange(collectList);
}
/// <summary>
/// 褰辩墖鍒楄〃
/// </summary>
- private List<MovieLibrary> mMovieLibraryList;
+ private List<MovieLibrary> mMovieLibraryList=new List<MovieLibrary>();
/// <summary>
/// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index ca2f461..2c20418 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -145,7 +145,7 @@
/// 鍔ㄦ�佸姞杞芥寜閿晫闈�
/// </summary>
/// <param name="mList">鍒楄〃</param>
- /// <param name="list">鍒楄〃涓储寮�,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�</param>
+ /// <param name="list"> 鍒楄〃涓储寮�,琛ㄧず鏌愪竴鏉″搴﹀姞瀹�,娌℃湁榛樿(new List<int>)</param>
/// <param name="defaultIndex">榛樿鍊肩储寮曡寖鍥碵0,mList.count-1],澶т簬鑼冨洿,璇ュ�艰涓烘棤鏁�</param>
public void LoadButtonPage(List<KeypadEntity> mList, List<int> list,int defaultIndex=-1)
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
index 80ea0ac..aaec10b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using HDL_ON.UI.Music;
+using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using Shared;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
{
@@ -26,6 +27,7 @@
Width = Application.GetRealWidth(24),
Height = Application.GetRealHeight(20),
UnSelectedImagePath = "AksIcon/shang.png",
+ Name= "涓�",
};
Button btnBottom = new Button
{
@@ -34,6 +36,7 @@
Width = Application.GetRealWidth(24),
Height = Application.GetRealHeight(20),
UnSelectedImagePath = "AksIcon/xia.png",
+ Name = "涓�",
};
Button btnLeft = new Button
{
@@ -42,6 +45,7 @@
Width = Application.GetRealWidth(20),
Height = Application.GetRealHeight(24),
UnSelectedImagePath = "AksIcon/zuo.png",
+ Name = "宸�",
};
Button btnRight = new Button
@@ -51,6 +55,7 @@
Width = Application.GetRealWidth(20),
Height = Application.GetRealHeight(24),
UnSelectedImagePath = "AksIcon/you.png",
+ Name = "鍙�",
};
@@ -73,6 +78,7 @@
Height = Application.GetMinRealAverage(28),
Radius = (uint)Application.GetRealHeight(14),
BackgroundColor = MusicColor.SelectedColor,
+ Name= "纭畾"
};
public void AddView(FrameLayout layout)
@@ -91,13 +97,16 @@
/// 涓�
/// </summary>
/// <param name="action"></param>
- public void SetTopClickListener(Action<Button> action)
+ public void SetTopClickListener(Action<KeypadEntity> action)
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
//btnTop.BackgroundColor = this.UpBackgroundColor;
btnTop.IsSelected = false;
- action?.Invoke(btnTop);
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnTop.Name;
+ keypadEntity.keypad = "key_up";
+ action?.Invoke(keypadEntity);
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnTop.MouseUpEventHandler += UpClick;
@@ -115,13 +124,16 @@
/// 涓�
/// </summary>
/// <param name="action"></param>
- public void SetBottomClickListener(Action<Button> action)
+ public void SetBottomClickListener(Action<KeypadEntity> action)
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
//btnBottom.BackgroundColor = this.UpBackgroundColor;
btnBottom.IsSelected = false;
- action?.Invoke(btnBottom);
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnBottom.Name;
+ keypadEntity.keypad = "key_down";
+ action?.Invoke(keypadEntity);
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnBottom.MouseUpEventHandler += UpClick;
@@ -138,13 +150,16 @@
/// 宸�
/// </summary>
/// <param name="action"></param>
- public void SetLeftClickListener(Action<Button> action)
+ public void SetLeftClickListener(Action<KeypadEntity> action)
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
//btnLeft.BackgroundColor = this.UpBackgroundColor;
btnLeft.IsSelected = false;
- action?.Invoke(btnLeft);
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnLeft.Name;
+ keypadEntity.keypad = "key_left";
+ action?.Invoke(keypadEntity);
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnLeft.MouseUpEventHandler += UpClick;
@@ -161,13 +176,16 @@
/// 鍙�
/// </summary>
/// <param name="action"></param>
- public void SetRightClickListener(Action<Button> action)
+ public void SetRightClickListener(Action<KeypadEntity> action)
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
//btnRight.BackgroundColor = this.UpBackgroundColor;
btnRight.IsSelected = false;
- action?.Invoke(btnRight);
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnRight.Name;
+ keypadEntity.keypad = "key_right";
+ action?.Invoke(keypadEntity);
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnRight.MouseUpEventHandler += UpClick;
@@ -187,12 +205,15 @@
/// ok
/// </summary>
/// <param name="action"></param>
- public void SetOkClickListener(Action<Button> action)
+ public void SetOkClickListener(Action<KeypadEntity> action)
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
btnOk.BackgroundColor = MusicColor.SelectedColor;// this.UpBackgroundColor;
- action?.Invoke(btnOk);
+ KeypadEntity keypadEntity = new KeypadEntity();
+ keypadEntity.name = btnOk.Name;
+ keypadEntity.keypad = "key_ok";
+ action?.Invoke(keypadEntity);
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnOk.MouseUpEventHandler += UpClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs
index 8ae8e68..c3b59a0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/DetailPage.cs
@@ -198,7 +198,7 @@
Y = btnYear.Bottom + Application.GetRealHeight(20),
Width = Application.GetRealWidth(45),
Height = Application.GetRealHeight(43),
- Text = movieLibrary.rating,
+ Text = movieLibraryInfo == null ? "" : movieLibraryInfo.rating,
TextSize = 32,
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -218,7 +218,6 @@
TextColor = 0xffA5AEBC,
TextSize = TextSize.Text12,
TextAlignment = TextAlignment.CenterLeft,
- Text = movieLibraryInfo == null ? "" : movieLibraryInfo.rating,
};
baseFramLayout.AddChidren(btnScore);
@@ -234,6 +233,7 @@
IsSelected = movieLibraryInfo == null ? false : movieLibraryInfo.collect,
};
baseFramLayout.AddChidren(btnCollectImage);
+
btnCollectText = new Button
{
@@ -395,7 +395,7 @@
//杩斿洖
this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
- action(isOldState != btnCollectImage.IsSelected);
+ action?.Invoke(isOldState != btnCollectImage.IsSelected);
this.RemoveFromParent();
};
//绔嬪嵆鎾斁
@@ -438,18 +438,29 @@
var isBool = SendMethod.Current.IsCollect(remoteControl.deviceId, remoteControl.rcId, movieLibrary.movieId, btnCollectImage.IsSelected);
if (isBool)
{
+ //鏇存柊缂撳瓨鏁版嵁
+ movieLibraryInfo.collect = btnCollectImage.IsSelected;
//鎴愬姛鍚庢墠鏇存柊缂撳瓨鏁版嵁
if (btnCollectImage.IsSelected)
{
+
AksCommonMethod.Current.AddCollectMovie(movieLibrary);
}
else
{
AksCommonMethod.Current.DelCollectMovie(movieLibrary);
}
+
}
}
catch { }
+ finally
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ CommonMethod.Current.Loading.Hide();
+ });
+ }
});
};
btnCollectImage.MouseUpEventHandler += CollectClick;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index 3a8f805..b0b8974 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -3,6 +3,7 @@
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
@@ -52,9 +53,9 @@
private void EventListener()
{
- cornerFram.selectKeyAction += (value) =>
+ cornerFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鏃跺簭鍣�
typeMultiFramLayout.SetLeftFlClickListener((f) =>
@@ -68,7 +69,6 @@
//璁惧鍒囨崲
typeMultiFramLayout.SetRightFlClickListener((f) =>
{
- Console.WriteLine("4");
action?.Invoke(IntType.HiFi);
});
@@ -90,7 +90,9 @@
};
this.AddChidren(btnTitle);
- cornerFram = new CornerFramLayout(343, 452, 17);
+
+
+ cornerFram = new CornerFramLayout(343, 284, 17);
cornerFram.X = Application.GetRealWidth(16);
cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerFram);
@@ -112,5 +114,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();
+ });
+ }
+ });
+
+ }
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index dbb1b44..b33dc79 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -3,6 +3,7 @@
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
@@ -71,40 +72,39 @@
private void EventListener()
{
//鍔熻兘閿帶鍒�
- cornerTopFram.selectKeyAction += (value) =>
+ cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鏁板瓧閿帶鍒�
- numberFrame.selectKeyAction += (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) =>
@@ -136,16 +136,16 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.jidinghe,
+ TextID = StringId.touyingyi,
};
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
@@ -311,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();
+ });
+ }
+ });
+
+ }
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index 668d031..178e1d2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -3,6 +3,7 @@
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
@@ -54,9 +55,15 @@
private void EventListener()
{
- cornerFram.selectKeyAction += (value) =>
+
+ cornerFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ //SendMethod.Current.Log(keypad.);
+ if (keypadEntity == null)
+ {
+ return;
+ }
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
};
typeSingleFramLayout.SetClickListener((f) =>
@@ -67,28 +74,27 @@
ykPage.Show();
});
- menuFram.SetTopClickListener((b) =>
+ menuFram.SetTopClickListener((keypadEntity) =>
{
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ });
+ menuFram.SetBottomClickListener((keypadEntity) =>
+ {
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ });
+ menuFram.SetLeftClickListener((keypadEntity) =>
+ {
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ });
+ menuFram.SetRightClickListener((keypadEntity) =>
+ {
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
- Console.WriteLine("5");
});
- menuFram.SetBottomClickListener((b) =>
+ menuFram.SetOkClickListener((keypadEntity) =>
{
- Console.WriteLine("6");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
});
- menuFram.SetLeftClickListener((b) =>
- {
- Console.WriteLine("7");
- });
- menuFram.SetRightClickListener((b) =>
- {
- Console.WriteLine("8");
- });
- menuFram.SetOkClickListener((b) =>
- {
- Console.WriteLine("9");
- });
-
typeMultiFramLayout.SetLeftFlClickListener((f) =>
{
SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
@@ -97,10 +103,8 @@
sxqPage.Show();
});
-
typeMultiFramLayout.SetRightFlClickListener((f) =>
{
- Console.WriteLine("4");
action?.Invoke(IntType.Player);
});
@@ -137,7 +141,7 @@
cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16);
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
-
+
typeSingleFramLayout = new TypeSingleFramLayout();
typeSingleFramLayout.AddView(cornerBottomFram);
@@ -158,7 +162,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();
+ });
+ }
+ });
+ }
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
index c276894..04d3094 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
@@ -128,8 +128,9 @@
/// <param name="deviceId">璁惧id</param>
/// <param name="rcId">閬ユ帶鍣╥d</param>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
+ /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
/// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
- public bool KeypadExecute(string deviceId, string rcId, string keypad, TipType tipType = TipType.flicker)
+ public bool KeypadExecute(string deviceId, string rcId, string keypad,string keyName, TipType tipType = TipType.flicker)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -137,7 +138,7 @@
d.Add("rcId", rcId);//閬ユ帶鍣╥d
d.Add("keypad", keypad);//鎸夐敭鏍囪瘑
//d.Add("zoneType", deviceId);//鍖哄煙
- var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d,NewAPI.Api_Post_Aks_KeypadExecute, "閬ユ帶鍣ㄦ寜閿墽琛�");
+ var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d,NewAPI.Api_Post_Aks_KeypadExecute, $"閬ユ帶鍣ㄣ�恵keyName}銆戞寜閿墽琛�");
if (!this.DataChecking(responsePackNew, tipType))
{
return false;
@@ -288,7 +289,7 @@
jObject.Add("collect", collect);//褰辩墖id
//d.Add("zoneType", deviceId);//鍖哄煙
- var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject.ToString(), NewAPI.Api_Post_Aks_MovieLibraryCollect, "褰辩墖鏀惰棌");
+ var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(jObject, NewAPI.Api_Post_Aks_MovieLibraryCollect, "褰辩墖鏀惰棌");
if (!this.DataChecking(responsePackNew, tipType))
{
return false;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 8a43e9c..2b77142 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -3,6 +3,7 @@
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
@@ -70,45 +71,50 @@
private void EventListener()
{
//鍔熻兘閿帶鍒�
- cornerTopFram.selectKeyAction += (value) =>
+ cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鏁板瓧閿帶鍒�
- numberFrame.selectKeyAction += (s) =>
+ numberFrame.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("鎵撳嵃====" + s);
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
};
//鑿滃崟涓婃寜閿�
- menuFram.SetTopClickListener((b) =>
+ menuFram.SetTopClickListener((keypadEntity) =>
{
- Console.WriteLine("5");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟涓嬫寜閿�
- menuFram.SetBottomClickListener((b) =>
+ menuFram.SetBottomClickListener((keypadEntity) =>
{
- Console.WriteLine("6");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟宸︽寜閿�
- menuFram.SetLeftClickListener((b) =>
+ menuFram.SetLeftClickListener((keypadEntity) =>
{
- Console.WriteLine("7");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟鍙虫寜閿�
- menuFram.SetRightClickListener((b) =>
+ menuFram.SetRightClickListener((keypadEntity) =>
{
- Console.WriteLine("8");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鑿滃崟ok鎸夐敭
- menuFram.SetOkClickListener((b) =>
+ menuFram.SetOkClickListener((keypadEntity) =>
{
- Console.WriteLine("9");
+
+ KeyControl(keypadEntity.keypad, keypadEntity.name);
});
//鏃跺簭鍣�
typeMultiFramLayout.SetLeftFlClickListener((f) =>
{
- SxqPage sxqPage = new SxqPage(this.sequencerList,this.remoteControl.deviceId);
+ SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
MainPage.BasePageView.AddChidren(sxqPage);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
sxqPage.Show();
@@ -117,7 +123,6 @@
//璁惧鍒囨崲
typeMultiFramLayout.SetRightFlClickListener((f) =>
{
- Console.WriteLine("4");
action?.Invoke(IntType.TV);
});
@@ -139,12 +144,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.GetTvKeypadList(),new List<int> { 5, 6 });
#region ----棰戦亾 鎺у埗----
FrameLayout middLayout = new FrameLayout
@@ -310,5 +315,32 @@
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();
+ });
+ }
+ });
+
+ }
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index 4425f01..b5d4558 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -3,6 +3,7 @@
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
@@ -59,36 +60,39 @@
//鍔熻兘閿帶鍒�
- cornerTopFram.selectKeyAction += (value) =>
+ cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+ 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) =>
@@ -102,7 +106,6 @@
//璁惧鍒囨崲
typeMultiFramLayout.SetRightFlClickListener((f) =>
{
- Console.WriteLine("4");
action?.Invoke(IntType.Projector);
});
@@ -150,5 +153,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();
+ });
+ }
+ });
+
+ }
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 4c96121..c9f223b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -3,6 +3,7 @@
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
@@ -62,14 +63,14 @@
CustomFrameLayout zhuyeFL;
FrameLayout okFl;
Button btnLeft;
- Button btnQian;
- Button btnRight;
- Button btnHou;
- Button btnOk;
- Button btnJia;
- Button btnJian;
Button btnShang;
+ Button btnRight;
Button btnXia;
+ Button btnOk;
+ Button btnYingliangjia;
+ Button btnYingliangjian;
+ Button btnPindaojia;
+ Button btnPindaojian;
CustomFrameLayout caidanFL;
CustomFrameLayout fanhuiFL;
CustomFrameLayout shanyibuFL;
@@ -106,133 +107,145 @@
//寮�鍏�
switchBtn.MouseDownEventHandler += (senser, e) =>
{
-
+ KeyControl("on_off", "寮�/鍏�");
};
//淇℃伅
xinxiFL.SetClickListener(() =>
{
-
+ KeyControl("info", "淇℃伅");
});
//鏀惰棌
shoucangFL.SetClickListener(() =>
{
+ KeyControl("collect", "鏀惰棌");
});
//鐢靛奖
dianyingFL.SetClickListener(() =>
{
-
+ KeyControl("movie", "鐢靛奖");
});
//濞变箰
yuleFL.SetClickListener(() =>
{
-
+ KeyControl("recreation", "濞变箰");
});
//鐢佃
dianshiFL.SetClickListener(() =>
{
-
+ KeyControl("tv", "鐢佃");
});
//绾㈣壊
redFL.SetClickListener(() =>
{
-
+ KeyControl("red", "绾㈣壊");
});
//榛勮壊
yellowFL.SetClickListener(() =>
{
-
+ KeyControl("yellow", "榛勮壊");
});
//钃濊壊
blueFL.SetClickListener(() =>
{
-
+ KeyControl("blue", "钃濊壊");
});
//1
number1FL.SetClickListener(() =>
{
-
+ KeyControl("number_1", "1");
});
//2
number2FL.SetClickListener(() =>
{
-
+ KeyControl("number_2", "2");
});
//3
number3FL.SetClickListener(() =>
{
+ KeyControl("number_3", "3");
});
//4
number4FL.SetClickListener(() =>
{
+ KeyControl("number_4", "4");
});
//5
number5FL.SetClickListener(() =>
{
+ KeyControl("number_5", "5");
});
//6
number6FL.SetClickListener(() =>
{
-
+ KeyControl("number_6", "6");
});
//7
number7FL.SetClickListener(() =>
{
-
+ KeyControl("number_7", "7");
});
//8
number8FL.SetClickListener(() =>
{
-
+ KeyControl("number_8", "8");
});
//9
number9FL.SetClickListener(() =>
{
+ KeyControl("number_9", "9");
});
//闊宠建
yinguiFL.SetClickListener(() =>
{
-
+ KeyControl("audio_track", "闊宠建");
});
//0
number0FL.SetClickListener(() =>
{
+ KeyControl("number_0", "0");
});
//瀛楀箷
zimuFL.SetClickListener(() =>
{
+ KeyControl("subtitle", "瀛楀箷");
});
//闈欓煶
jingyinFL.SetClickListener(() =>
{
+ KeyControl("mute", "闈欓煶");
});
//鎶曞睆
toupingFL.SetClickListener(() =>
{
+ KeyControl("main", "鎶曞睆");
});
//涓婚〉
zhuyeFL.SetClickListener(() =>
{
+ KeyControl("home", "涓婚〉");
});
//宸�
btnLeft.MouseDownEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
+ KeyControl("key_left", "宸�");
};
- //鍓�
- btnQian.MouseDownEventHandler += (sender, e) =>
+ //涓�
+ btnShang.MouseDownEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_qian_selected.png";
+ KeyControl("key_up", "涓�");
};
@@ -240,81 +253,99 @@
btnRight.MouseDownEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
+ KeyControl("key_right", "鍙�");
};
- //鍚�
- btnHou.MouseDownEventHandler += (sender, e) =>
+ //涓�
+ btnXia.MouseDownEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_hou_selected.png";
+ KeyControl("key_down", "涓�");
};
//OK
btnOk.MouseDownEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
+ KeyControl("key_ok", "纭畾");
};
- //鍔�
- btnJia.MouseDownEventHandler += (sen, e) => { };
- //鍑�
- btnJian.MouseDownEventHandler += (sen, e) => { };
- //涓�
- btnShang.MouseDownEventHandler += (sen, e) => { };
- //涓�
- btnXia.MouseDownEventHandler += (sen, e) => { };
+ //闊抽噺+
+ btnYingliangjia.MouseDownEventHandler += (sen, e) => {
+ KeyControl("volume_up", "闊抽噺+");
+ };
+ //闊抽噺-
+ btnYingliangjian.MouseDownEventHandler += (sen, e) => {
+ KeyControl("volume_down", "闊抽噺-");
+ };
+ //棰戦亾+
+ btnPindaojia.MouseDownEventHandler += (sen, e) => {
+ KeyControl("ch_up", "棰戦亾+");
+ };
+ //棰戦亾-
+ btnPindaojian.MouseDownEventHandler += (sen, e) => {
+ KeyControl("ch_down", "棰戦亾-");
+ };
//鑿滃崟
caidanFL.SetClickListener(() =>
{
+ KeyControl("menu", "鑿滃崟");
});
//杩斿洖
fanhuiFL.SetClickListener(() =>
{
+ KeyControl("return", "杩斿洖");
});
//涓婁竴閮�
shanyibuFL.SetClickListener(() =>
{
+ KeyControl("part_up", "涓婁竴閮�");
});
//鎾斁
bofangFL.SetClickListener(() =>
{
+ KeyControl("play", "鎾斁");
});
//涓嬩竴閮�
xiayibuFL.SetClickListener(() =>
{
-
+ KeyControl("part_down", "涓嬩竴閮�");
});
//蹇��
kuaituiFL.SetClickListener(() =>
{
-
+ KeyControl("fast_rewind", "蹇��");
});
//鏆傚仠
zantingFL.SetClickListener(() =>
{
-
+ KeyControl("pause", "鏆傚仠");
});
//蹇繘
kusinjinFL.SetClickListener(() =>
{
-
+ KeyControl("fast_forward", "蹇繘");
});
//鐏叧
dengguanFL.SetClickListener(() =>
{
+ KeyControl("lamp", "鐏叧");
});
//鍋滄
tingzhiFL.SetClickListener(() =>
{
+ KeyControl("stop", "鍋滄");
});
//鍗曟帶鐏�
dankongdengFL.SetClickListener(() =>
{
+ KeyControl("lamp_plc", "鍗曟帶鐏�");
});
@@ -692,7 +723,7 @@
layout.AddChidren(baseFl);
- btnJia = new Button
+ btnYingliangjia = new Button
{
Y = Application.GetRealHeight(32),
X = Application.GetRealWidth(26),
@@ -700,21 +731,21 @@
Height = Application.GetRealWidth(36),
UnSelectedImagePath = "AksIcon/ykq_jia.png",
};
- baseFl.AddChidren(btnJia);
+ baseFl.AddChidren(btnYingliangjia);
- btnJian = new Button
+ btnYingliangjian = new Button
{
- Y = btnJia.Bottom + Application.GetRealHeight(71),
+ Y = btnYingliangjia.Bottom + Application.GetRealHeight(71),
X = Application.GetRealWidth(26),
Width = Application.GetRealWidth(36),
Height = Application.GetRealWidth(36),
UnSelectedImagePath = "AksIcon/ykq_jian.png",
};
- baseFl.AddChidren(btnJian);
+ baseFl.AddChidren(btnYingliangjian);
- btnShang = new Button
+ btnPindaojia = new Button
{
Y = Application.GetRealHeight(32),
X = Application.GetRealWidth(170),
@@ -722,18 +753,18 @@
Height = Application.GetRealWidth(36),
UnSelectedImagePath = "AksIcon/ykq_shang.png",
};
- baseFl.AddChidren(btnShang);
+ baseFl.AddChidren(btnPindaojia);
- btnXia = new Button
+ btnPindaojian = new Button
{
- Y = btnShang.Bottom + Application.GetRealHeight(71),
+ Y = btnPindaojia.Bottom + Application.GetRealHeight(71),
X = Application.GetRealWidth(170),
Width = Application.GetRealWidth(36),
Height = Application.GetRealWidth(36),
UnSelectedImagePath = "AksIcon/ykq_xia.png",
};
- baseFl.AddChidren(btnXia);
+ baseFl.AddChidren(btnPindaojian);
@@ -760,14 +791,14 @@
- btnQian = new Button
+ btnShang = new Button
{
Width = Application.GetRealWidth(40),
Height = Application.GetRealHeight(30),
Gravity = Gravity.CenterHorizontal,
};
- okFl.AddChidren(btnQian);
+ okFl.AddChidren(btnShang);
btnRight = new Button
{
@@ -778,13 +809,13 @@
okFl.AddChidren(btnRight);
- btnHou = new Button
+ btnXia = new Button
{
Width = Application.GetRealWidth(40),
Height = Application.GetRealHeight(30),
Gravity = Gravity.BottomCenter,
};
- okFl.AddChidren(btnHou);
+ okFl.AddChidren(btnXia);
@@ -803,7 +834,7 @@
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
};
- btnQian.MouseUpEventHandler += (sender, e) =>
+ btnShang.MouseUpEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
@@ -813,7 +844,7 @@
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
};
- btnHou.MouseUpEventHandler += (sender, e) =>
+ btnXia.MouseUpEventHandler += (sender, e) =>
{
okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
@@ -1003,6 +1034,32 @@
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();
+ });
+ }
+ });
+
+ }
+
}
/// <summary>
@@ -1110,15 +1167,14 @@
{
clickFl.MouseDownEventHandler += (sender, e) =>
{
- //this.BackgroundColor = 0xff484378;
+ this.BackgroundColor = 0xff798394;
action?.Invoke();
};
clickFl.MouseUpEventHandler += (sender, e) =>
{
- //this.BackgroundColor = 0xff484378;
+ this.BackgroundColor = 0x00000000;
};
-
}
--
Gitblit v1.8.0