From 11c4199c6015914b5de6d96fca3b478c0a852f9b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 19:54:01 +0800
Subject: [PATCH] 2020-12-03 1.OnAppConfig 配置文件检测处理，禁止删除。
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 385 +++++++++++++++++++++++++-----------------------------
1 files changed, 180 insertions(+), 205 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 6e286dc..f156f7b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -292,32 +292,14 @@
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
- var headImageBytes = DownHeadImage();
+ var imageKey = ImageUtlis.Current.GetHeadImageKey(info.memberId);
+
+ var headImageBytes = ImageUtlis.Current.DownHeadImage(info.memberId);
+
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();
- }
- }
-
+ //UserInfo.Current.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePagePath = imageKey;
}
}
@@ -377,13 +359,7 @@
}
- /// <summary>
- /// 涓嬭浇鐢ㄦ埛澶村儚
- /// </summary>
- public byte[] DownHeadImage()
- {
- return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Head_Down, null);
- }
+
/// <summary>
/// 鏇存柊鐢ㄦ埛鏄电О
@@ -399,17 +375,17 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
- /// <summary>
- /// 鏇存柊鐢ㄦ埛澶村儚
- /// </summary>
- /// <param name="vs"></param>
- /// <returns></returns>
- public string UpdataUserHeadImage(string fileName)
- {
- byte[] bytes = Shared.IO.FileUtils.ReadFile(fileName);
- var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
- return revertObj.Code;
- }
+ ///// <summary>
+ ///// 鏇存柊鐢ㄦ埛澶村儚
+ ///// </summary>
+ ///// <param name="vs"></param>
+ ///// <returns></returns>
+ //public string UpdataUserHeadImage(string fileName)
+ //{
+ // byte[] bytes = Shared.IO.FileUtils.ReadFile(fileName);
+ // var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
+ // return revertObj.Code;
+ //}
/// <summary>
/// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿
@@ -499,7 +475,21 @@
if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
{
DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+ //鎭㈠澶囦唤
+ HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
}
+ else
+ {
+ var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.residenceData.CurReginID);
+ if(curRegion == null)
+ {
+ DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+ //鎭㈠澶囦唤
+ HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
+ }
+ }
+
+
DB_ResidenceData.residenceData.SaveResidenceData();
UserInfo.Current.SaveUserInfo();
@@ -716,7 +706,7 @@
/// </summary>
/// <param name="addShareObj"></param>
/// <returns></returns>
- public ResponsePackNew AddShare(AddShareObj addShareObj)
+ public ResponsePackNew AddShareData(AddShareObj addShareObj)
{
var requestJson = HttpUtil.GetSignRequestJson(addShareObj);
@@ -728,7 +718,7 @@
/// </summary>
/// <param name="deleteShareObj"></param>
/// <returns></returns>
- public ResponsePackNew DeleteShare(DeleteShareObj deleteShareObj)
+ public ResponsePackNew DeleteShareData(DeleteShareObj deleteShareObj)
{
var requestJson = HttpUtil.GetSignRequestJson(deleteShareObj);
@@ -740,123 +730,127 @@
/// </summary>
/// <param name="addShareObj"></param>
/// <returns></returns>
- public ResponsePackNew GetShare(GetShareObj getShareObj)
+ public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
{
- var requestJson = HttpUtil.GetSignRequestJson(getShareObj);
+ var requestJson = HttpUtil.GetSignRequestJson(new GetShareObj()
+ {
+ homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ childAccountId = childAccountId,
+ });
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Delete, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
}
#endregion
- /// <summary>
- /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
- /// </summary>
- /// <returns></returns>
- 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);
+ ///// <summary>
+ ///// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+ ///// </summary>
+ ///// <returns></returns>
+ //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);
- var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
- {
- homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
- childAccountId = childAccountId
- });
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
+ // var requestJson = HttpUtil.GetSignRequestJson(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 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);
+ ///// <summary>
+ ///// 涓嬭浇鍗曚釜鍒嗕韩鏂囦欢
+ ///// </summary>
+ ///// <returns></returns>
+ //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);
- 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);
+ // 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 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);
+ ///// <summary>
+ ///// 澧炲姞鍏变韩鏁版嵁鍒楄〃
+ ///// </summary>
+ ///// <returns></returns>
+ //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);
- 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);
- }
+ // 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 ResponsePackNew 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);
- }
+ ///// <summary>
+ ///// 澧炲姞鍏变韩鏁版嵁
+ ///// </summary>
+ ///// <returns></returns>
+ //public ResponsePackNew 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);
+ //}
- /// <summary>
- /// 鍒犻櫎鍏变韩鏁版嵁
- /// </summary>
- /// <param name="shareData"></param>
- /// <returns></returns>
- public ResponsePackNew DeleteShareData(ShareData shareData)
- {
- var requestJson = HttpUtil.GetSignRequestJson(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>
+ ///// <param name="shareData"></param>
+ ///// <returns></returns>
+ //public ResponsePackNew DeleteShareData(ShareData shareData)
+ //{
+ // var requestJson = HttpUtil.GetSignRequestJson(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>
@@ -885,38 +879,19 @@
}
- /// <summary>
- /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
- /// </summary>
- /// <returns></returns>
- public ResponsePack GetResidenceMemberAccountInfo(string account)
- {
- Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("Account", account);
- string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
- }
+ ///// <summary>
+ ///// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
+ ///// </summary>
+ ///// <returns></returns>
+ //public ResponsePack GetResidenceMemberAccountInfo(string account)
+ //{
+ // Dictionary<string, object> d = new Dictionary<string, object>();
+ // 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
@@ -979,9 +954,9 @@
deviceType = deviceType,
produce = isProduce,
};
-
- var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
- //var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
+
+ //var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
+ var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
if (revertObj.Code == StateCode.SUCCESS)
{
@@ -1010,16 +985,33 @@
}
}
-
+
/// <summary>
/// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
/// </summary>
+ /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
/// <returns></returns>
- public ResponsePackNew PushSerivceGetPushmessagelist()
+ public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
{
+ string pushType = null;
+
+ if (queryType == 1)
+ {
+ pushType = PushType.Default.ToString();
+ }
+ else if (queryType == 2)
+ {
+ pushType = PushType.Alarm.ToString();
+ }
+ else if (queryType == 3)
+ {
+ pushType = PushType.Prompt.ToString();
+ }
+
var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
{
- pushId = OnAppConfig.Instance.PushId
+ pushId = OnAppConfig.Instance.PushId,
+ pushType = pushType
});
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
}
@@ -1167,7 +1159,7 @@
}
else
{
-
+ IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
}
return false;
}
@@ -1226,33 +1218,16 @@
/// <returns></returns>
public ResponsePackNew CheckAppVersion()
{
- var requestObj = new ForceUpdateObj()
+ var requestObj = new AppVersionCheckObj()
{
- LanguageType = Utlis.GetPostLanguageType()
+
};
-#if __IOS__
- requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
-#endif
+
var requestJson = HttpUtil.GetSignRequestJson(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 = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
- }
#endregion
--
Gitblit v1.8.0