From bdc8f378f6d736fda030b3ceceab3acd91505679 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 16:10:50 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-cqy（1.5.9）
---
HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index d631763..7aed7ce 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -86,7 +86,7 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", functionIds);
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus, "鍒锋柊璁惧鐘舵��");
- if (!this.dataChecking(responsePackNew))
+ if (!this.DataChecking(responsePackNew))
{
return;
}
@@ -123,7 +123,7 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", new List<string> { music.deviceId });
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_PlayerList, "鑾峰彇闊充箰鍒楄〃");
- if (!this.dataChecking(responsePackNew))
+ if (!this.DataChecking(responsePackNew))
{
return;
}
@@ -173,7 +173,7 @@
}
d.Add("deviceInfos", new List<Dictionary<string, object>> { deviceIds });
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupList, "鑾峰彇鍒楄〃鍚嶅垪琛�");
- if (!this.dataChecking(responsePackNew))
+ if (!this.DataChecking(responsePackNew))
{
return new List<GroupList>();
}
@@ -238,7 +238,7 @@
d.Add("sidGroups", new List<Dictionary<string, object>> { d1 });
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupPlayerList, "閫氳繃鍒楄〃鍚嶈幏鍙栨瓕鏇插垪琛�");
- if (!this.dataChecking(responsePackNew))
+ if (!this.DataChecking(responsePackNew))
{
return new List<PalyerSongListInfo>();
}
@@ -282,10 +282,11 @@
/// </summary>
/// <param name="responsePackNew">鍥炲鏁版嵁瀵硅薄</param>
/// <returns></returns>
- private bool dataChecking(ResponsePackNew responsePackNew)
+ private bool DataChecking(ResponsePackNew responsePackNew)
{
- if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+ if (responsePackNew.Data == null||responsePackNew.Code != "0" || responsePackNew.Data.ToString() == "")
{
+
return false;
}
return true;
--
Gitblit v1.8.0