From ea3086b6213645a2a8a31734153462c23c120c5d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 16 十月 2023 16:51:37 +0800
Subject: [PATCH] 2023年10月16日16:51:34
---
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs | 5 +
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 7 +-
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs | 8 ++
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 19 +++---
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs | 17 +++--
HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs | 17 +++--
HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs | 64 +++++++++++++++++++++
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 19 +++---
9 files changed, 118 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index b659327..5235064 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
index e5bb27a..cc70d22 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksCommonMethod.cs
@@ -4,6 +4,13 @@
using Shared;
using HDL_ON.DAL.Server;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+using Android.Graphics;
+using Android.Media;
+using Java.Lang;
+using Java.Util.Streams;
+using static Android.Graphics.BlurMaskFilter;
+using static Android.Icu.Text.IDNA;
+using System.Threading;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
@@ -325,6 +332,63 @@
}
+ /// <summary>
+ /// 鑾峰彇銆愯嚜瀹氫箟銆戦仴鎺у櫒鎸夐敭鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<KeypadEntity> GetZdiKeypadList(RemoteControlEntity remoteControlEntity)
+ {
+ List<KeypadEntity> keypads = new List<KeypadEntity>();
+ string aksIcon = "AksIcon/";
+ keypads.Add(new KeypadEntity { keypad = "on_off", name = "寮�/鍏�", localIconAddress = $"{aksIcon}kai.png" });
+ keypads.Add(new KeypadEntity { keypad = "info", name = "淇℃伅", localIconAddress = $"{aksIcon}guan.png" });
+ keypads.Add(new KeypadEntity { keypad = "collect", name = "鏀惰棌", localIconAddress = $"{aksIcon}caidan.png" });
+ keypads.Add(new KeypadEntity { keypad = "movie", 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 = "recreation", name = "濞变箰", localIconAddress = $"{aksIcon}huikan.png" });
+ keypads.Add(new KeypadEntity { keypad = "tv", name = "鐢佃", localIconAddress = $"{aksIcon}quxiao.png" });
+ keypads.Add(new KeypadEntity { keypad = "red", name = "绾㈡寜閿�", localIconAddress = $"{aksIcon}gfyingliangjia.png" });
+ keypads.Add(new KeypadEntity { keypad = "yellow", name = "榛勬寜閿�", localIconAddress = $"{aksIcon}gf_ingliangjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "blue", name = "钃濇寜閿�", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "number_0", name = "0" });
+ 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 = "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 = "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 = "audio_track", name = "闊宠建", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "subtitle", name = "瀛楀箷", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "mute", name = "闈欓煶", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "main", name = "涓荤晫闈�", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "home", name = "涓婚〉", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "ch_up", name = "棰戦亾+", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "ch_down", name = "棰戦亾-", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "look_back", name = "鍥炵湅", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "cancel", name = "鍙栨秷", localIconAddress = $"{aksIcon}zdyanjian.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 = "menu", name = "鑿滃崟" });
+ keypads.Add(new KeypadEntity { keypad = "part_up", name = "涓婁竴閮�" });
+ keypads.Add(new KeypadEntity { keypad = "part_down", name = "涓嬩竴閮�" });
+ keypads.Add(new KeypadEntity { keypad = "fast_rewind", name = "蹇��" });
+ keypads.Add(new KeypadEntity { keypad = "fast_forward", name = "蹇繘" });
+ keypads.Add(new KeypadEntity { keypad = "stop", name = "鍋滄" });
+ keypads.Add(new KeypadEntity { keypad = "pause", name = "鏆傚仠", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "play", name = "鎾斁", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "lamp", name = "鐏厜1", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ keypads.Add(new KeypadEntity { keypad = "lamp_plc", name = "鐏厜2", localIconAddress = $"{aksIcon}zdyanjian.png" });
+ this.CheckKeyIsClick(remoteControlEntity, keypads);
+ return keypads;
+ }
+
/// <summary>
/// 鑾峰彇銆愭暟瀛椼�戞寜閿垪琛�
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index 1af1e6a..ef18b6e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -56,7 +56,7 @@
{
cornerFram.selectKeyAction += (keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
if (gfSingleFramLayout != null)
@@ -170,14 +170,15 @@
/// </summary>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
- private void KeyControl(string keypad, string keyName)
+ /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
+ private void KeyControl(string keypad, string keyName, bool isSupport)
{
//CommonMethod.Current.Loading.Start();
CommonMethod.Current.SunThread(() =>
{
try
{
- SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
}
catch { }
finally
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index 2cc2a11..b72884e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -76,37 +76,37 @@
//鍔熻兘閿帶鍒�
cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鏁板瓧閿帶鍒�
numberFrame.selectKeyAction += (keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鑿滃崟涓婃寜閿�
menuFram.SetTopClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟涓嬫寜閿�
menuFram.SetBottomClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟宸︽寜閿�
menuFram.SetLeftClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟鍙虫寜閿�
menuFram.SetRightClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟ok鎸夐敭
menuFram.SetOkClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
if (jdhSingleFramLayout != null)
@@ -358,14 +358,15 @@
/// </summary>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
- private void KeyControl(string keypad, string keyName)
+ /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
+ private void KeyControl(string keypad, string keyName, bool isSupport)
{
//CommonMethod.Current.Loading.Start();
CommonMethod.Current.SunThread(() =>
{
try
{
- SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
}
catch { }
finally
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index eb85390..92a43fd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -67,30 +67,30 @@
{
return;
}
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
menuFram.SetTopClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
menuFram.SetBottomClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
menuFram.SetLeftClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
menuFram.SetRightClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
menuFram.SetOkClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
@@ -235,14 +235,15 @@
/// </summary>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
- private void KeyControl(string keypad, string keyName)
+ /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
+ private void KeyControl(string keypad, string keyName, bool isSupport)
{
//CommonMethod.Current.Loading.Start();
CommonMethod.Current.SunThread(() =>
{
try
{
- SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
}
catch { }
finally
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
index c3c0b36..1c07079 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
@@ -130,9 +130,15 @@
/// <param name="rcId">閬ユ帶鍣╥d</param>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
+ /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
/// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
- public bool KeypadExecute(string deviceId, string rcId, string keypad,string keyName, TipType tipType = TipType.flicker)
+ public bool KeypadExecute(string deviceId, string rcId, string keypad, string keyName, bool isSupport, TipType tipType = TipType.flicker)
{
+
+ if (!isSupport) {
+ CommonMethod.Current.ShowTip("鎸夐敭涓嶆敮鎸�.", 3);
+ return false;
+ }
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", deviceId);//璁惧id
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index f1e0f1a..9143f56 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -75,43 +75,43 @@
//鍔熻兘閿帶鍒�
cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鏁板瓧閿帶鍒�
numberFrame.selectKeyAction += (keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鑿滃崟涓婃寜閿�
menuFram.SetTopClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟涓嬫寜閿�
menuFram.SetBottomClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟宸︽寜閿�
menuFram.SetLeftClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟鍙虫寜閿�
menuFram.SetRightClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟ok鎸夐敭
menuFram.SetOkClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
if (tvSingleFramLayout != null)
@@ -366,14 +366,15 @@
/// </summary>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
- private void KeyControl(string keypad, string keyName)
+ /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
+ private void KeyControl(string keypad, string keyName,bool isSupport)
{
//CommonMethod.Current.Loading.Start();
CommonMethod.Current.SunThread(() =>
{
try
{
- SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
}
catch { }
finally
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index 63f2a72..ccbde80 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -64,37 +64,37 @@
//鍔熻兘閿帶鍒�
cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鑿滃崟涓婃寜閿�
menuFram.SetTopClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟涓嬫寜閿�
menuFram.SetBottomClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟宸︽寜閿�
menuFram.SetLeftClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟鍙虫寜閿�
menuFram.SetRightClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟ok鎸夐敭
menuFram.SetOkClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
if (typeMultiFramLayout != null)
{
@@ -194,14 +194,15 @@
/// </summary>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
- private void KeyControl(string keypad, string keyName)
+ /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
+ private void KeyControl(string keypad, string keyName, bool isSupport)
{
//CommonMethod.Current.Loading.Start();
CommonMethod.Current.SunThread(() =>
{
try
{
- SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
}
catch { }
finally
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 5e49151..d0c9130 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -1133,14 +1133,15 @@
/// </summary>
/// <param name="keypad"><鎸夐敭鏍囪瘑/param>
/// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
- private void KeyControl(string keypad, string keyName)
+
+ private void KeyControl(string keypad, string keyName,bool isSupport=true)
{
//CommonMethod.Current.Loading.Start();
CommonMethod.Current.SunThread(() =>
{
try
{
- SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
}
catch { }
finally
--
Gitblit v1.8.0