From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
index c276894..fe4a21d 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;
@@ -357,7 +358,7 @@
}
/// <summary>
- /// 鑾峰彇褰辩墖
+ /// 鑾峰彇褰辩墖鍥剧墖
/// </summary>
/// <param name="imageUrl">鍥剧墖鍦板潃</param>
public byte[] GetImage(string imageUrl, int mTimeout = 3)
--
Gitblit v1.8.0