From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 731c865..d818a1c 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -22,13 +22,10 @@
var sss = Newtonsoft.Json.Linq.JObject.FromObject("sss");
var xxx = homeJsonStr.GetValue("xxx").ToString(),
-
- Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("Id", fId);
- var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-
-
- */
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("Id", fId);
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ */
string severAddress = "https://global.hdlcontrol.com/ProposedProductionApi";
@@ -41,7 +38,7 @@
/// <summary>
/// 鑾峰彇浼犳劅鍣ㄥ巻鍙叉暟鎹�
/// </summary>
- /// <param name="qType">鏃堕棿鏌ヨ绫诲瀷锛歨our=杩�24灏忔椂銆亀eek=杩戜竴鍛ㄣ�乵onth = 杩戜竴鏈� </param>
+ /// <param name="qType">鏃堕棿鏌ヨ绫诲瀷锛歨our=杩�24灏忔椂銆乨ay_hour =鏌愭棩24灏忔椂銆亀eek=杩戜竴鍛ㄣ�乵onth = 杩戜竴鏈堛�乧ustom_month=鏌愬勾鏌愭湀 y/M銆乧ustom_year=鏌愬勾 y</param>
/// <param name="deviceId">璁惧ID</param>
/// <param name="deviceKey">鍔熻兘鏌ヨ绫诲瀷锛歱m25</param>
/// <param name="time">鍏蜂綋鏌ヨ鐨勬棩鏈燂紝閲戣寕娓╂帶鍣ㄤ娇鐢�</param>
@@ -1202,7 +1199,6 @@
deviceName = OnAppConfig.Instance.PhoneName,
deviceType = deviceType,
produce = isProduce,
-
};
mAddpushinfoObj.languageType = Utlis.GetPostLanguageType();
@@ -1229,7 +1225,6 @@
return true;
}
}
-
}
else
{
--
Gitblit v1.8.0