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 | 1309 +++++++++++++++++------------------------------------------
1 files changed, 376 insertions(+), 933 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 04842d1..a69664e 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -3,7 +3,6 @@
using System.IO;
using System.Net;
using System.Text;
-using HDL_ON.DAL.Net;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;
@@ -51,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);
@@ -64,217 +63,187 @@
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);
}
- //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>
- /// 鏍规鐢ㄦ埛璐﹀彿鑾峰彇娉ㄥ唽鍖哄煙 鍏嶇櫥褰� // 妫�娴嬭处鍙锋槸鍚︽敞鍐屼篃鐢ㄨ繖涓帴鍙�
- /// </summary>
- /// <param name="account"></param>
- /// <returns></returns>
- public ResponsePackNew GetRegionByAccount(string account)
+ public string GetRequestResultMsg(string resultCode)
{
- 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()
+ string result = "";
+ switch (resultCode.ToUpper())
{
- 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();
- return true;
+ 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 false;
+ return result;
}
-
- #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:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁</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>
+ /// 鑾峰彇鐧诲綍楠岃瘉鐮�
+ /// </summary>
+ public ResponsePack GetLoginVerCode(string account)
+ {
+
+ string jsonString = "{" +
+ "\"Account\":" + "\"" + account + "\"" + "," +
+ "\"AreaCode\":" + "86" +
+ "}";
+ return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
+ }
+
+ ///// <summary>
+ ///// 鍙戦�侀獙璇佺爜
+ ///// </summary>
+ //public ResponsePack SendSms(string account)
+ //{
+ // string jsonString = "{" +
+ // "\"Account\":" + "\"" + account + "\"" + "," +
+ // "\"Company\":" + MainPage.Company + "," +
+ // "\"Language\":" + "\"" + Language.CurrentLanguage + "\"" + "," +
+ // "\"AreaCode\":" + OnAppConfig.Instance.CountryNumber +
+ // "}";
+ // return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
+ //}
/// <summary>
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
- /// <param name="verifyType">楠岃瘉绫诲瀷</param>
- /// <param name="account">楠岃瘉璐﹀彿</param>
- /// <param name="code">楠岃瘉鐮�</param>
- /// <param name="isPhone">鏄惁鎵嬫満</param>
- /// <param name="verifySuccessFail">楠岃瘉閫氳繃鍚庯紝楠岃瘉鐮佹槸鍚﹀け鏁�</param>
+ /// <param name="account"></param>
+ /// <param name="code"></param>
/// <returns></returns>
- public ResponsePackNew ValidatorCode(VerifyType verifyType, string account, string code, bool isPhone, bool verifySuccessFail = true)
+ public ResponsePack ValidatorCode(string account, string code, int countryIndex)
{
- var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType, verifySuccessFail = verifySuccessFail };
- if (isPhone)
- {
- //鎵嬫満
- requestObj.phone = account;
- }
- else
- {
- //閭
- requestObj.mail = account;
- }
- var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Check, requestJson);
+ string jsonString = "{" +
+ "\"Account\":" + "\"" + account + "\"" + "," +
+ "\"Code\":" + "\"" + code + "\"" + "," +
+ "\"Language\":" + "\"" + Language.CurrentLanguage + "\"" + "," +
+ "\"AreaCode\":" + countryIndex +
+ "}";
+ return RequestHttps($"{severAddress}/ZigbeeUsers/ValidatorCode", jsonString, false);
}
+ /// <summary>
+ /// 閲嶈瀵嗙爜
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack ResetPassword(string account, string password, string rePassword, int countryIndex)
+ {
+ string jsonString = "{" +
+ "\"Account\":" + "\"" + account + "\"" + "," +
+ "\"Password\":" + "\"" + password + "\"" + "," +
+ "\"AgainPassword\":" + "\"" + rePassword + "\"" + "," +
+ "\"AreaCode\":" + countryIndex +
+ "}";
+ return RequestHttps($"{severAddress}/ZigbeeUsers/ResetPassword", jsonString, false);
+ }
#endregion
#region 涓汉淇℃伅閮ㄥ垎
@@ -282,111 +251,56 @@
/// 鑾峰彇鐢ㄦ埛淇℃伅
/// </summary>
/// <returns></returns>
- public void GetUserInfo(bool bGetHeadImage = true)
+ public void GetUserInfo()
{
- var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
- var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
- 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;
- //鏄惁闇�瑕佽幏鍙栧ご鍍�
- if (bGetHeadImage)
- {
- var headImageBytes = DownHeadImage();
- if (headImageBytes != null && headImageBytes.Length > 0)
- {
- UserInfo.Current.headImagePageBytes = headImageBytes;
- FileStream fs = null;
- try
- {
- 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;
- }
- catch (Exception ex)
- {
- MainPage.Log($"download headImage error : {ex.Message}");
- }
- finally
- {
- if (fs != null)
- {
- fs.Close();
- }
- }
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS")
+ {
+ var dataStr = JObject.FromObject(revertObj.ResponseData);
+ //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109", < !--甯愬彿Id-- >
+ MainPage.LoginUser.userEmailInfo = dataStr.GetValue("Email").ToString();
+ MainPage.LoginUser.userMobileInfo = dataStr.GetValue("Phone").ToString();
+ FileStream fs = null;
+ try
+ {
+ var headImageString = dataStr.GetValue("HeadImage").ToString();
+ if (!string.IsNullOrEmpty(headImageString))
+ {
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
+ var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
+ MainPage.LoginUser.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();
+ MainPage.LoginUser.headImagePagePath = filePath;
+ }
+ } catch (Exception ex)
+ {
+ MainPage.Log($"download headImage error : {ex.Message}");
+ }
+ finally
+ {
+ if (fs != null)
+ {
+ fs.Close();
}
}
+ // "GesturePwd": null, < !--鎵嬪娍瀵嗙爜-- >
+ // "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
+ MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
- UserInfo.Current.SaveUserInfo();
+ Application.RunOnMainThread(() =>
+ {
+ });
+
+ MainPage.LoginUser.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
-
- // Dictionary<string, object> d = new Dictionary<string, object>();
- //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- //var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
-
- //if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS)
- //{
- // var dataStr = JObject.FromObject(revertObj.ResponseData);
- // //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109", < !--甯愬彿Id-- >
- // UserInfo.Current.userEmailInfo = dataStr.GetValue("Email").ToString();
- // UserInfo.Current.userMobileInfo = dataStr.GetValue("Phone").ToString();
- // FileStream fs = null;
- // try
- // {
- // var headImageString = dataStr.GetValue("HeadImage").ToString();
- // if (!string.IsNullOrEmpty(headImageString))
- // {
- // var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
- // var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
- // 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;
- // }
- // }
- // catch (Exception ex)
- // {
- // MainPage.Log($"download headImage error : {ex.Message}");
- // }
- // finally
- // {
- // if (fs != null)
- // {
- // fs.Close();
- // }
- // }
- // // "GesturePwd": null, < !--鎵嬪娍瀵嗙爜-- >
- // // "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
- // UserInfo.Current.userName = dataStr.GetValue("UserName").ToString();
-
- // Application.RunOnMainThread(() =>
- // {
- // });
-
- // UserInfo.Current.SaveUserInfo();
- // MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
- //}
-
- }
-
- /// <summary>
- /// 涓嬭浇鐢ㄦ埛澶村儚
- /// </summary>
- public byte[] DownHeadImage()
- {
- return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Head_Down, null);
}
/// <summary>
@@ -394,13 +308,14 @@
/// </summary>
/// <param name="userName"></param>
/// <returns></returns>
- public ResponsePackNew EditUserName(string userName)
+ public ResponsePack EditUserName(string userName)
{
- var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes()
- {
- memberName = userName
- });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("UserName", userName);
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/UpdateUserName", requestJson, true);
+ return revertObj;
+
}
/// <summary>
@@ -413,269 +328,152 @@
FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
byte[] bytes = new byte[fs.Length];
fs.Read(bytes, 0, bytes.Length);
- var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
- return revertObj.Code;
+
+ Dictionary<string, byte[]> d = new Dictionary<string, byte[]>();
+ d.Add("HeadImage", bytes);
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+
+ var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/UpdateHeadImage", requestJson, true);
+ return revertObj.StateCode;
}
/// <summary>
/// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿
- /// 2020-11-16 寰呬慨鏀�
/// </summary>
/// <param name="account"></param>
- /// <param name="code"></param>
- /// <param name="isPhone"></param>
/// <returns></returns>
- public string BindAccount(string account, string code = "", bool isPhone = false)
+ public string BindAccount(string account)
{
- var requestObj = new BindWithAccountObj() { verifyCode = code };
- if (isPhone)
- {
- //鎵嬫満
- requestObj.memberPhone = account;
- }
- else
- {
- //閭
- requestObj.memberEmail = account;
- }
- var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_BindWithAccount, requestJson).Code;
+ string jsonString = "{" + "\"Account\":" + "\"" + account + "\"" + "}";
+ var responsePack = RequestHttps($"{severAddress}/ZigbeeUsers/BindAccount", jsonString, true);
+ return responsePack.StateCode;
}
-
- /// <summary>
- /// 瑙ｇ粦鎵嬫満鎴栬�呴偖绠�
- /// </summary>
- /// <param name="isPhone"></param>
- /// <returns></returns>
- public string UnBindAccount(bool isPhone)
- {
- var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE" : "EMAIL" };
- var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code;
- }
-
#endregion
#region 浣忓畢閮ㄥ垎
/// <summary>
/// 鑾峰彇浣忓畢鍒楄〃
/// </summary>
- public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)
+ public string GetHomePager()
{
- 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)
- {
- var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
- if (homeList == null || homeList.Count == 0)
- {
+ string jsonString = "{" +
+ "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
+ "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
+ "\"HomeType\":" + "\"" + "1" + "\"" + "," +
+ "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
+ "}";
+ var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);
+ if (responsePack.StateCode.ToUpper() == "SUCCESS")
+ {
+ var dataStr = JObject.FromObject(responsePack.ResponseData);
+ //娌℃湁浣忓畢
+ if (dataStr.GetValue("PageData").ToString() == "[]")
+ {
}
else
{
- UserInfo.Current.regionList = new List<RegionInfoRes>();
-
- foreach (var mHome in homeList)
+ //{
+ // {
+ // "Id": "1107487",
+ // "HomeStatus": 2,
+ // "UserGuid": "22980",
+ // "Name": "鍟�",
+ // "Address": null,
+ // "Longitude": 0.0,
+ // "Latitude": 0.0,
+ // "RegionName": null,
+ // "Company": null,
+ // "ContactPerson": null,
+ // "ContactPersonPhone": null,
+ // "Remarks": null,
+ // "ChangeDate": null,
+ // "AccountType": 0,
+ // "CreatedOnUtc": "2020-05-27T06:52:03",
+ // "IsOthreShare": false,
+ // "MainUserDistributedMark": null,
+ // "HomeGateways": [
+ // {
+ // "GatewayUniqueId": "4E47323347591243"
+ // }
+ // ]
+ //}}
+ MainPage.LoginUser.regionList = new List<RegionInfoRes>();
+ foreach (var jsonData in dataStr.GetValue("PageData"))
{
+ var homeJsonStr = JObject.FromObject(jsonData);
var home = new RegionInfoRes()
{
- RegionID = mHome.Id,
- Name = mHome.homeName,
- IsOthreShare = mHome.IsOtherShare,
- accountType = mHome.accountType,
- isRemoteControl = mHome.isRemoteControl,
- longitude = mHome.longitude,
- latitude = mHome.latitude,
- deliverstatus = mHome.deliverstatus,
- homeType = mHome.homeType,
- regionUrl = mHome.regionUrl,
- emqUrl = mHome.emqUrl,
- homeRegionName = mHome.homeRegionName,
- homeRegionId = mHome.homeRegionId,
- Address = mHome.homeAddress,
+ RegionID = homeJsonStr.GetValue("Id").ToString(),
+ RegionName = homeJsonStr.GetValue("RegionName").ToString(),
+ Name = homeJsonStr.GetValue("Name").ToString(),
+ Address = homeJsonStr.GetValue("Address").ToString(),
+ IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
+ homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
};
if (home.IsOthreShare)
{
continue;
}
- UserInfo.Current.regionList.Add(home);
- }
-
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
- {
- DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+ MainPage.LoginUser.regionList.Add(home);
+ if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
+ {
+ DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+ }
}
DB_ResidenceData.residenceData.SaveResidenceData();
- UserInfo.Current.SaveUserInfo();
+ MainPage.LoginUser.SaveUserInfo();
}
-
}
-
- return resultObj.Code;
-
- //string jsonString = "{" +
- // "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
- // "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
- // "\"HomeType\":" + "\"" + "1" + "\"" + "," +
- // "\"LoginAccessToken\":" + "\"" + UserInfo.Current.loginTokenString + "\"" +
- // "}";
- //var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
-
- //if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
- //{
- // var dataStr = JObject.FromObject(responsePack.ResponseData);
- // //娌℃湁浣忓畢
- // if (dataStr.GetValue("PageData").ToString() == "[]")
- // {
-
- // }
- // else
- // {
- // //{
- // // {
- // // "Id": "1107487",
- // // "HomeStatus": 2,
- // // "UserGuid": "22980",
- // // "Name": "鍟�",
- // // "Address": null,
- // // "Longitude": 0.0,
- // // "Latitude": 0.0,
- // // "RegionName": null,
- // // "Company": null,
- // // "ContactPerson": null,
- // // "ContactPersonPhone": null,
- // // "Remarks": null,
- // // "ChangeDate": null,
- // // "AccountType": 0,
- // // "CreatedOnUtc": "2020-05-27T06:52:03",
- // // "IsOthreShare": false,
- // // "MainUserDistributedMark": null,
- // // "HomeGateways": [
- // // {
- // // "GatewayUniqueId": "4E47323347591243"
- // // }
- // // ]
- // //}}
- // UserInfo.Current.regionList = new List<RegionInfoRes>();
- // foreach (var jsonData in dataStr.GetValue("PageData"))
- // {
- // var homeJsonStr = JObject.FromObject(jsonData);
- // var home = new RegionInfoRes()
- // {
- // RegionID = homeJsonStr.GetValue("Id").ToString(),
- // RegionName = homeJsonStr.GetValue("RegionName").ToString(),
- // Name = homeJsonStr.GetValue("Name").ToString(),
- // Address = homeJsonStr.GetValue("Address").ToString(),
- // IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
- // homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
- // };
- // if (home.IsOthreShare)
- // {
- // continue;
- // }
- // 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();
- // }
- //}
- //return responsePack.StateCode;
+ return responsePack.StateCode;
}
-
/// <summary>
/// 缂栬緫浣忓畢淇℃伅
/// </summary>
- /// <param name="editId">0 淇敼浣忓畢鍚嶅瓧銆�1 淇敼浣忓畢鍦板潃</param>
- /// <param name="editName"></param>
/// <returns></returns>
- public ResponsePackNew EditResidenceInfo(int editId, string editName)
+ public ResponsePack EditResidenceInfo()
{
- var requestObj = new AddOrUpdateHomeObj()
- {
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
- };
+ //鍒涘缓瀛楀吀
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ //娣诲姞鍏冪礌
+ d.Add("RequestVersion", MainPage.VersionString);
+ d.Add("RequestSource", "2");
+ d.Add("LoginAccessToken", MainPage.LoginUser.loginTokenString);
+ d.Add("HomeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("HomeType", 1);
+ d.Add("Name", DB_ResidenceData.residenceData.residecenInfo.Name);
+ d.Add("Address", DB_ResidenceData.residenceData.residecenInfo.Address);
+ //娣诲姞瀹屾垚浠ュ悗鎶婂瓧鍏哥被涓暟鎹牸寮忓寲涓簀son瀛楃涓�
+ //灏嗗璞¤浆涓簀son瀛楃涓�
- if (editId == 0)
- {
- requestObj.homeName = editName;
- }
- else if (editId == 1)
- {
- requestObj.Address = editName;
- }
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_UpdateHome, requestJson);
- }
-
- /// <summary>
- /// 鑾峰彇鍒锋柊褰撳墠浣忓畢缃戝叧鎺ュ彛
- /// </summary>
- public void GetHomeGatewayList()
- {
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.residecenInfo.RegionID)) return;
- var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = nowhomeId });
- var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
- if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
- {
- if (mHomeGatewayRes != null)
- {
- if (mHomeGatewayRes.Count > 0)
- {
- DB_ResidenceData.residenceData.residenceGatewayMAC = mHomeGatewayRes[0].mac;
- }
- else
- {
- DB_ResidenceData.residenceData.residenceGatewayMAC = "";
-
- }
- DB_ResidenceData.residenceData.SaveResidenceData();
- }
-
- if (mHomeGatewayRes != null)
- {
- //Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count);
- }
- }
- }
- else
- {
- //鎻愮ず閿欒
- }
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/App/EditHome", jsonString, false);
}
/// <summary>
/// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
/// </summary>
/// <returns></returns>
- public ResponsePackNew GetResidenceMemberAccount()
+ public ResponsePack GetResidenceMemberAccount()
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountByDistributedMark", jsonString, true);
}
/// <summary>
/// 鍒犻櫎浣忓畢涓嬬殑鎴愬憳璐﹀彿
/// </summary>
/// <returns></returns>
- public ResponsePackNew DeleteResidenceMemberAccount(ResidenceMemberInfo subaccount)
+ public ResponsePack DeleteResidenceMemberAccount(string memberAccount)
{
- var requestObj = new ChildDeleteObj()
- {
- childAccountId = subaccount.childAccountId,
- homeId = subaccount.homeId
- };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccount", memberAccount);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/DeletedSubAccount", jsonString, true);
}
/// <summary>
@@ -684,16 +482,13 @@
/// <param name="nickName"></param>
/// <param name="subAccountGuid"></param>
/// <returns></returns>
- public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
+ public ResponsePack EditSubAccountNickName(string nickName,string subAccountGuid)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildNickNameObj()
- {
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
- childAccountId = childAccountId,
- nickName = nickName,
- });
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
-
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccountGuid", subAccountGuid);
+ d.Add("NickName", nickName);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/EditSubAccountNickName", jsonString, true);
}
/// <summary>
/// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄�
@@ -701,105 +496,70 @@
/// <param name="nickName"></param>
/// <param name="subAccountGuid"></param>
/// <returns></returns>
- public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
+ public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildAllowCreateSceneObj()
- {
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
- childAccountId = childAccountId,
- isAllowCreateScene = isAllow,
- });
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccountGuid", subAccountGuid);
+ d.Add("HomeGuid", homeGuid);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/ChangeCreateSceneState", jsonString, true);
}
/// <summary>
/// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
/// </summary>
/// <returns></returns>
- public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
+ public ResponsePack GetShareDataByMemberAccount(string memberId)
{
- //Dictionary<string, object> d = new Dictionary<string, object>();
- //d.Add("DistributedMark", memberId);
- //d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeShareFindAll()
- {
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
- childAccountId = childAccountId
- });
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
-
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", memberId);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
}
/// <summary>
- /// 涓嬭浇鍗曚釜鍒嗕韩鏂囦欢
+ /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
/// </summary>
/// <returns></returns>
- public byte[] GetShareData(ShareData shareData)
+ public ResponsePack GetShareData(string memberId,string hId)
{
- //Dictionary<string, object> d = new Dictionary<string, object>();
- //d.Add("DistributedMark", memberId);
- //d.Add("HouseDistributedMark", hId);
- //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
- {
- homeId = shareData.homeId,
- homeShareId = shareData.id
- });
- var replaceToken = "";
- if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
- replaceToken = DB_ResidenceData.residenceData.MasterToken;
- }
- return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Home_Share_DownOne, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
-
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", memberId);
+ d.Add("HouseDistributedMark", hId);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
}
/// <summary>
/// 澧炲姞鍏变韩鏁版嵁鍒楄〃
/// </summary>
/// <returns></returns>
- public ResponsePackNew AddShareData(ShareData shareData)
+ public ResponsePack AddShareData(ShareData shareData)
{
- //Dictionary<string, object> d = new Dictionary<string, object>();
- //d.Add("ShareName", shareData.ShareName);
- //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
- //d.Add("ShareDataBytes", shareData.ShareDataBytes);
- //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
- //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- //return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
-
- var queryDic = new Dictionary<string, object>();
- queryDic.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- queryDic.Add("childAccountId", shareData.childAccountId);
- queryDic.Add("fileName", shareData.fileName);
- var replaceToken = "";
- if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
- replaceToken = DB_ResidenceData.residenceData.MasterToken;
- }
- return HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Home_Share_Add, shareData.ShareDataBytes, queryDic, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("ShareName", shareData.ShareName);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ d.Add("ShareDataBytes", shareData.ShareDataBytes);
+ d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
}
/// <summary>
/// 澧炲姞鍏变韩鏁版嵁
/// </summary>
/// <returns></returns>
- public ResponsePackNew EditShareData(ShareData shareData)
+ public ResponsePack EditShareData(ShareData shareData)
{
- return AddShareData(shareData);
- //Dictionary<string, object> d = new Dictionary<string, object>();
- //d.Add("DistributedMark", shareData.DistributedMark);
- //d.Add("ShareName", shareData.ShareName);
- //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
- //d.Add("ShareDataBytes", shareData.ShareDataBytes);
- //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
- //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- //return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", shareData.DistributedMark);
+ d.Add("ShareName", shareData.ShareName);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ d.Add("ShareDataBytes", shareData.ShareDataBytes);
+ d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
}
/// <summary>
@@ -807,32 +567,26 @@
/// </summary>
/// <param name="shareData"></param>
/// <returns></returns>
- public ResponsePackNew DeleteShareData(ShareData shareData)
+ public ResponsePack DeleteShareData(ShareData shareData)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
- {
- homeId = shareData.homeId,
- homeShareId = shareData.id
- });
- 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);
- //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- //return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("DistributedMark", shareData.DistributedMark);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
}
- ///// <summary>
- ///// 鍒犻櫎瀛愯处鍙峰綋鍓嶄綇瀹呯殑鎵�鏈夊叡浜暟鎹�
- ///// </summary>
- ///// <returns></returns>
- //public ResponsePack DeleteCurrentResidenceSharedData(ShareData shareData)
- //{
- // Dictionary<string, string> d = new Dictionary<string, string>();
- // d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
- // d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
- // string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- // return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
- //}
+ /// <summary>
+ /// 鍒犻櫎瀛愯处鍙峰綋鍓嶄綇瀹呯殑鎵�鏈夊叡浜暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack DeleteCurrentResidenceSharedData(ShareData shareData)
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
+ }
/// <summary>
/// 缁戝畾瀛愯处鍙峰埌浣忓畢涓�
@@ -840,17 +594,20 @@
/// <param name="subAccount"></param>
/// <param name="nickName"></param>
/// <returns></returns>
- public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)
+ public ResponsePack BindResidenceMemberAccount(string subAccount,string nickName)
{
- //娣诲姞瀛愯处鍙�
- var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccount", subAccount);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("Nickname", nickName);
+ d.Add("IsAllowRemoteCtrl", true);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/BindSubAccount", jsonString, true);
}
/// <summary>
- /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
/// </summary>
/// <returns></returns>
public ResponsePack GetResidenceMemberAccountInfo(string account)
@@ -859,316 +616,6 @@
d.Add("Account", account);
string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
- }
-
- /// <summary>
- /// 涓嬭浇瀛愯处鍙风敤鎴峰ご鍍�
- /// </summary>
- /// <param name="subaccoun"></param>
- /// <returns></returns>
- public byte[] DownChildHeadImage(ResidenceMemberInfo subaccount)
- {
- var requestObj = new ChildBaseObj()
- {
- childAccountId = subaccount.childAccountId,
- homeId = subaccount.homeId
- };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var replaceToken = "";
- if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
- replaceToken = DB_ResidenceData.residenceData.MasterToken;
- }
- return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Child_DownloadHeadImage, requestJson,null);
- }
-
-
- #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 = PhoneDeviceType.Android.ToString();
-#if __IOS__
- deviceType = PhoneDeviceType.IOS.ToString();
-#endif
- //鏄惁鐢熸垚妯″紡
- bool isProduce = true;
-#if DEBUG
- isProduce = false;
-#endif
-
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) return false;
-
- var mAddpushinfoObj = new AddpushinfoObj()
- {
- pushToken = OnAppConfig.Instance.PushDeviceToken,
- deviceName = OnAppConfig.Instance.PhoneName,
- deviceType = deviceType,
- produce = isProduce,
-
- };
- var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- if (revertObj.Data != null)
- {
- var pushId = revertObj.Data.ToString();
- if (!string.IsNullOrEmpty(pushId))
- {
- OnAppConfig.Instance.PushId = pushId;
- OnAppConfig.Instance.SaveUserConfig();
- return true;
- }
- }
- Utlis.WriteLine("AddToken 鎴愬姛");
- }
- else
- {
- Utlis.WriteLine("AddToken 澶辫触");
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
- /// </summary>
- /// <returns></returns>
- public ResponsePackNew PushSerivceGetpushmessagelist()
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMessageListObj()
- {
- pushId = OnAppConfig.Instance.PushId
- });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
- }
-
- /// <summary>
- /// 娓呯┖娑堟伅璁板綍
- /// </summary>
- /// <returns></returns>
- public bool PushSerivceClearmessagelist()
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
- {
- pushId = OnAppConfig.Instance.PushId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Clearmessagelist, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
-
- /// <summary>
- /// 閫�鍑虹櫥褰曪紝娓呯┖鎺ㄩ�佹爣璇�
- /// </summary>
- /// <returns></returns>
- public bool PushSerivceSignOut()
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() {
- pushId = OnAppConfig.Instance.PushId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 鏍囪娑堟伅鍏ㄩ儴宸茶
- /// </summary>
- /// <param name="msgId"></param>
- /// <returns></returns>
- public bool PushSerivceMarkAllMessageRead()
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
- {
- pushId = OnAppConfig.Instance.PushId
- });
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_ALLMarkread, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 鏍囪鎸囧畾娑堟伅宸茶
- /// </summary>
- /// <param name="msgId"></param>
- /// <returns></returns>
- public bool PushSerivceMarkMessageRead(string msgId)
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
- {
- msgId = msgId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Markread, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 閫氳繃涓婚敭id鍒犻櫎涓�鏉℃帹閫佽褰�
- /// </summary>
- /// <param name="msgId"></param>
- /// <returns></returns>
- public bool PushSerivceDeleteMessage(string msgId)
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
- {
- msgId = msgId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Deletepushinfo, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
- #endregion
-
- #region 妫�娴嬫洿鏂�
- /// <summary>
- ///
- /// </summary>
- /// <returns></returns>
- public ResponsePackNew CheckAppVersion()
- {
- var requestObj = new ForceUpdateObj()
- {
-
- };
-#if Android
- requestObj.DeviceType = 1;
-#endif
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <returns></returns>
- public ResponsePackNew GetAppVersion()
- {
- var requestObj = new ForceUpdateObj()
- {
-
- };
-#if Android
- requestObj.DeviceType = 1;
-#endif
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
}
#endregion
@@ -1227,8 +674,7 @@
}
System.Threading.Thread.Sleep(1000);
}
- Shared.Application.RunOnMainThread(() =>
- {
+ Shared.Application.RunOnMainThread(() => {
try
{
HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
@@ -1245,7 +691,7 @@
/// 璇锋眰Mqtt鏁版嵁
/// </summary>
/// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param>
- public ResponsePack RequestMqttInfo(string dataStringJson)
+ public ResponsePack RequestMqttInfo( string dataStringJson)
{
ResponsePack revertObj = null;
@@ -1288,33 +734,32 @@
#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>
/// 鑾峰彇澶囦唤鏂囦欢鍒楄〃
@@ -1759,7 +1204,5 @@
*/
#endregion
-
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0