~wjc/HomeApp.git

			@@ -53,13 +53,13 @@
			/// </summary>
			/// <param name="listDistributedMark"></param>
			/// <returns></returns>
			public async Task<List<string>> SetShardFileToLocation(List<string> listDistributedMark)
			private async Task<List<string>> SetShardFileToLocation(List<string> listDistributedMark)
			{
			if (listDistributedMark.Count == 0)
			{
			return new List<string>();
			}
			ProgressBar.SetMaxValue(listDistributedMark.Count);
			int listMarkCount = listDistributedMark.Count;

			List<string> listFile = new List<string>();
			//文件夹
			@@ -69,8 +69,9 @@
			Shared.Common.CommonPage.BackKeyCanClick = false;
			UserCenterResourse.Option.AppCanSignout = false;

			foreach (string keys in listDistributedMark)
			for (int i = 0; i < listDistributedMark.Count; i++)
			{
			string keys = listDistributedMark[i];
			var dataPra = new { DistributedMark = keys, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.isAdministrator };
			var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetOneShareData", false, dataPra);
			if (result == null)
			@@ -86,7 +87,7 @@
			//保存到指定文件夹下
			Global.WriteFileToDirectoryByBytes(strDir, dataResult.ShareName, dataResult.ShareDataBytes);
			//设置进度值
			ProgressBar.SetValue(1);
			ProgressFormBar.Current.SetValue(i + 1, listMarkCount);
			}

			//允许按系统的返回键
			@@ -284,11 +285,9 @@
			//从云端获取下来文件
			if (listAddMark.Count > 0)
			{
			//强制指定文本附加信息：共享数据同步中
			string msg = Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing);
			//开启进度条
			ProgressBar.Show(msg);
			ProgressBar.SetAppendText(msg);
			//开启进度条共享数据同步中
			ProgressFormBar.Current.Start();
			ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing));

			//将分享的数据存入本地(获取的是本地没有的)
			this.ClearShardDirectory();
			@@ -296,7 +295,7 @@
			if (listDbFile == null)
			{
			//关闭
			ProgressBar.Close();
			ProgressFormBar.Current.Close();
			return false;
			}

			@@ -334,11 +333,9 @@
			//只有成员才有这个概念
			return true;
			}
			//强制指定文本附加信息：共享数据同步中
			string msg = Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing);
			//开启进度条
			ProgressBar.Show(msg);
			ProgressBar.SetAppendText(msg);
			//开启进度条共享数据同步中
			ProgressFormBar.Current.Start();
			ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing));

			if (dicUpdateTime == null)
			{
			@@ -357,7 +354,7 @@
			if (string.IsNullOrEmpty(result) == true)
			{
			//关闭
			ProgressBar.Close();
			ProgressFormBar.Current.Close();
			return false;
			}
			var listShardData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GetShardInfoResult>>(result);
			@@ -435,7 +432,7 @@
			//保存全部分享文件的更新日期
			this.SaveAllShardFileAgoUpdateTime(dicUpdateTime);
			//关闭
			ProgressBar.Close();
			ProgressFormBar.Current.Close();

			return true;
			}
			@@ -481,7 +478,6 @@
			/// <summary>
			/// 获取成员共享列表然后保存到本地(用完之后最好调用清空 ClearShardDirectory函数清空)
			/// </summary>
			/// <param name="SubAccountDistributedMark">成员列表接口返回的SubAccountDistributedMark</param>
			/// <param name="memberShardInfo">
			/// <para>成员的分享数据</para>
			/// <para>如果不知道这是什么东西,就New一个,然后缓存起来,调用其他函数都需要这个东西</para>
			@@ -498,8 +494,9 @@
			}
			memberShardInfo.Refresh = false;

			//打开进度条
			ProgressBar.Show();
			//正在获取分享数据
			ProgressFormBar.Current.Start();
			ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uShardContentGetting));

			var infoPra = new
			{
			@@ -511,7 +508,7 @@
			if (result == null)
			{
			//关闭进度条
			ProgressBar.Close();
			ProgressFormBar.Current.Close();
			return false;
			}
			var listData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ReceiveShardInfoResult>>(result);
			@@ -546,7 +543,7 @@
			if (listFile == null)
			{
			//关闭进度条
			ProgressBar.Close();
			ProgressFormBar.Current.Close();
			return false;
			}

			@@ -554,7 +551,7 @@
			this.GetMemberShardContentListFromLocal(memberShardInfo);

			//关闭进度条
			ProgressBar.Close();
			ProgressFormBar.Current.Close();

			return true;
			}
			@@ -575,41 +572,45 @@
			//先初始化房间
			foreach (string fileName in listFile)
			{
			if (fileName.StartsWith("Room_") == true)
			try
			{
			//房间文件
			var byteData = this.GetShardFileContent(fileName);
			if (byteData != null)
			if (fileName.StartsWith("Room_") == true)
			{
			string valueData = System.Text.Encoding.UTF8.GetString(byteData);
			var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);
			memberShardInfo.dicShardRoom[fileName] = roomTemp;
			//房间文件
			var byteData = this.GetShardFileContent(fileName);
			if (byteData != null)
			{
			string valueData = System.Text.Encoding.UTF8.GetString(byteData);
			var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);
			memberShardInfo.dicShardRoom[fileName] = roomTemp;
			}
			}
			}
			else if (fileName == DirNameResourse.ShardFloorFile)
			{
			//楼层文件
			var byteData = this.GetShardFileContent(fileName);
			if (byteData != null)
			else if (fileName == DirNameResourse.ShardFloorFile)
			{
			string valueData = System.Text.Encoding.UTF8.GetString(byteData);
			memberShardInfo.dicShardFloor = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(valueData);
			//楼层文件
			var byteData = this.GetShardFileContent(fileName);
			if (byteData != null)
			{
			string valueData = System.Text.Encoding.UTF8.GetString(byteData);
			memberShardInfo.dicShardFloor = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(valueData);
			}
			}
			}
			else if (fileName.StartsWith("Device_") == true)
			{
			string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
			string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3]));
			this.dicShardDeviceFile[mainKeys] = fileName;
			else if (fileName.StartsWith("Device_") == true)
			{
			string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
			string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3]));
			this.dicShardDeviceFile[mainKeys] = fileName;

			//设备文件
			listDeviceFile.Add(fileName);
			//设备文件
			listDeviceFile.Add(fileName);
			}
			else if (fileName.StartsWith("Scene_") == true)
			{
			//场景文件
			listSceneFile.Add(fileName);
			}
			}
			else if (fileName.StartsWith("Scene_") == true)
			{
			//场景文件
			listSceneFile.Add(fileName);
			}
			catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
			}

			//设置房间里面设备的UI对象(因为这个东西是反序列化出来的,设备UI对象是不序列化对象)
			@@ -830,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
			@@ -848,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;
			@@ -894,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);
			@@ -1028,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;
			}
			@@ -1076,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;
			}
			//这里有点特殊，接口是直接返回主键回来的，而不是Jsoin
			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;
			}
			@@ -1102,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");
			@@ -1131,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();

			@@ -1170,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
			{