From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 229 +++++++++++++++++++-------------------------------------
1 files changed, 79 insertions(+), 150 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 376cf97..a69664e 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -50,7 +50,7 @@
/// <param name="nowMonth"></param>
/// <param name="mac"></param>
/// <returns></returns>
- public ResponsePack GetSensorHistory(int subnetId, int deviceId, int bigClass, int minClass, int queryType, int loopId, int nowMonth, string mac)
+ public ResponsePack GetSensorHistory(int subnetId,int deviceId,int bigClass,int minClass,int queryType,int loopId,int nowMonth,string mac)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("SubnetID", subnetId);
@@ -63,7 +63,7 @@
d.Add("MAC", DB_ResidenceData.residenceData.residenceGatewayMAC);
d.Add("LocalTimeZone", 8);
var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString, true);
+ return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString,true);
}
@@ -91,166 +91,99 @@
return result;
}
- #region 鈻� 閫氱敤璇锋眰鎺ュ彛_______________________
- /// <summary>
- /// 鏍规鐢ㄦ埛璐﹀彿鑾峰彇娉ㄥ唽鍖哄煙 鍏嶇櫥褰� // 妫�娴嬭处鍙锋槸鍚︽敞鍐屼篃鐢ㄨ繖涓帴鍙�
- /// </summary>
- /// <param name="account"></param>
- /// <returns></returns>
- public ResponsePackNew GetRegionByAccount(string account)
- {
- var requestJson = HttpUtil.GetSignRequestJson(new RegionByAccountObj() { account = account });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson);
- }
-
- /// <summary>
- /// 鍒锋柊Token
- /// </summary>
- /// <returns></returns>
- public bool RefreshToken()
- {
- var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
- {
- refreshToken = MainPage.LoginUser.refreshToken,
- });
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
- if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
- {
- var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
- MainPage.LoginUser.loginTokenString = revertData.headerPrefix + revertData.accessToken;
- MainPage.LoginUser.lastTime = DateTime.Now;
- MainPage.LoginUser.SaveUserInfo();
- return true;
- }
- return false;
- }
-
- #endregion
-
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
/// <summary>
- /// 鑾峰彇璇锋眰鎻愪氦鐨勮瑷�鍙傛暟
- /// </summary>
- public string GetPostLanguageType()
- {
- return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
- }
-
- /// <summary>
- /// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
- /// </summary>
- /// <param name="verifyType">1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱櫥闄� 4:缁戝畾</param>
- /// <param name="account">閭鎴栬�呮墜鏈哄彿</param>
- /// <param name="isPhone">鏄惁鎵嬫満</param>
- /// <param name="phoneZoneCode">鎵嬫満鍥藉鍖哄彿</param>
- /// <returns></returns>
- public ResponsePackNew VerificationCodeSend(VerifyType verifyType, string account, bool isPhone = false, string phoneZoneCode = "86")
- {
- var requestObj = new VerifyCodeSendObj()
- {
- verifyType = (int)verifyType,
- languageType = GetPostLanguageType()
- };
- // 鏄惁鏄墜鏈�
- if (isPhone)
- {
- requestObj.phone = account;
- requestObj.phonePrefix = phoneZoneCode;
- }
- else
- {
- requestObj.mail = account;
- }
- // 瓒呮椂鏃堕棿璁剧疆涓�20绉掞紝搴旇娴嬭瘯娴峰鏈嶅姟鍣ㄥ彂閫侀獙璇佺爜鍝嶅簲鏃堕棿寰堜箙
- var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Send, requestJson, "", "", HttpUtil.TIME_OUT_LONG);
- }
-
- /// <summary>
/// 璐﹀彿鐧诲綍-浣跨敤瀵嗙爜
/// </summary>
- /// <param name="account">璐﹀彿</param>
- /// <param name="password">瀵嗙爜</param>
- /// <returns></returns>
- public ResponsePackNew LoginByPassword(string account, string password)
+ public ResponsePack LoginByPassword(string account, string password)
{
- var requestJson = HttpUtil.GetSignRequestJson(new LoginObj()
- {
- account = account,
- loginPwd = password
- });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
+ string jsonString = "{" +
+ "\"Account\":" + "\"" + account + "\"" + "," +
+ "\"Password\":" + "\"" + password + "\"" +
+ "}";
+ return RequestHttps($"{severAddress}/ZigbeeUsers/Login", jsonString, false);
}
/// <summary>
/// 楠岃瘉鐮佺櫥褰�
/// </summary>
- /// <param name="account">璐﹀彿</param>
- /// <param name="vCode">楠岃瘉鐮�</param>
- /// <returns></returns>
- public ResponsePackNew LoginValidCode(string account, string vCode)
+ public ResponsePack LoginValidCode(string account,string vCode)
{
- var requestJson = HttpUtil.GetSignRequestJson(new LoginObj()
- {
- account = account,
- verifyCode = vCode,
- grantType = "verify"
- });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("Account", account);
+ d.Add("Code", vCode);
+ d.Add("Language", Language.CurrentLanguage);
+ d.Add("AreaCode", "86");
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/LoginValidCode", jsonString, false);
+ }
+
+ /// <summary>
+ /// 鎵嬫満鍙风爜娉ㄥ唽
+ /// </summary>
+ /// <param name="mobileNumber"></param>
+ /// <param name="password"></param>
+ /// <param name="language"></param>
+ public ResponsePack RegisterPhone(string mobileNumber, string password, string language)
+ {
+ string jsonString = "{" +
+ "\"Account\":" + "\"" + mobileNumber + "\"" + "," +
+ "\"Password\":" + "\"" + password + "\"" + "," +
+ "\"Language\":" + "\"" + language + "\"" +
+ "\"AreaCode\":" + "\"" + "86" + "\"" +
+ "}";
+ return RequestHttps($"{severAddress}/SignIn", jsonString, false);
+ }
+
+ public ResponsePack GetAreaCode()
+ {
+ string requestJson = "{}";
+ return RequestHttps($"{severAddress}/ZigbeeUsers/GetAreaCode", requestJson, false);
}
/// <summary>
/// 楠岃瘉鐭俊鎴栬�呴偖绠遍獙璇佺爜锛屼箣鍚庢敞鍐�
/// </summary>
- /// <param name="account">閭鎴栬�呮墜鏈哄彿</param>
+ /// <param name="account">璐﹀彿</param>
/// <param name="password">瀵嗙爜</param>
+ /// <param name="entryPassword">纭瀵嗙爜</param>
/// <param name="code">楠岃瘉鐮�</param>
- /// <param name="isPhone">鏄惁鎵嬫満</param>
+ /// <param name="areaCode"></param>
/// <returns></returns>
- public ResponsePackNew ValidataCodeAndRegister(string account, string password, string code, bool isPhone = false)
+ public ResponsePack ValidataCodeAndRegister(string account, string password, string entryPassword, string code, int areaCode)
{
- var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code, memberName = account };
- if (isPhone)
- {
- requestObj.memberPhone = account;
- }
- else
- {
- requestObj.memberEmail = account;
- }
- var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson);
+ //var requestObj = new ValidateSmsCodeObj() { Phone = accout, Code = code };
+ //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ string requestJson = "{" +
+ "\"Account\":" + "\"" + account + "\"" + "," +
+ "\"Password\":" + "\"" + password + "\"" + "," +
+ "\"EnterPassword\":" + "\"" + entryPassword + "\"" + "," +
+ "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
+ "\"Code\":" + "\"" + code + "\"" + "," +
+ "\"RegisterSoruce\":" + 0 + "," +
+ "\"AreaCode\":" + 86 +
+ "}";
+ return RequestHttps($"{severAddress}/ZigbeeUsers/ValidataCodeAndRegisterAccount", requestJson, false);
}
+
/// <summary>
- /// 蹇樿瀵嗙爜锛岄噸缃瘑鐮�
+ /// 鑾峰彇娉ㄥ唽楠岃瘉鐮�
/// </summary>
- /// <param name="account">閭鎴栬�呮墜鏈哄彿</param>
- /// <param name="password">鏂板瘑鐮�</param>
- /// <param name="vCode">楠岃瘉鐮�</param>
- /// <param name="isPhone">鏄惁鎵嬫満璐﹀彿</param>
- /// <returns></returns>
- public ResponsePackNew ForgetPassword(string account, string password, string vCode, bool isPhone)
+ public ResponsePack GetRegisterVerCode(string account)
{
- var requestObj = new ForgetPwdObj() { verifyCode = vCode, loginPwd = password };
- if (isPhone)
- {
- //鎵嬫満蹇樿瀵嗙爜
- requestObj.memberPhone = account;
- }
- else
- {
- //閭蹇樿瀵嗙爜
- requestObj.memberEmail = account;
- }
- var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson);
+ string jsonString = "{" +
+ "\"Account\":" + "\"" + account + "\"" + "," +
+ "\"Company\":" + MainPage.Company + "," +
+ "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
+ "\"AreaCode\":" + 86 +
+ "}";
+ return RequestHttps($"{severAddress}/ZigbeeUsers/RegisterSendVerCode", jsonString, false);
+
}
-
-
-
+
/// <summary>
@@ -261,7 +194,7 @@
string jsonString = "{" +
"\"Account\":" + "\"" + account + "\"" + "," +
- "\"AreaCode\":" + "86" +
+ "\"AreaCode\":" + "86" +
"}";
return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
}
@@ -297,8 +230,6 @@
return RequestHttps($"{severAddress}/ZigbeeUsers/ValidatorCode", jsonString, false);
}
-
-
/// <summary>
/// 閲嶈瀵嗙爜
/// </summary>
@@ -326,7 +257,7 @@
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
- if (revertObj.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
+ if (revertObj.StateCode.ToUpper() == "SUCCESS")
{
var dataStr = JObject.FromObject(revertObj.ResponseData);
//"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109", < !--甯愬彿Id-- >
@@ -347,8 +278,7 @@
fs.Flush();
MainPage.LoginUser.headImagePagePath = filePath;
}
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
MainPage.Log($"download headImage error : {ex.Message}");
}
@@ -432,9 +362,9 @@
"\"HomeType\":" + "\"" + "1" + "\"" + "," +
"\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
"}";
- var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
+ var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);
- if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
+ if (responsePack.StateCode.ToUpper() == "SUCCESS")
{
var dataStr = JObject.FromObject(responsePack.ResponseData);
//娌℃湁浣忓畢
@@ -552,7 +482,7 @@
/// <param name="nickName"></param>
/// <param name="subAccountGuid"></param>
/// <returns></returns>
- public ResponsePack EditSubAccountNickName(string nickName, string subAccountGuid)
+ public ResponsePack EditSubAccountNickName(string nickName,string subAccountGuid)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("SubAccountGuid", subAccountGuid);
@@ -592,7 +522,7 @@
/// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
/// </summary>
/// <returns></returns>
- public ResponsePack GetShareData(string memberId, string hId)
+ public ResponsePack GetShareData(string memberId,string hId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("DistributedMark", memberId);
@@ -664,7 +594,7 @@
/// <param name="subAccount"></param>
/// <param name="nickName"></param>
/// <returns></returns>
- public ResponsePack BindResidenceMemberAccount(string subAccount, string nickName)
+ public ResponsePack BindResidenceMemberAccount(string subAccount,string nickName)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("SubAccount", subAccount);
@@ -744,8 +674,7 @@
}
System.Threading.Thread.Sleep(1000);
}
- Shared.Application.RunOnMainThread(() =>
- {
+ Shared.Application.RunOnMainThread(() => {
try
{
HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
@@ -762,7 +691,7 @@
/// 璇锋眰Mqtt鏁版嵁
/// </summary>
/// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param>
- public ResponsePack RequestMqttInfo(string dataStringJson)
+ public ResponsePack RequestMqttInfo( string dataStringJson)
{
ResponsePack revertObj = null;
@@ -808,7 +737,7 @@
/// <summary>
/// 鑾峰彇浣忓畢澶囦唤鍒楄〃
/// </summary>
- public Dictionary<int, string> GetRegionLastBackupId()
+ public Dictionary<int,string> GetRegionLastBackupId()
{
//Dialog dialog = new Dialog();
//dialog.Show();
@@ -818,7 +747,7 @@
d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200);
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true);
- if (revertObj == null || revertObj.ResponseData == null)
+ if(revertObj == null || revertObj.ResponseData == null)
{
return new Dictionary<int, string>();
}
--
Gitblit v1.8.0