From 299f4b1218c0d3721aa92bf091950d6708942583 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index ceee580..32868bd 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1041,7 +1041,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 +1059,18 @@
{
pushType = PushType.Prompt.ToString();
}
-
+ else if (queryType == 4)
+ {
+ pushType = PushType.Property.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>
@@ -2375,6 +2379,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;
}
@@ -2633,5 +2638,52 @@
}
#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