~wjc/HomeApp.git

			@@ -142,8 +142,10 @@
			List<CommonDevice> list = Common.LocalDevice.Current.GetDeviceByGatewayID(gatewayId);
			foreach (var device in list)
			{
			//删除设备，不删除房间信息
			Common.LocalDevice.Current.DeleteMemmoryDevice(device, false);
			//删除一般设备
			Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);
			//删除Ota设备
			Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);
			}
			//删除网关文件
			this.DeleteGatewayFile(gatewayId);
			@@ -202,7 +204,13 @@
			/// <param name="zbGateway">网关</param>
			/// <param name="mode">是否显示错误</param>
			public async Task<bool> AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
			{
			{
			//设置网关的经纬度
			bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude, ShowErrorMode.NO);
			if (falge == false)
			{
			return falge;
			}
			//执行添加网关到内存
			var result = await this.DoAddGatewayToMemory(zbGateway, mode);
			//前的网关绑定在了当前账号下的不同住宅里面
			@@ -224,9 +232,7 @@
			{
			return false;
			}
			//设置网关的经纬度
			bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude);
			return falge;
			return true;
			}

			/// <summary>
			@@ -436,7 +442,7 @@
			return -1;
			}
			//设置网关的经纬度
			bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude);
			bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude, ShowErrorMode.YES);
			if (falge == false)
			{
			return -1;
			@@ -759,18 +765,21 @@
			{
			//删除设备文件
			Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);
			//删除Ota设备
			Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);
			}
			//如果是主网关
			if (this.IsMainGateway(zbGatewayID) == 1)
			{
			foreach (var room in Shared.Common.Room.Lists)
			var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
			foreach (var room in listAllRoom)
			{
			//删除场景文件
			foreach (var scene in room.SceneUIFilePathList)
			foreach (var sceneId in room.ListSceneId)
			{
			if (Global.IsExistsByHomeId(scene) == true)
			if (Global.IsExistsByHomeId($"Scene_{sceneId}.json") == true)
			{
			Global.DeleteFilebyHomeId(scene);
			Global.DeleteFilebyHomeId($"Scene_{sceneId}.json");
			}
			}
			}
			@@ -1628,8 +1637,11 @@
			this.GetGwInfoAttribute(localWay, "ZbImageType").ToString(),
			Convert.ToInt32(this.GetGwInfoAttribute(localWay, "ZbFWVersion")));

			var list = new List<FirmwareVersionInfo>();
			list.Add(gatewayFirmware);
			list.Add(coordinatorFirmware);

			//这个网关需要有虚拟驱动这个东西才行
			FirmwareVersionInfo virtualFirmware = null;
			string linImage = this.GetGwInfoAttribute(localWay, "LinuxImageType").ToString();
			if (linImage != "6")
			{
			@@ -1637,28 +1649,32 @@
			var listvVode = await HdlGatewayLogic.Current.GetListVDDriveCode(localWay);
			if (listvVode != null && listvVode.Count > 0)
			{
			//添加虚拟驱动的升级固件(成不成功都无所谓)
			flage = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,
			listvVode[0].DriveHwVersion.ToString(),
			listvVode[0].DriveImageType.ToString());

			//虚拟驱动
			virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.VirtualDevice,
			listvVode[0].DriveHwVersion.ToString(),
			listvVode[0].DriveImageType.ToString(),
			listvVode[0].DriveFwVersion);

			if (virtualFirmware != null)
			foreach (var data in listvVode)
			{
			virtualFirmware.VirtualCode = listvVode[0].DriveCode;
			//添加虚拟驱动的升级固件(成不成功都无所谓)
			flage = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,
			data.DriveHwVersion.ToString(),
			data.DriveImageType.ToString());

			//虚拟驱动
			var virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.VirtualDevice,
			data.DriveHwVersion.ToString(),
			data.DriveImageType.ToString(),
			data.DriveFwVersion);

			if (virtualFirmware != null)
			{
			virtualFirmware.VirtualCode = data.DriveCode;
			list.Add(virtualFirmware);
			}
			}
			}
			}
			var list = new List<FirmwareVersionInfo>();
			list.Add(gatewayFirmware);
			list.Add(coordinatorFirmware);
			list.Add(virtualFirmware);

			if (list.Count == 2)
			{
			//虚拟驱动如果没有新版本的话，固定添加一个空的
			list.Add(null);
			}
			return list;
			}

			@@ -2197,15 +2213,19 @@
			/// <param name="gateway">网关对象</param>
			/// <param name="Longitude">经度</param>
			/// <param name="Latitude">维度</param>
			/// <param name="mode">显示错误</param>
			/// <returns></returns>
			public bool SetGatewaySite(ZbGateway gateway, double Longitude, double Latitude)
			public bool SetGatewaySite(ZbGateway gateway, double Longitude, double Latitude, ShowErrorMode mode)
			{
			ZbGateway realWay = null;
			if (this.GetRealGateway(ref realWay, gateway) == false)
			{
			//错误:网关对象丢失
			string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
			this.ShowTipMsg(msg);
			if (mode == ShowErrorMode.YES)
			{
			//错误:网关对象丢失
			string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
			this.ShowTipMsg(msg);
			}
			return false;
			}

			@@ -2250,13 +2270,16 @@
			realWay.Actions -= action;
			if (result != 0)
			{
			//设置网关经纬度失败
			string msg = Language.StringByID(R.MyInternationalizationString.uSetGatewaySiteFail);
			if (result == -1)
			if (mode == ShowErrorMode.YES)
			{
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			//设置网关经纬度失败
			string msg = Language.StringByID(R.MyInternationalizationString.uSetGatewaySiteFail);
			if (result == -1)
			{
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时");
			}
			this.ShowTipMsg(msg);
			}
			this.ShowTipMsg(msg);
			return false;
			}