From 0138387222867fb6259599959772f38f69863404 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 20:05:38 +0800
Subject: [PATCH] 2020-11-23 1.检测更新Dialog实现。2.新绑定手机号增加国家区域选择UI
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 326 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 240 insertions(+), 86 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f33c54d..9ba2fdf 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -3,6 +3,7 @@
using System.IO;
using System.Net;
using System.Text;
+using HDL_ON.DAL.Net;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;
@@ -67,29 +68,29 @@
}
- public string GetRequestResultMsg(string resultCode)
- {
- string result = "";
- switch (resultCode.ToUpper())
- {
- case "USERNAMEORPWDERROR":
- result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- break;
- case "ACCOUNTNOEXISTS":
- result = Language.StringByID(StringId.ACCOUNTNOEXISTS);
- break;
- case "SENDFAIL":
- result = Language.StringByID(StringId.FailedToSendVerificationCode);
- break;
- case "EXIST":
- result = Language.StringByID(StringId.AccountAlreadyUse);
- break;
- case "Self:Net_Error":
- result = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
- return result;
- }
+ //public string GetRequestResultMsg(string resultCode)
+ //{
+ // string result = "";
+ // switch (resultCode.ToUpper())
+ // {
+ // case "USERNAMEORPWDERROR":
+ // result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
+ // break;
+ // case "ACCOUNTNOEXISTS":
+ // result = Language.StringByID(StringId.ACCOUNTNOEXISTS);
+ // break;
+ // case "SENDFAIL":
+ // result = Language.StringByID(StringId.FailedToSendVerificationCode);
+ // break;
+ // case "EXIST":
+ // result = Language.StringByID(StringId.AccountAlreadyUse);
+ // break;
+ // case "Self:Net_Error":
+ // result = Language.StringByID(StringId.NetworkAnomaly);
+ // break;
+ // }
+ // return result;
+ //}
#region 鈻� 閫氱敤璇锋眰鎺ュ彛_______________________
/// <summary>
@@ -111,15 +112,15 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
{
- refreshToken = UserInfo.Current.refreshToken,
+ refreshToken = UserInfo.Current.refreshToken,
});
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
- UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
- UserInfo.Current.lastTime = DateTime.Now;
- UserInfo.Current.SaveUserInfo();
+ UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.lastTime = DateTime.Now;
+ UserInfo.Current.SaveUserInfo();
return true;
}
return false;
@@ -259,7 +260,7 @@
/// <returns></returns>
public ResponsePackNew ValidatorCode(VerifyType verifyType, string account, string code, bool isPhone, bool verifySuccessFail = true)
{
- var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType , verifySuccessFail = verifySuccessFail };
+ var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType, verifySuccessFail = verifySuccessFail };
if (isPhone)
{
//鎵嬫満
@@ -288,26 +289,26 @@
if (resultObj.Code == StateCode.SUCCESS)
{
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
- UserInfo.Current.userEmailInfo = info.memberEmail;
- UserInfo.Current.userMobileInfo = info.memberPhone;
- UserInfo.Current.userName = info.memberName;
- UserInfo.Current.areaCode = info.memberPhonePrefix;
+ UserInfo.Current.userEmailInfo = info.memberEmail;
+ UserInfo.Current.userMobileInfo = info.memberPhone;
+ UserInfo.Current.userName = info.memberName;
+ UserInfo.Current.areaCode = info.memberPhonePrefix;
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
var headImageBytes = DownHeadImage();
- if (headImageBytes != null)
+ if (headImageBytes != null && headImageBytes.Length > 0)
{
- UserInfo.Current.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePageBytes = headImageBytes;
FileStream fs = null;
try
{
- UserInfo.Current.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePageBytes = headImageBytes;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
fs.Write(headImageBytes, 0, headImageBytes.Length);
fs.Flush();
- UserInfo.Current.headImagePagePath = filePath;
+ UserInfo.Current.headImagePagePath = filePath;
}
catch (Exception ex)
{
@@ -324,7 +325,7 @@
}
}
- UserInfo.Current.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
@@ -395,10 +396,11 @@
/// <returns></returns>
public ResponsePackNew EditUserName(string userName)
{
- var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes() {
- memberName = userName
- });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes()
+ {
+ memberName = userName
+ });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
/// <summary>
@@ -425,7 +427,7 @@
/// <returns></returns>
public string BindAccount(string account, string code = "", bool isPhone = false)
{
- var requestObj = new BindWithAccountObj() { verifyCode = code};
+ var requestObj = new BindWithAccountObj() { verifyCode = code };
if (isPhone)
{
//鎵嬫満
@@ -447,7 +449,7 @@
/// <returns></returns>
public string UnBindAccount(bool isPhone)
{
- var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE": "EMAIL" };
+ var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE" : "EMAIL" };
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code;
}
@@ -462,17 +464,18 @@
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });
var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
- if(resultObj.Code == StateCode.SUCCESS)
+ if (resultObj.Code == StateCode.SUCCESS)
{
var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
- if (homeList == null || homeList.Count == 0) {
+ if (homeList == null || homeList.Count == 0)
+ {
}
else
{
- UserInfo.Current.regionList = new List<RegionInfoRes>();
-
+ UserInfo.Current.regionList = new List<RegionInfoRes>();
+
foreach (var mHome in homeList)
{
var home = new RegionInfoRes()
@@ -496,16 +499,17 @@
{
continue;
}
- UserInfo.Current.regionList.Add(home);
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
- {
- DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
- }
+ UserInfo.Current.regionList.Add(home);
+ }
+
+ if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
+ {
+ DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
}
DB_ResidenceData.residenceData.SaveResidenceData();
- UserInfo.Current.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
}
-
+
}
return resultObj.Code;
@@ -596,11 +600,11 @@
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
};
- if(editId == 0)
+ if (editId == 0)
{
requestObj.homeName = editName;
}
- else if(editId == 1)
+ else if (editId == 1)
{
requestObj.Address = editName;
}
@@ -623,7 +627,7 @@
var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
{
- if(mHomeGatewayRes != null)
+ if (mHomeGatewayRes != null)
{
if (mHomeGatewayRes.Count > 0)
{
@@ -636,7 +640,7 @@
}
DB_ResidenceData.residenceData.SaveResidenceData();
}
-
+
if (mHomeGatewayRes != null)
{
//Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count);
@@ -725,7 +729,7 @@
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
childAccountId = childAccountId
});
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
}
@@ -810,7 +814,7 @@
homeId = shareData.homeId,
homeShareId = shareData.id
});
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
//Dictionary<string, string> d = new Dictionary<string, string>();
//d.Add("DistributedMark", shareData.DistributedMark);
//d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
@@ -856,6 +860,155 @@
string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
}
+
+ #endregion
+
+ /// <summary>
+ /// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛
+ /// </summary>
+ public MqttInfo GetMqttRemoteInfo(string attachClientId)
+ {
+ try
+ {
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
+ {
+ attachClientId = attachClientId,
+ homeType = HomeTypeEnum.BUSPRO.ToString()
+ });
+ var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo>(revertObj.Data.ToString());
+ }
+ else
+ {
+ Utlis.WriteLine("GetMqttRemoteInfo error");
+ return null;
+ }
+ }
+ catch
+ {
+ return null;
+ }
+ }
+
+ #region 鎺ㄩ��
+ // /// <summary>
+ // /// 鎻愪氦鎺ㄩ�侀渶瑕佺殑鍏抽敭鏍囪瘑淇℃伅
+ // /// </summary>
+ // public bool PushserivceAddPushInfo()
+ // {
+ // try
+ // {
+ // string DeviceType = "Android";
+ //#if __IOS__
+ // DeviceType = "Iphone";
+ //#endif
+ // //鏄惁鐢熸垚妯″紡
+ // bool isProduce = true;
+ //#if DEBUG
+ // isProduce = false;
+ //#endif
+
+ // if (string.IsNullOrEmpty(UserConfig.Instance.tokenID)) return false;
+
+ // var mAddpushinfoObj = new AddpushinfoObj()
+ // {
+ // pushid = UserConfig.Instance.tokenID,
+ // deviceName = UserConfig.Instance.phoneName,
+ // deviceType = DeviceType,
+ // produce = isProduce,
+
+ // };
+ // var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
+ // var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Pushserivce_Addpushinfo, mAddpushinfoJson);
+ // if (revertObj.Code == StateCode.SUCCESS)
+ // {
+ // if (revertObj.Data != null)
+ // {
+ // var pushId = revertObj.Data.ToString();
+ // if (!string.IsNullOrEmpty(pushId))
+ // {
+ // UserConfig.Instance.PushId = pushId;
+ // UserConfig.Instance.SaveUserConfig();
+ // return true;
+ // }
+ // }
+ // Utlis.WriteLine("Addpushinfo 鎴愬姛");
+ // }
+ // else
+ // {
+ // Utlis.WriteLine("Addpushinfo 澶辫触");
+ // }
+
+ // return false;
+ // }
+ // catch
+ // {
+ // return false;
+ // }
+ // }
+
+ // /// <summary>
+ // /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
+ // /// </summary>
+ // /// <returns></returns>
+ // public ResponsePackNew PushserivceGetpushmessagelist()
+ // {
+ // var urlSegmentDic = HttpUtil.GetBaseQueryDictionary();
+ // urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
+ // return HttpUtil.RequestHttpsGet(NewAPI.API_GET_Pushserivce_Getpushmessagelist, null, urlSegmentDic);
+ // }
+
+ // /// <summary>
+ // /// 娓呯┖娑堟伅璁板綍
+ // /// </summary>
+ // /// <returns></returns>
+ // public bool PushserivceClearmessagelist()
+ // {
+ // if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false;
+
+ // var urlSegmentDic = new Dictionary<string, object>();
+ // urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
+ // var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Clearmessagelist, null, null, urlSegmentDic);
+ // if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
+ // {
+ // return true;
+ // }
+ // else
+ // {
+
+ // }
+ // return false;
+ // }
+
+ // /// <summary>
+ // /// 閫�鍑虹櫥褰曪紝娓呯┖鎺ㄩ�佹爣璇�
+ // /// </summary>
+ // /// <returns></returns>
+ // public bool PushserivceSignOut()
+ // {
+ // if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false;
+ // try
+ // {
+ // var urlSegmentDic = new Dictionary<string, object>();
+ // urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
+ // var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Deletepushinfo, null, null, urlSegmentDic);
+ // if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
+ // {
+ // return true;
+ // }
+ // else
+ // {
+
+ // }
+ // return false;
+ // }
+ // catch
+ // {
+ // return false;
+ // }
+ // }
#endregion
@@ -974,32 +1127,33 @@
#endregion
#region 澶囦唤閮ㄥ垎
- /// <summary>
- /// 鑾峰彇浣忓畢澶囦唤鍒楄〃
- /// </summary>
- public Dictionary<int, string> GetRegionLastBackupId()
- {
- //Dialog dialog = new Dialog();
- //dialog.Show();
+ ///// <summary>
+ ///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
+ ///// </summary>
+ //public Dictionary<int, string> GetRegionLastBackupId()
+ //{
+ // //Dialog dialog = new Dialog();
+ // //dialog.Show();
- Dictionary<int, string> backupList = new Dictionary<int, string>();
- Dictionary<string, object> d = new Dictionary<string, object>();
- 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)
- {
- return new Dictionary<int, string>();
- }
- var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
- foreach (var j in jt)
- {
- var folderId = (int)j.GetValue("FolderID");
- var folderName = j.GetValue("FolderName").ToString();
- backupList.Add(folderId, folderName);
- }
- return backupList;
- }
+ // Dictionary<int, string> backupList = new Dictionary<int, string>();
+ // Dictionary<string, object> d = new Dictionary<string, object>();
+ // 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)
+ // {
+ // return new Dictionary<int, string>();
+ // }
+ // var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
+ // foreach (var j in jt)
+ // {
+ // var folderId = (int)j.GetValue("FolderID");
+ // var folderName = j.GetValue("FolderName").ToString();
+ // backupList.Add(folderId, folderName);
+ // }
+ // return backupList;
+ //}
+
/* 2020-09-01 寮冪敤 鎭㈠鏃ф暟鎹姛鑳藉湪bus杞欢涓婂疄鐜�
/// <summary>
/// 鑾峰彇澶囦唤鏂囦欢鍒楄〃
@@ -1445,6 +1599,6 @@
#endregion
-
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0