~wjc/HomeApp.git

			@@ -29,7 +29,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalScrolViewLayout listView = null;
			private VerticalListControl listView = null;
			/// <summary>
			/// 虚拟驱动号
			/// </summary>
			@@ -37,7 +37,7 @@
			/// <summary>
			/// 界面关闭的Action(虚拟设备,协调器,网关)
			/// </summary>
			public Action<FirmwareVersionInfo, FirmwareVersionInfo, FirmwareVersionInfo, List<ZbGatewayData.DriveCodeObj>> FormCloseAction = null;
			public Action<FirmwareVersionInfo, FirmwareVersionInfo, FirmwareVersionInfo, List<ZbGatewayData.DriveCodeObj>> SelectFirmwareInfoEvent = null;

			/// <summary>
			/// 画面显示(底层会固定调用此方法，借以完成画面创建)
			@@ -60,144 +60,146 @@
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryVersion) + "(测试版,后面估计会删除)");

			//初始化中部控件
			//this.InitMiddleFrame();
			this.InitMiddleFrame();
			}

			///// <summary>
			///// 初始化中部控件
			///// </summary>
			//private void InitMiddleFrame()
			//{
			// //清空bodyFrame
			// this.ClearBodyFrame();
			/// <summary>
			/// 初始化中部控件
			/// </summary>
			private void InitMiddleFrame()
			{
			//清空bodyFrame
			this.ClearBodyFrame();

			// listView = new VerticalScrolViewLayout();
			// listView.Height = bodyFrameLayout.Height;
			// bodyFrameLayout.AddChidren(listView);
			listView = new VerticalListControl();
			listView.Height = bodyFrameLayout.Height;
			listView.BackgroundColor = UserCenterColor.Current.White;
			bodyFrameLayout.AddChidren(listView);

			// //网关
			// var listData1 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,
			// Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxHWVersion").ToString(),
			// Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxImageType").ToString());
			//网关
			var listData1 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,
			upDatezbGateway.getGwInfo.LinuxHWVersion.ToString(),
			upDatezbGateway.getGwInfo.LinuxImageType.ToString());

			// //协调器
			// var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,
			// Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbHWVersion").ToString(),
			// Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbImageType").ToString());
			//协调器
			var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,
			upDatezbGateway.getGwInfo.ZbHWVersion.ToString(),
			upDatezbGateway.getGwInfo.ZbImageType.ToString());

			// //虚拟驱动
			// var listData3 = new List<FirmwareVersionInfo>();
			// if (this.listVode != null && this.listVode.Count > 0)
			// {
			// //如果这个网关要有虚拟驱动这个东西的时候才考虑
			// listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.VirtualDevice,
			// this.listVode[0].DriveHwVersion.ToString(),
			// this.listVode[0].DriveImageType.ToString());
			// }
			//虚拟驱动
			var listData3 = new List<FirmwareVersionInfo>();
			if (this.listVode != null && this.listVode.Count > 0)
			{
			//如果这个网关要有虚拟驱动这个东西的时候才考虑
			listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.VirtualDevice,
			this.listVode[0].DriveHwVersion.ToString(),
			this.listVode[0].DriveImageType.ToString());
			}

			// HdlThreadLogic.Current.Run(() =>
			// {
			// string fVersion = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxFWVersion").ToString();
			// string imageType = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "LinuxImageType").ToString();
			// foreach (var data in listData1)
			// {
			// //if (data.ImagType == imageType && fVersion == data.FirmwareVersion)
			// //{
			// // //同一个东西，不显示出来
			// // continue;
			// //}
			// Application.RunOnMainThread(() =>
			// {
			// this.AddRowlayout(data, FirmwareLevelType.Linux);
			// });
			// }
			HdlThreadLogic.Current.RunMainInThread(() =>
			{
			int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;
			string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();
			foreach (var data in listData1)
			{
			if (data.ImagType == imageType1 && fVersion1 == data.FirmwareVersion)
			{
			//同一个东西，不显示出来
			continue;
			}
			this.AddRowlayout(data, FirmwareLevelType.Linux);
			}

			// fVersion = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbFWVersion").ToString();
			// imageType = Common.LocalGateway.Current.GetGwInfoAttribute(upDatezbGateway, "ZbImageType").ToString();
			// foreach (var data in listData2)
			// {
			// if (data.ImagType == imageType && Convert.ToInt32(fVersion) == data.FirmwareVersion)
			// {
			// //同一个东西，不显示出来
			// continue;
			// }
			// Application.RunOnMainThread(() =>
			// {
			// this.AddRowlayout(data, FirmwareLevelType.Coordinator);
			// });
			// }
			int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;
			string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();
			foreach (var data in listData2)
			{
			if (data.ImagType == imageType2 && fVersion2 == data.FirmwareVersion)
			{
			//同一个东西，不显示出来
			continue;
			}
			this.AddRowlayout(data, FirmwareLevelType.Coordinator);
			}

			// imageType = this.listVode[0].DriveImageType.ToString();
			// foreach (var data in listData3)
			// {
			// if (data.ImagType == imageType && this.listVode[0].DriveFwVersion == data.FirmwareVersion)
			// {
			// //同一个东西，不显示出来
			// continue;
			// }
			// Application.RunOnMainThread(() =>
			// {
			// this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
			// });
			// }
			// });
			//}
			string imageType3 = this.listVode[0].DriveImageType.ToString();
			foreach (var data in listData3)
			{
			if (data.ImagType == imageType3 && this.listVode[0].DriveFwVersion == data.FirmwareVersion)
			{
			//同一个东西，不显示出来
			continue;
			}
			this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
			}
			listView.AdjustRealHeight(Application.GetRealHeight(23));
			});
			}

			///// <summary>
			///// 添加行
			///// </summary>
			///// <param name="info"></param>
			///// <param name="levelType"></param>
			//private void AddRowlayout(FirmwareVersionInfo info, FirmwareLevelType levelType)
			//{
			// var rowlayout = new StatuRowLayout(listView);
			/// <summary>
			/// 添加行
			/// </summary>
			/// <param name="info"></param>
			/// <param name="levelType"></param>
			private void AddRowlayout(FirmwareVersionInfo info, FirmwareLevelType levelType)
			{
			var rowlayout = new FrameRowControl();
			this.listView.AddChidren(rowlayout);

			// //图标
			// var btnIcon = new RowLeftIconView();
			// Common.LocalGateway.Current.SetGatewayIcon(btnIcon, this.upDatezbGateway);
			// rowlayout.AddChidren(btnIcon);
			//图标
			var btnIcon = rowlayout.AddLeftIcon(81);
			HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, this.upDatezbGateway);
			rowlayout.AddChidren(btnIcon);

			// //指定的网关
			// var btnGateway = new RowTopBlackView();
			// btnGateway.BackgroundColor = UserCenterColor.Current.Transparent;
			// btnGateway.Text = info.ShowName;
			// rowlayout.AddChidren(btnGateway);
			//指定的网关
			var btnGateway = rowlayout.AddLeftCaption(info.ShowName, Application.GetRealWidth(800), rowlayout.Height / 2, false);
			rowlayout.AddChidren(btnGateway);

			// //固件信息
			// var btnVersion = new RowBottomBlackView();
			// btnVersion.Text = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);
			// rowlayout.AddChidren(btnVersion);
			//固件信息
			var btnVersion = rowlayout.AddLeftCaption(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), Application.GetRealWidth(800), rowlayout.Height / 2, false);
			btnVersion.Y = btnGateway.Bottom;
			rowlayout.AddChidren(btnVersion);

			// //向右的图标
			// rowlayout.AddRightArrow();
			//向右的图标
			rowlayout.AddRightArrow();
			rowlayout.AddBottomLine();

			// rowlayout.MouseUpEvent += (sender, e) =>
			// {
			// string gwID = Common.LocalGateway.Current.GetGatewayId(upDatezbGateway);
			// if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwID) == true)
			// {
			// this.CloseForm();
			// return;
			// }
			// if (levelType == FirmwareLevelType.Linux)
			// {
			// this.gatewayFirmware = info;
			// }
			// else if (levelType == FirmwareLevelType.Coordinator)
			// {
			// this.coordinatorFirmware = info;
			// }
			// else if (levelType == FirmwareLevelType.VirtualDevice)
			// {
			// this.virtualFirmware = info;
			// this.virtualFirmware.VirtualCode = this.listVode[0].DriveCode;
			// }
			rowlayout.ButtonClickEvent += (sender, e) =>
			{
			string gwID = HdlGatewayLogic.Current.GetGatewayId(upDatezbGateway);
			if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwID) == true)
			{
			this.CloseForm();
			return;
			}
			if (levelType == FirmwareLevelType.Linux)
			{
			this.gatewayFirmware = info;
			}
			else if (levelType == FirmwareLevelType.Coordinator)
			{
			this.coordinatorFirmware = info;
			}
			else if (levelType == FirmwareLevelType.VirtualDevice)
			{
			this.virtualFirmware = info;
			this.virtualFirmware.VirtualCode = this.listVode[0].DriveCode;
			}

			// FormCloseAction?.Invoke(this.virtualFirmware, this.coordinatorFirmware, this.gatewayFirmware, this.listVode);
			// FormCloseAction = null;
			SelectFirmwareInfoEvent?.Invoke(this.virtualFirmware, this.coordinatorFirmware, this.gatewayFirmware, this.listVode);

			// this.CloseForm();
			// };
			//}
			this.CloseForm();
			};
			}

			/// <summary>
			/// 界面关闭
			/// </summary>
			public override void CloseForm()
			{
			SelectFirmwareInfoEvent = null;

			base.CloseForm();
			}
			}
			}