From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 811 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 587 insertions(+), 224 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index b31745f..4dd4352 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1,8 +1,9 @@
-锘縰sing System;
+锘縰sing System;
using System.Collections.Generic;
using System.IO;
-using System.Net;
+using System.Net;
using System.Text;
+using HDL_ON.DAL.Mqtt;
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,16 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
{
- refreshToken = MainPage.LoginUser.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());
- MainPage.LoginUser.loginTokenString = revertData.headerPrefix + revertData.accessToken;
- MainPage.LoginUser.lastTime = DateTime.Now;
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.RefreshToken = revertData.refreshToken;
+ UserInfo.Current.LastTime = DateTime.Now;
+ UserInfo.Current.SaveUserInfo();
return true;
}
return false;
@@ -129,13 +131,7 @@
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
- /// <summary>
- /// 鑾峰彇璇锋眰鎻愪氦鐨勮瑷�鍙傛暟
- /// </summary>
- public string GetPostLanguageType()
- {
- return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
- }
+
/// <summary>
/// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
@@ -150,7 +146,7 @@
var requestObj = new VerifyCodeSendObj()
{
verifyType = (int)verifyType,
- languageType = GetPostLanguageType()
+ languageType = Utlis.GetPostLanguageType()
};
// 鏄惁鏄墜鏈�
if (isPhone)
@@ -248,21 +244,6 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson);
}
-
-
- ///// <summary>
- ///// 鑾峰彇鐧诲綍楠岃瘉鐮�
- ///// </summary>
- //public ResponsePack GetLoginVerCode(string account)
- //{
-
- // string jsonString = "{" +
- // "\"Account\":" + "\"" + account + "\"" + "," +
- // "\"AreaCode\":" + "86" +
- // "}";
- // return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
- //}
-
/// <summary>
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
@@ -274,7 +255,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)
{
//鎵嬫満
@@ -289,22 +270,6 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Check, requestJson);
}
-
-
- /// <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 涓汉淇℃伅閮ㄥ垎
@@ -319,26 +284,29 @@
if (resultObj.Code == StateCode.SUCCESS)
{
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
- MainPage.LoginUser.userEmailInfo = info.memberEmail;
- MainPage.LoginUser.userMobileInfo = info.memberPhone;
- MainPage.LoginUser.userName = info.memberName;
- MainPage.LoginUser.areaCode = info.memberPhonePrefix;
+ UserInfo.Current.userEmailInfo = info.memberEmail;
+ UserInfo.Current.userMobileInfo = info.memberPhone;
+ UserInfo.Current.userName = info.memberName;
+ if (!string.IsNullOrEmpty(info.memberPhonePrefix))
+ {
+ UserInfo.Current.areaCode = info.memberPhonePrefix;
+ }
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
var headImageBytes = DownHeadImage();
- if (headImageBytes != null)
+ if (headImageBytes != null && headImageBytes.Length > 0)
{
- MainPage.LoginUser.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePageBytes = headImageBytes;
FileStream fs = null;
try
{
- MainPage.LoginUser.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();
- MainPage.LoginUser.headImagePagePath = filePath;
+ UserInfo.Current.headImagePagePath = filePath;
}
catch (Exception ex)
{
@@ -355,7 +323,7 @@
}
}
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
@@ -368,8 +336,8 @@
//{
// 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();
+ // UserInfo.Current.userEmailInfo = dataStr.GetValue("Email").ToString();
+ // UserInfo.Current.userMobileInfo = dataStr.GetValue("Phone").ToString();
// FileStream fs = null;
// try
// {
@@ -378,12 +346,12 @@
// {
// var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
// var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
- // MainPage.LoginUser.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();
- // MainPage.LoginUser.headImagePagePath = filePath;
+ // UserInfo.Current.headImagePagePath = filePath;
// }
// }
// catch (Exception ex)
@@ -399,13 +367,13 @@
// }
// // "GesturePwd": null, < !--鎵嬪娍瀵嗙爜-- >
// // "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
- // MainPage.LoginUser.userName = dataStr.GetValue("UserName").ToString();
+ // UserInfo.Current.userName = dataStr.GetValue("UserName").ToString();
// Application.RunOnMainThread(() =>
// {
// });
- // MainPage.LoginUser.SaveUserInfo();
+ // UserInfo.Current.SaveUserInfo();
// MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
//}
@@ -426,10 +394,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>
@@ -456,7 +425,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)
{
//鎵嬫満
@@ -478,7 +447,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;
}
@@ -493,17 +462,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
{
- MainPage.LoginUser.regionList = new List<RegionInfoRes>();
-
+ UserInfo.Current.regionList = new List<RegionInfoRes>();
+
foreach (var mHome in homeList)
{
var home = new RegionInfoRes()
@@ -527,25 +497,26 @@
{
continue;
}
- MainPage.LoginUser.regionList.Add(home);
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
- {
- DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.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();
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
}
-
+
}
return resultObj.Code;
- //string jsonString = "{" +
+ //string jsonString = "{" +
// "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
// "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
// "\"HomeType\":" + "\"" + "1" + "\"" + "," +
- // "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
+ // "\"LoginAccessToken\":" + "\"" + UserInfo.Current.loginTokenString + "\"" +
// "}";
//var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
@@ -584,7 +555,7 @@
// // }
// // ]
// //}}
- // MainPage.LoginUser.regionList = new List<RegionInfoRes>();
+ // UserInfo.Current.regionList = new List<RegionInfoRes>();
// foreach (var jsonData in dataStr.GetValue("PageData"))
// {
// var homeJsonStr = JObject.FromObject(jsonData);
@@ -601,39 +572,83 @@
// {
// continue;
// }
- // MainPage.LoginUser.regionList.Add(home);
+ // UserInfo.Current.regionList.Add(home);
// if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
// {
- // DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+ // DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
// }
// }
// DB_ResidenceData.residenceData.SaveResidenceData();
- // MainPage.LoginUser.SaveUserInfo();
+ // UserInfo.Current.SaveUserInfo();
// }
//}
//return responsePack.StateCode;
}
+
/// <summary>
/// 缂栬緫浣忓畢淇℃伅
/// </summary>
+ /// <param name="editId">0 淇敼浣忓畢鍚嶅瓧銆�1 淇敼浣忓畢鍦板潃</param>
+ /// <param name="editName"></param>
/// <returns></returns>
- public ResponsePack EditResidenceInfo()
+ public ResponsePackNew EditResidenceInfo(int editId, string editName)
{
- //鍒涘缓瀛楀吀
- 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瀛楃涓�
+ var requestObj = new AddOrUpdateHomeObj()
+ {
+ homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ };
- string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps($"{severAddress}/App/EditHome", jsonString, false);
+ 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
+ {
+ //鎻愮ず閿欒
+ }
}
/// <summary>
@@ -643,10 +658,7 @@
public ResponsePackNew GetResidenceMemberAccount()
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
- var replaceToken = MainPage.LoginUser.loginTokenString;
- //濡傛灉褰撳墠鎵�鍒嗕韩浣忓畢鍜屼负绠＄悊鍛橈紝鏇挎崲涓轰富浜簍oken
- //寰呭鐞�...
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_FindAll, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
}
/// <summary>
@@ -661,10 +673,7 @@
homeId = subaccount.homeId
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var replaceToken = MainPage.LoginUser.loginTokenString;
- //濡傛灉褰撳墠鎵�鍒嗕韩浣忓畢鍜屼负绠＄悊鍛橈紝鏇挎崲涓轰富浜簍oken
- //寰呭鐞�...
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_Delete, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
}
/// <summary>
@@ -673,13 +682,16 @@
/// <param name="nickName"></param>
/// <param name="subAccountGuid"></param>
/// <returns></returns>
- public ResponsePack EditSubAccountNickName(string nickName, string subAccountGuid)
+ public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
{
- 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);
+ 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);
+
}
/// <summary>
/// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄�
@@ -687,70 +699,105 @@
/// <param name="nickName"></param>
/// <param name="subAccountGuid"></param>
/// <returns></returns>
- public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid)
+ public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
{
- 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);
+ 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);
}
/// <summary>
/// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
/// </summary>
/// <returns></returns>
- public ResponsePack GetShareDataByMemberAccount(string memberId)
+ public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
{
- 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);
+ //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);
+
}
/// <summary>
- /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
+ /// 涓嬭浇鍗曚釜鍒嗕韩鏂囦欢
/// </summary>
/// <returns></returns>
- public ResponsePack GetShareData(string memberId, string hId)
+ public byte[] GetShareData(ShareData shareData)
{
- 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);
+ //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);
+
}
/// <summary>
/// 澧炲姞鍏变韩鏁版嵁鍒楄〃
/// </summary>
/// <returns></returns>
- public ResponsePack AddShareData(ShareData shareData)
+ public ResponsePackNew 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);
+ //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);
}
/// <summary>
/// 澧炲姞鍏变韩鏁版嵁
/// </summary>
/// <returns></returns>
- public ResponsePack EditShareData(ShareData shareData)
+ public ResponsePackNew EditShareData(ShareData 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);
+ 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);
}
/// <summary>
@@ -758,26 +805,32 @@
/// </summary>
/// <param name="shareData"></param>
/// <returns></returns>
- public ResponsePack DeleteShareData(ShareData shareData)
+ public ResponsePackNew DeleteShareData(ShareData shareData)
{
- 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);
+ 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);
}
- /// <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>
/// 缁戝畾瀛愯处鍙峰埌浣忓畢涓�
@@ -785,20 +838,17 @@
/// <param name="subAccount"></param>
/// <param name="nickName"></param>
/// <returns></returns>
- public ResponsePack BindResidenceMemberAccount(string subAccount, string nickName)
+ public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)
{
- 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);
+ //娣诲姞瀛愯处鍙�
+ 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);
- string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps($"{severAddress}/ZigbeeUsers/BindSubAccount", jsonString, true);
}
/// <summary>
- /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
/// </summary>
/// <returns></returns>
public ResponsePack GetResidenceMemberAccountInfo(string account)
@@ -807,6 +857,316 @@
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()
+ {
+ LanguageType = Utlis.GetPostLanguageType()
+ };
+#if __IOS__
+ requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
+#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 __IOS__
+ requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
+#endif
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
}
#endregion
@@ -926,32 +1286,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>
/// 鑾峰彇澶囦唤鏂囦欢鍒楄〃
@@ -1396,5 +1757,7 @@
*/
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0