From 587c36e27131f2d028fcabc13b296a8de7470034 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 08 一月 2020 08:59:19 +0800
Subject: [PATCH] 2019.1.8
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 71 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index f8d5139..8b0d4e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -831,13 +831,12 @@
//鍏嬮殕涓�涓璞�
roomTemp = nowRoom.CloneRoomClass();
memberShardInfo.TempRoom = roomTemp;
- //鏂板垎浜殑鎴块棿,濡傛灉鍥剧墖鏄嚜瀹氫箟鐨�,鍒欎笂浼犲浘鐗�
- if (roomTemp.BackgroundImageType != 0)
+ //鏂板垎浜殑鎴块棿,濡傛灉鍥剧墖鏄嚜瀹氫箟鐨�,骞朵笖杩欎釜鍥剧墖鏄瓨鍦ㄧ殑,鍒欎笂浼犲浘鐗�
+ if (roomTemp.BackgroundImageType != 0 && Common.Global.IsExistsByHomeId(roomTemp.BackgroundImage) == true)
{
//鑷畾涔夌殑鍥剧墖,瀹冨瓨鍦ㄤ簬鏈湴,浣嗘槸瀹冩槸鍏ㄨ矾寰�
- string[] Arry = roomTemp.BackgroundImage.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
- listFile.Add(Arry[Arry.Length - 1]);
- this.AddShardFile(Arry[Arry.Length - 1]);
+ listFile.Add(roomTemp.BackgroundImage);
+ this.AddShardFile(roomTemp.BackgroundImage);
}
}
else
@@ -849,15 +848,13 @@
if (roomTemp.BackgroundImageType != 0)
{
//鍒犻櫎鑷畾涔夊浘鐗�
- string[] Arry = roomTemp.BackgroundImage.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
- listDelPic.Add(Arry[Arry.Length - 1]);
+ listDelPic.Add(roomTemp.BackgroundImage);
}
- if (nowRoom.BackgroundImageType != 0)
+ if (nowRoom.BackgroundImageType != 0 && Common.Global.IsExistsByHomeId(nowRoom.BackgroundImage) == true)
{
//鑷畾涔夌殑鍥剧墖,瀹冨瓨鍦ㄤ簬鏈湴,浣嗘槸瀹冩槸鍏ㄨ矾寰�
- string[] Arry = nowRoom.BackgroundImage.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
- listFile.Add(Arry[Arry.Length - 1]);
- this.AddShardFile(Arry[Arry.Length - 1]);
+ listFile.Add(nowRoom.BackgroundImage);
+ this.AddShardFile(nowRoom.BackgroundImage);
}
//鍙樻洿鍥剧墖璁剧疆
roomTemp.BackgroundImageType = nowRoom.BackgroundImageType;
@@ -895,12 +892,11 @@
//鍦烘櫙
foreach (var secene in listScene)
{
- if (secene.IconPathType != 0)
+ if (secene.IconPathType != 0 && Common.Global.IsExistsByHomeId(secene.IconPath) == true)
{
- //鑷畾涔夌殑鍥剧墖,瀹冨瓨鍦ㄤ簬鏈湴,浣嗘槸瀹冩槸鍏ㄨ矾寰�
- string[] Arry = secene.IconPath.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
- listFile.Add(Arry[Arry.Length - 1]);
- this.AddShardFile(Arry[Arry.Length - 1]);
+ //鑷畾涔夌殑鍥剧墖,瀹冨瓨鍦ㄤ簬鏈湴
+ listFile.Add(secene.IconPath);
+ this.AddShardFile(secene.IconPath);
}
listFile.Add(secene.FileName);
@@ -1029,7 +1025,7 @@
if (memberShardInfo.dicAllShardKeys.ContainsKey(fileName) == false)
{
var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/AddShareData", false, info);
- if (string.IsNullOrEmpty(result) == true)
+ if (result == null)
{
return false;
}
@@ -1077,24 +1073,19 @@
nvc.Add("HouseDistributedMark", Common.Config.Instance.Home.Id);
nvc.Add("SubAccountDistributedMark", memberShardInfo.SubAccountDistributedMark);
nvc.Add("ShareDataBytes", Convert.ToBase64String(this.GetShardFileContent(fileName)));
- nvc.Add("IsOtherAccountCtrl", Common.Config.Instance.isAdministrator.ToString());
//杩藉姞鍏变韩
if (memberShardInfo.dicAllShardKeys.ContainsKey(fileName) == false)
{
- var result = this.UpLoadBigBackupFileToDB("ZigbeeDataShare/AddShareData", fullName, nvc);
- if (string.IsNullOrEmpty(result) == true)
- {
- return null;
- }
//杩欓噷鏈夌偣鐗规畩锛屾帴鍙ｆ槸鐩存帴杩斿洖涓婚敭鍥炴潵鐨勶紝鑰屼笉鏄疛soin
+ var result = this.DoUpLoadBigBackupFileToDB("ZigbeeDataShare/AddShareData", fullName, nvc);
return result;
}
else
{
nvc.Add("DistributedMark", memberShardInfo.dicAllShardKeys[fileName]);
- var result = this.UpLoadBigBackupFileToDB("ZigbeeDataShare/EditShareData", fullName, nvc);
- if (result != "1")
+ var result = this.DoUpLoadBigBackupFileToDB("ZigbeeDataShare/EditShareData", fullName, nvc);
+ if (result == null)
{
return null;
}
@@ -1103,26 +1094,17 @@
}
/// <summary>
- /// 涓婁紶澶ф枃浠�
+ /// 鎵ц涓婁紶澶ф枃浠�
/// </summary>
/// <param name="RequestName">璇锋眰鎺ュ彛</param>
/// <param name="fullFileName">鏂囦欢鍚嶅瓧(鍚矾寰�)</param>
/// <param name="nvc"></param>
/// <returns></returns>
- private string UpLoadBigBackupFileToDB(string RequestName, string fullFileName, NameValueCollection nvc)
+ private string DoUpLoadBigBackupFileToDB(string RequestName, string fullFileName, NameValueCollection nvc)
{
string paramName = "file";
string contentType = "application/octet-stream";
string requestUrl = $"{CommonPage.RequestHttpsHost}/{RequestName}";
- //鍚敤绠＄悊鍛樻潈闄�
- //if (Config.Instance.isAdministrator == true)
- //{
- // requestUrl = $"{Config.Instance.AdminRequestBaseUrl}/{RequestName}";
- //}
- //else
- //{
- // requestUrl = $"{CommonPage.RequestHttpsHost}/{RequestName}";
- //}
string boundary = "---------------------------" + DateTime.Now.Ticks.ToString("x");
byte[] boundarybytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" + boundary + "\r\n");
@@ -1132,6 +1114,8 @@
wr.Method = "POST";
wr.KeepAlive = true;
wr.Credentials = System.Net.CredentialCache.DefaultCredentials;
+
+ wr.Headers.Add(HttpRequestHeader.Authorization, Config.Instance.Token);
var rs = wr.GetRequestStream();
@@ -1171,23 +1155,24 @@
StreamReader reader2 = new StreamReader(stream2);
string result = reader2.ReadToEnd();
- if (RequestName == "ZigbeeDataShare/AddShareData")
- {
- return result;
- }
var data = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResponsePack>(result);
bool flage = UserCenterLogic.CheckNotEorrorMsg(data, requestUrl);
if (flage == true)
{
- return "1";
+ //缂栬緫鐨勬椂鍊欙紝杩欎釜涓滆タ浼氭槸null
+ return data.ResponseData == null ? "1" : data.ResponseData.ToString();
}
- return "0";
+
+ //Log鍑哄姏
+ IMessageCommon.Current.GetMsgByRequestName(RequestName, data, nvc);
+
+ return null;
}
catch
{
- return "-1";
+ return null;
}
finally
{
--
Gitblit v1.8.0