From 06a320d7e207a7da06b207346d1106c13dd82901 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 30 八月 2022 15:23:45 +0800 Subject: [PATCH] 2022年08月30日15:23:36 --- HDL_ON/DAL/Server/HttpUtil.cs | 4 ++-- HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 17 ++++++++++------- HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs | 36 +++++++++++++++++++++++------------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs index 015e50c..fef52b7 100644 --- a/HDL_ON/DAL/Server/HttpUtil.cs +++ b/HDL_ON/DAL/Server/HttpUtil.cs @@ -18,8 +18,8 @@ /// 鍏叡鍩熷悕灏辫繎瑙f瀽 /// </summary> - //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; - public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm + public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; + //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary> diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs index 0c1a78e..bb125ff 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs @@ -462,13 +462,16 @@ /// <summary> ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� /// </summary> + /// <param name="o">鍙戦�佹暟鎹�</param> + /// <param name="api_Url">璇锋眰鍦板潃(涓嶆槸缁濆鍦板潃)</param> + /// <param name="tag">鏍囪->鎻忚堪鎺ュ彛(鑷畾涔�)</param> /// <returns></returns> - public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag,int mTimeout = 3) + public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag,int mTimeout = 3) { - Log($"{DateTime.Now}->鍙戦��->{tag}", o.ToString()); + Log($"{DateTime.Now}->鍙戦��->{tag}", api_Url,o.ToString()); var requestJson = HttpUtil.GetSignRequestJson(o); var r= HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout); - Log($"{DateTime.Now}->鍥炲->{tag}", Newtonsoft.Json.JsonConvert.SerializeObject(r)); + Log($"{DateTime.Now}->鍥炲->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r)); return r; } @@ -481,10 +484,10 @@ /// <returns></returns> public ResponsePackNew RequestServer(object o, string api_Url,string tag) { - Log($"鍙戦��->{tag}", o.ToString()); + Log($"鍙戦�佹暟鎹�->{tag}", api_Url, o.ToString()); var requestJson = HttpUtil.GetSignRequestJson(o); var r = HttpUtil.RequestHttpsPost(api_Url, requestJson); - Log($"鍥炲->{tag}", Newtonsoft.Json.JsonConvert.SerializeObject(r)); + Log($"鍥炲鏁版嵁->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r)); return r; } /// <summary> @@ -521,10 +524,10 @@ /// </summary> /// <param name="tag">鎵撳嵃鏍囪</param> /// <param name="content">鎵撳嵃鍐呭</param> - public void Log(string tag, string content) + public void Log(string tag,string url, string content) { #if DEBUG - Console.WriteLine(tag + $"\r\n鏁版嵁鍐呭->->{content}"); + Console.WriteLine(tag + $"\r\n{url}\r\n{content}"); #endif } diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs index d37b603..ae44c70 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs @@ -6,13 +6,14 @@ using System.Text; using HDL_ON.DAL.Server; using HDL_ON.Entity; +using Newtonsoft.Json.Linq; using Shared; namespace HDL_ON.UI.Music { public class SendMethod { - private static SendMethod s_Current= null; + private static SendMethod s_Current = null; public static SendMethod Current { get @@ -44,7 +45,7 @@ { new System.Threading.Thread(() => { - DriverLayer.Control.Ins.SendWriteCommand(function, dic,false,0); + DriverLayer.Control.Ins.SendWriteCommand(function, dic, false, 0); }) { IsBackground = true }.Start(); } @@ -92,7 +93,7 @@ Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("deviceIds", functionIds); - var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus); + var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus, "鍒锋柊璁惧鐘舵��"); if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "") { return; @@ -129,7 +130,7 @@ Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("deviceIds", new List<string> { music.deviceId }); - var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_PlayerList); + var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_PlayerList, "鑾峰彇闊充箰鍒楄〃"); if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "") { return; @@ -165,7 +166,7 @@ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId); d.Add("deviceIds", new List<string> { music.deviceId }); - var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupList); + var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupList, "鑾峰彇鍒楄〃鍚嶅垪琛�"); if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "") { return new List<GroupList>(); @@ -204,19 +205,26 @@ d1.Add("groupList", new List<Dictionary<string, object>> { d2 }); d.Add("sidGroups", new List<Dictionary<string, object>> { d1 }); - var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupPlayerList); + var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupPlayerList, "鑾峰彇鍒楄〃闊充箰"); if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "") { return new PalyList(); } //鏁版嵁杩斿簭鍒楀寲涓篎unction瀵硅薄 var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data); - var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<PalyList>(str); + var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyListInfo>>(str); if (palyLists == null) { - palyLists = new PalyList(); + palyLists = new List<PalyListInfo>(); } - return palyLists; + + if (palyLists.Count == 0) + { + return new PalyList(); + } + //榛樿绗竴涓垪琛ㄩ噷闈㈢涓�涓煶涔愬垪琛� + return palyLists[0].playlist.Count > 0 ? palyLists[0].playlist[0] : new PalyList(); + } catch { @@ -227,12 +235,14 @@ /// <summary> ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� /// </summary> + /// <param name="o">鍙戦�佹暟鎹�</param> + /// <param name="api_Url">璇锋眰鍦板潃(涓嶆槸缁濆鍦板潃)</param> + /// <param name="tag">鏍囪->鎻忚堪鎺ュ彛(鑷畾涔�)</param> /// <returns></returns> - public ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 5) + public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag, int mTimeout = 5) { - var requestJson = HttpUtil.GetSignRequestJson(o); - return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout); - + JObject jobject = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(o)); + return UI2.Intelligence.Automation.Send.Current.RequestServerhomeId(jobject, api_Url, tag, mTimeout); } } } -- Gitblit v1.8.0