~wjc/HomeApp.git

			@@ -82,7 +82,7 @@
			GatewayResourse.AppOldSelectGatewayId = string.Empty;

			//从文件中获取上一次选择的网关id
			byte[] data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AppOldSelectGatewayFile);
			byte[] data = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.AppOldSelectGatewayFile);
			if (data != null)
			{
			string strvalue = System.Text.Encoding.UTF8.GetString(data);
			@@ -118,7 +118,7 @@
			}

			List<string> listBackupGwId = new List<string>();
			var fileData = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);
			var fileData = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.BackupGatewayIdFile);
			if (fileData != null)
			{
			//新增：虽然概率低，但是确实发生了。如果有网络时，App重新绑定记录的网关失败的话
			@@ -149,26 +149,10 @@
			//删除网关文件
			this.DeleteGatewayFile(gatewayId);
			}
			//LOG输出
			if (listDelete.Count > 0)
			//如果网关都没了的话,把场景全部删了
			if (listDelete.Count > 0 && this.GetAllLocalGateway().Count == 0)
			{
			string msg = "本地拥有的网关：";
			foreach (var gatewayId in this.dicGateway.Keys)
			{
			msg += gatewayId + ",";
			}
			msg += "\r\n被删除的网关：";
			foreach (var gatewayId in listDelete)
			{
			msg += gatewayId + ",";
			}
			msg += "\r\n此时云端返回当前账号所绑定有的网关：";
			foreach (var gatewayId in result.Keys)
			{
			msg += gatewayId + ",";
			}
			var bytes = System.Text.Encoding.UTF8.GetBytes(msg);
			Common.Global.WriteFileByBytesByHomeId("GatewayDeleteLog.txt", bytes);
			HdlSceneLogic.Current.DeleteAllLocalScene();
			}
			}

			@@ -241,6 +225,9 @@
			{
			return false;
			}
			//添加网关的话,强制主页刷新
			UserView.UserPage.Instance.RefreshAllForm = true;

			return true;
			}

			@@ -324,7 +311,7 @@
			}

			//更新云端数据库
			int flage1 = await this.SetGatewayIdToDataBase(zbGateway);
			int flage1 = this.SetGatewayIdToDataBase(zbGateway);
			//异常也不鸟它,0是特殊含义
			if (flage1 == 0)
			{
			@@ -396,7 +383,7 @@
			/// </summary>
			/// <param name="zbGateway">网关对象</param>
			/// <returns></returns>
			private async Task<int> SetGatewayIdToDataBase(ZbGateway zbGateway)
			private int SetGatewayIdToDataBase(ZbGateway zbGateway)
			{
			//调用接口，绑定网关(即使失败，也返回true往下走)
			var bindGateway = new BindGatewayPra();
			@@ -404,10 +391,8 @@
			//获取控制主人账号的Token
			bindGateway.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

			//不显示已经被绑定过的信息,NotSetAgain:假如断网时,不二次发送
			List<string> listNotShow = new List<string>() { "NotSetAgain" };
			var result = await UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, listNotShow);
			if (result == "Error" \|\| result == "ErrorEx")
			var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });
			if (result == "Error")
			{
			return -1;
			}
			@@ -479,7 +464,7 @@
			}

			//更新云端数据库
			int flage1 = await this.SetGatewayIdToDataBase(zbGateway);
			int flage1 = this.SetGatewayIdToDataBase(zbGateway);
			//异常也不鸟它,0是特殊含义
			if (flage1 == 0)
			{
			@@ -507,7 +492,19 @@
			await Task.Delay(8000);

			//获取网关的信息
			var result = await zbGateway.GetZbGwInfoAsync();
			ZbGatewayData.GetGwAllData result = null;
			int count = 5;
			while (count >= 0)
			{
			result = await zbGateway.GetZbGwInfoAsync();
			if (result != null && result.getGwData != null)
			{
			break;
			}
			count--;
			//最多再等20秒
			await Task.Delay(4000);
			}
			//检测网关返回的共通错误状态码
			string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
			if (error != null)
			@@ -547,6 +544,10 @@
			//添加备份
			HdlAutoBackupLogic.AddOrEditorFile(this.dicGateway[gwID].FilePath);
			}

			//添加网关的话,强制主页刷新
			UserView.UserPage.Instance.RefreshAllForm = true;

			return 1;
			}

			@@ -559,42 +560,30 @@
			/// </summary>
			/// <param name="zbGateway">网关对象</param>
			/// <param name="gatewayName">网关名</param>
			public async Task<bool> ReName(ZbGateway zbGateway, string gatewayName)
			public bool ReName(ZbGateway zbGateway, string gatewayName)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, zbGateway) == false)
			//只取32个byte
			var bytes = new byte[32];
			var reamarkGwBytes = System.Text.Encoding.UTF8.GetBytes(gatewayName);
			System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 32 < reamarkGwBytes.Length ? 32 : reamarkGwBytes.Length);
			gatewayName = System.Text.Encoding.UTF8.GetString(bytes);

			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 91 } };
			var data = new Newtonsoft.Json.Linq.JObject { { "GwName", gatewayName } };
			jObject.Add("Data", data);
			var result = this.SendJobjectDataToGateway(zbGateway, "GwReName", jObject.ToString(), "GwReName_Respon");
			if (result.ErrorMsg != null)
			{
			//获取网关对象失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayTagartFail);
			this.ShowErrorMsg(msg);
			this.ShowTipMsg(result.ErrorMsg);
			return false;
			}

			var result = await realWay.GwReNameAsync(gatewayName);
			//检测网关返回的共通错误状态码
			string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
			if (error != null)
			{
			this.ShowErrorMsg(error);
			return false;
			}

			if (result == null)
			if (result.ErrorMsgDiv == 0)
			{
			//网关名称修改失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGatewayReNameFail);

			this.ShowErrorMsg(msg);
			return false;
			}

			//网关修改失败
			if (result.gwReNameData == null)
			{
			//网关名称修改失败
			string msg = Language.StringByID(R.MyInternationalizationString.uGatewayReNameFail);

			this.ShowErrorMsg(msg);
			//网关回复超时
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			this.ShowTipMsg(msg);
			return false;
			}

			@@ -632,7 +621,7 @@
			//切换网关,保存缓存
			this.SaveGatewayIdToLocation(gatewayId);
			//切换网关的话,主页需要重新刷新
			UserView.UserPage.Instance.RefreshForm = true;
			UserView.UserPage.Instance.RefreshAllForm = true;

			return true;
			}
			@@ -677,7 +666,7 @@
			if (getGatewayInfo == true)
			{
			//获取网关信息
			var info = await this.GetGatewayNewInfoAsync(realWay);
			var info = this.GetGatewayInfo(realWay);
			if (info == null)
			{
			//关闭进度条
			@@ -704,8 +693,7 @@
			public void SaveGatewayIdToLocation(string gatewayId)
			{
			GatewayResourse.AppOldSelectGatewayId = gatewayId;
			byte[] data = System.Text.Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(GatewayResourse.AppOldSelectGatewayId));
			Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AppOldSelectGatewayFile, data);
			HdlFileLogic.Current.SaveFileContent(DirNameResourse.AppOldSelectGatewayFile, GatewayResourse.AppOldSelectGatewayId);
			}

			#endregion
			@@ -746,7 +734,7 @@
			}

			//删除云端的网关
			await this.DeleteDataBaseGateway(zbGatewayID);
			this.DeleteDataBaseGateway(zbGatewayID);

			//删除网关文件
			this.DeleteGatewayFile(zbGatewayID);
			@@ -995,7 +983,7 @@
			public List<string> GetAllGatewayFile()
			{
			List<string> list = new List<string>();
			List<string> listFile = Global.FileListByHomeId();
			List<string> listFile = HdlFileLogic.Current.GetRootPathListFile();
			foreach (string file in listFile)
			{
			//只获取网关设备
			@@ -1317,9 +1305,8 @@
			/// 获取网关加特效的名称
			/// </summary>
			/// <param name="zbGateway"></param>
			/// <param name="mode"></param>
			/// <returns></returns>
			public string GetGatewayName(ZbGateway zbGateway, GetNameMode mode = GetNameMode.SpecialGateway)
			public string GetGatewayName(ZbGateway zbGateway)
			{
			string gwId = zbGateway.GwId;
			if (this.dicGateway.ContainsKey(gwId) == false)
			@@ -1334,14 +1321,11 @@
			return name;
			}

			if (mode == GetNameMode.SpecialGateway)
			string keyName = Common.LocalDevice.deviceModelIdName + localWay.LinuxImageType;
			if (LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
			{
			string keyName = Common.LocalDevice.deviceModelIdName + localWay.LinuxImageType;
			if (LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
			{
			//没有名称时，则使用R文件里面设置的默认设备名称
			return Language.StringByID(LocalDevice.Current.dicDeviceAllNameID[keyName] + 20000);
			}
			//没有名称时，则使用R文件里面设置的默认设备名称
			return Language.StringByID(LocalDevice.Current.dicDeviceAllNameID[keyName] + 20000);
			}

			return string.Empty;
			@@ -1388,9 +1372,9 @@
			else
			{
			//给一个线程去获取它的镜像类型
			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunThread(() =>
			{
			var result = await this.GetGatewayNewInfoAsync(zbGateway, ShowErrorMode.NO);
			var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);
			if (result != null)
			{
			//将网关的数据设置到本地缓存中
			@@ -1430,32 +1414,13 @@
			/// <param name="zbGateway"></param>
			/// <param name="mode"></param>
			/// <returns></returns>
			public async Task<ZbGatewayData.GetGwData> GetGatewayNewInfoAsync(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
			public ZbGatewayData.GetGwData GetGatewayInfo(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, zbGateway) == false)
			{
			if (mode == ShowErrorMode.YES)
			{
			string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
			this.ShowTipMsg(msg);
			}
			return null;
			}
			//获取网关版本信息
			var imageTypeResult = await realWay.GetZbGwInfoAsync();
			//检测网关返回的共通错误状态码
			string error = HdlCheckLogic.Current.CheckCommonErrorCode(imageTypeResult);
			if (error != null)
			{
			if (mode == ShowErrorMode.YES)
			{
			this.ShowTipMsg(error);
			}
			return null;
			}
			var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 95 } };
			var result = this.SendJobjectDataToGateway(zbGateway, "GetZbGwInfo", jObject.ToString(), "GetZbGwInfo_Respon");

			if (imageTypeResult == null \|\| imageTypeResult.getGwData == null)
			if (result.ErrorMsgDiv != 1)
			{
			if (mode == ShowErrorMode.YES)
			{
			@@ -1467,42 +1432,19 @@
			}
			return null;
			}

			var getGwInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGatewayData.GetGwData>(result.ReceiptData);
			string gwID = zbGateway.GwId;
			if (this.dicGateway.ContainsKey(gwID) == true)
			{
			//刷新缓存
			ZbGateway localWay = this.dicGateway[gwID];
			//将网关的数据设置到本地缓存中
			this.SetGatewayDataToLocalMemmory(localWay, imageTypeResult.getGwData);
			this.SetGatewayDataToLocalMemmory(localWay, getGwInfo);
			}
			//顺便这个变量也设置一下
			this.SetGatewayDataToLocalMemmory(zbGateway, imageTypeResult.getGwData, false);
			this.SetGatewayDataToLocalMemmory(zbGateway, getGwInfo, false);

			return imageTypeResult.getGwData;
			}

			/// <summary>
			/// 获取网关信息,非异步,会等待(版本信息,镜像类型,基本信息等。只刷新本地网关的缓存)
			/// </summary>
			/// <param name="zbGateway"></param>
			/// <param name="mode"></param>
			/// <returns></returns>
			public ZbGatewayData.GetGwData GetGatewayNewInfo(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
			{
			bool bolBreak = false;
			ZbGatewayData.GetGwData result = null;
			HdlThreadLogic.Current.RunThread(async () =>
			{
			result = await this.GetGatewayNewInfoAsync(zbGateway, mode);
			bolBreak = true;
			});

			while (bolBreak == false)
			{
			System.Threading.Thread.Sleep(500);
			}
			return result;
			return getGwInfo;
			}

			/// <summary>
			@@ -1563,11 +1505,11 @@
			/// <summary>
			/// 变更网关房间
			/// </summary>
			/// <param name="zbGateway">网关对象</param>
			/// <param name="gwId">网关Id</param>
			/// <param name="roomId">房间ID</param>
			public void ChangedGatewayRoom(ZbGateway zbGateway, string roomId)
			public void ChangedGatewayRoom(string gwId, string roomId)
			{
			var localGateway = this.GetLocalGateway(zbGateway.GwId);
			var localGateway = this.GetLocalGateway(gwId);
			if (localGateway != null)
			{
			localGateway.RoomId = roomId;
			@@ -1609,10 +1551,10 @@
			/// <param name="zbGateway">网关对象</param>
			/// <param name="mode">错误时，是否显示错误</param>
			/// <returns></returns>
			public async Task<List<FirmwareVersionInfo>> GetGatewayAllNewVersion(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
			public List<FirmwareVersionInfo> GetGatewayAllNewVersion(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
			{
			//获取网关版本信息
			var result = await HdlGatewayLogic.Current.GetGatewayNewInfoAsync(zbGateway, mode);
			var result = this.GetGatewayInfo(zbGateway, mode);
			if (result == null)
			{
			return null;
			@@ -1629,10 +1571,14 @@
			localWay.LinuxHardVersion.ToString(),
			localWay.LinuxImageType.ToString());

			//添加协调器的升级固件(成不成功都无所谓)
			flage = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.Coordinator,
			localWay.CoordinatorHardVersion.ToString(),
			localWay.CoordinatorImageId.ToString());
			//添加协调器的升级固件(成不成功都无所谓) 必须能够联网才行
			if (flage == 1)
			{
			//没网的时候不再处理
			HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.Coordinator,
			localWay.CoordinatorHardVersion.ToString(),
			localWay.CoordinatorImageId.ToString());
			}

			//网关的版本
			var gatewayFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.Linux,
			@@ -1656,10 +1602,13 @@
			//虚拟驱动号
			foreach (var data in localWay.DriveCodeList)
			{
			//添加虚拟驱动的升级固件(成不成功都无所谓)
			flage = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,
			data.DriveHwVersion.ToString(),
			data.DriveImageType.ToString());
			//添加虚拟驱动的升级固件(成不成功都无所谓) 必须能够联网才行
			if (flage == 1)
			{
			HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,
			data.DriveHwVersion.ToString(),
			data.DriveImageType.ToString());
			}

			//虚拟驱动
			var virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.VirtualDevice,
			@@ -1753,9 +1702,9 @@
			else
			{
			//给一个线程去获取它的镜像类型
			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunThread(() =>
			{
			var result = await this.GetGatewayNewInfoAsync(zbGateway, ShowErrorMode.NO);
			var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);
			if (result != null)
			{
			//将网关的数据设置到本地缓存中
			@@ -1791,9 +1740,9 @@
			else
			{
			//给一个线程去获取它的镜像类型
			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunThread(() =>
			{
			var result = await this.GetGatewayNewInfoAsync(zbGateway, ShowErrorMode.NO);
			var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);
			if (result != null)
			{
			//将网关的数据设置到本地缓存中
			@@ -1885,9 +1834,9 @@
			}

			bool canBreak = false;
			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunThread(() =>
			{
			List<string> list = new List<string>() { "NotSetAgain", "NotCheck" };
			List<string> list = new List<string>() { "NotCheck" };

			//设置访问接口的参数
			var pra = new GetGatewayPra();
			@@ -1896,7 +1845,7 @@
			//获取控制主人账号的Token
			pra.ReqDto.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

			var result = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list);
			var result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list);
			if (string.IsNullOrEmpty(result) == true)
			{
			canBreak = true;
			@@ -2019,16 +1968,16 @@
			/// 解绑云端绑定的网关
			/// </summary>
			/// <param name="strWayId"></param>
			public async Task<bool> DeleteDataBaseGateway(string strWayId)
			public bool DeleteDataBaseGateway(string strWayId)
			{
			var Pra = new DeleteGatewayPra();
			Pra.BindGateways.Add(strWayId);
			//获取控制主人账号的Token
			Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

			List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotSetAgain" };
			List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotCheck" };

			bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);
			bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);
			if (result == false)
			{
			return false;
			@@ -2052,9 +2001,7 @@
			listBackupGwId.Add(strId);

			//备份
			var strData = Newtonsoft.Json.JsonConvert.SerializeObject(listBackupGwId);
			var byteData = System.Text.Encoding.UTF8.GetBytes(strData);
			Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile, byteData);
			HdlFileLogic.Current.SaveFileContent(DirNameResourse.BackupGatewayIdFile, listBackupGwId);
			}
			}

			@@ -2063,9 +2010,9 @@
			/// </summary>
			public void ResetComandToBindBackupGateway()
			{
			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunThread(() =>
			{
			var fileData = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);
			var fileData = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.BackupGatewayIdFile);
			if (fileData == null)
			{
			return;
			@@ -2074,8 +2021,6 @@
			var listTempId = new List<string>();
			listTempId.AddRange(this.listBackupGwId);

			//不显示已经被绑定过的信息,NotSetAgain:假如断网时,不二次发送
			List<string> listNotShow = new List<string>() { "NotSetAgain" };
			//调用接口，绑定网关
			var bindGateway = new BindGatewayPra();
			//获取控制主人账号的Token
			@@ -2085,12 +2030,12 @@
			{
			bindGateway.BindGateways.Clear();
			bindGateway.BindGateways.Add(gwId);
			var result = await UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, listNotShow);
			var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });
			if (result == "Success")
			{
			this.listBackupGwId.Remove(gwId);
			}
			if (result == "Error" \|\| result == "ErrorEx")
			if (result == "Error")
			{
			break;
			}
			@@ -2099,7 +2044,7 @@
			if (this.listBackupGwId.Count == 0)
			{
			//如果没有了内容,则删除文件
			string file = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);
			string file = DirNameResourse.BackupGatewayIdFile;
			if (System.IO.File.Exists(file) == true)
			{
			System.IO.File.Delete(file);
			@@ -2108,9 +2053,7 @@
			else
			{
			//备份
			var strData = Newtonsoft.Json.JsonConvert.SerializeObject(listBackupGwId);
			var byteData = System.Text.Encoding.UTF8.GetBytes(strData);
			Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile, byteData);
			HdlFileLogic.Current.SaveFileContent(DirNameResourse.BackupGatewayIdFile, listBackupGwId);
			}
			});
			}