From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 143 +++++++++++++++++++++++++++++++++++------------
1 files changed, 107 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 0944506..aec2776 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1004,7 +1004,15 @@
deviceName = OnAppConfig.Instance.PhoneName,
deviceType = deviceType,
produce = isProduce,
+
};
+ mAddpushinfoObj.languageType = Utlis.GetPostLanguageType();
+
+#if DEBUG
+ //List<string> communityCodes = new List<string>();
+ //communityCodes.Add("");
+ //mAddpushinfoObj.communityCodes = communityCodes;
+#endif
//var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
@@ -1041,7 +1049,7 @@
/// <summary>
/// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
/// </summary>
- /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+ /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
/// <returns></returns>
public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
{
@@ -1059,14 +1067,18 @@
{
pushType = PushType.Prompt.ToString();
}
-
+ else if (queryType == 4)
+ {
+ pushType = PushType.Notice.ToString();
+ }
var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
{
pushId = OnAppConfig.Instance.PushId,
pushType = pushType,
homeId = DB_ResidenceData.Instance.CurrentRegion.id,
});
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
+ //2021-08-28 鏀逛负鍒嗛〉鏌ヨ
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist_Paging, requestJson);
}
/// <summary>
@@ -1194,16 +1206,13 @@
/// </summary>
/// <param name="msgId"></param>
/// <returns></returns>
- public bool PushSerivceDeleteMessage(string msgId)
+ public bool PushSerivceDeleteMessage(PushMsgIdObj mPushMsgIdObj)
{
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
+ if (mPushMsgIdObj == null) return false;
try
{
- var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
- {
- msgId = msgId
- });
+ var requestJson = HttpUtil.GetSignRequestJson(mPushMsgIdObj);
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Deletepushinfo, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
@@ -1262,6 +1271,18 @@
{ IsBackground = true }.Start();
}
+ /// <summary>
+ /// 鑾峰彇鐗╀笟鍏憡璇︽儏
+ /// </summary>
+ /// <param name="noticeId"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetPropertyNoticeDetails(string noticeId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("noticeId", noticeId);
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_GetNoticeInfo, requestJson);
+ }
#endregion
#region 妫�娴嬫洿鏂�
@@ -1282,9 +1303,9 @@
- #endregion
+#endregion
- #region 鑾峰彇澶╂皵閮ㄥ垎
+#region 鑾峰彇澶╂皵閮ㄥ垎
/// <summary>
/// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅
/// </summary>
@@ -1352,10 +1373,10 @@
});
}
- #endregion
+#endregion
- #region 澶囦唤閮ㄥ垎
+#region 澶囦唤閮ㄥ垎
///// <summary>
///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
///// </summary>
@@ -1401,11 +1422,11 @@
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/UserBackupList", requestJson, true);
var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
- #region 鎭㈠鎴块棿鏁版嵁
+#region 鎭㈠鎴块棿鏁版嵁
GetBackupRoom(jt,loading);
- #endregion
+#endregion
Application.RunOnMainThread(() => {
loading.Hide();
@@ -1826,10 +1847,10 @@
}
*/
- #endregion
+#endregion
- #region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
/// <summary>
/// 鑾峰彇璁惧鍒楄〃
/// </summary>
@@ -1890,13 +1911,15 @@
/// <param name="productPlatform"></param>
/// <param name="productBrand"></param>
/// <returns></returns>
- public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName)
+ public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName,string pairCode = "")
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("spk", spk);
d.Add("extDevId", extDevId);
d.Add("name", deviceName);
+ d.Add("code", pairCode);
+
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson);
@@ -1959,7 +1982,7 @@
d.Add("actions", actionObjs);
var requestJson = HttpUtil.GetSignRequestJson(d);
- MainPage.Log($"{requestJson}");
+ MainPage.Log($"api鍔熻兘鎺у埗锛歿requestJson}");
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson);
}
/// <summary>
@@ -2059,9 +2082,9 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
}
- #endregion
+#endregion
- #region Kaede --鍦烘櫙鍔熻兘--------------------------
+#region Kaede --鍦烘櫙鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鍦烘櫙鍒楄〃
/// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
@@ -2193,9 +2216,9 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
}
- #endregion
+#endregion
- #region Kaede --鎴块棿鍔熻兘--------------------------
+#region Kaede --鎴块棿鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鎴块棿鍒楄〃
/// </summary>
@@ -2270,10 +2293,10 @@
return pack;
}
- #endregion
+#endregion
- #region Kaede -- 瀹夐槻鎺ュ彛____________________________
+#region Kaede -- 瀹夐槻鎺ュ彛____________________________
/// <summary>
/// 鑾峰彇瀹夐槻鍒楄〃
/// </summary>
@@ -2375,6 +2398,7 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("securitys", securityStates);
var requestJson = HttpUtil.GetSignRequestJson(d);
+ MainPage.Log($"api瀹夐槻鎺у埗锛歿requestJson}");
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_StatusSet, requestJson);
return pack;
}
@@ -2436,10 +2460,10 @@
return pack;
}
- #endregion
+#endregion
- #region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
+#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
/// <summary>
/// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛�
/// </summary>
@@ -2464,9 +2488,9 @@
return pack;
}
- #endregion
+#endregion
- #region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
+#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
/// <summary>
/// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
/// 2021-07-07 鏂版柟妗堟帴鍙ｈ皟鏁村鎺�
@@ -2479,10 +2503,10 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
}
- #endregion
+#endregion
- #region 鈻� 鍙瀵硅_________________________
+#region 鈻� 鍙瀵硅_________________________
/// <summary>
/// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
/// </summary>
@@ -2495,9 +2519,9 @@
var pack = HttpUtil.RequestHttpsPostFroHome( NewAPI.API_POST_FL_Check, requestJson);
return pack;
}
- #endregion
+#endregion
- #region 鈻� 闂ㄩ攣鐩稿叧____________________________
+#region 鈻� 闂ㄩ攣鐩稿叧____________________________
/// <summary>
/// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�)
@@ -2566,8 +2590,8 @@
return listSortLog;
}
- #endregion
- #region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
+#endregion
+#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
/// <summary>
/// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃
/// </summary>
@@ -2631,7 +2655,54 @@
var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
}
- #endregion
+#endregion
+
+ /// <summary>
+ /// 浜鸿劯褰曞叆
+ /// </summary>
+ /// <param name="imageBytes"></param>
+ /// <returns></returns>
+ public ResponsePackNew FaceSetting(string imageBytes)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("userFace", @"data:image/jpg;base64,"+imageBytes);
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+ //MainPage.Log(imageBytes);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_InputUserFace, requestJson);
+ }
+
+
+ /// <summary>
+ /// 淇敼浣忔埛浜鸿劯鍏抽棴鐘舵��
+ /// 1锛氬紑鍚姸鎬� 2锛氬叧闂姸鎬�
+ /// 3:娓呴櫎浜鸿劯鏁版嵁
+ /// </summary>
+ public ResponsePackNew EditFaceFunction(int status)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+ d.Add("faceClose", status);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_SwitchFaceFunction, requestJson);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇浣忔埛璇︽儏
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetCustomerInfo()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0