~wxr/OnPro.git - Gitblit

			@@ -1,5 +1,6 @@
			using System;
			using System.Threading;
			using HDL_ON.DAL.Server;
			using HDL_ON.Entity;
			using Shared;

			@@ -11,7 +12,7 @@
			/// <summary>
			/// 功能控制界面跳转事件
			/// </summary>
			public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor
			public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor, Comerom comerom,Action action
			)
			{
			EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
			@@ -38,6 +39,12 @@
			rgbView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			break;
			case SPK.LightRGBW:
			var rgbwView = new RGBWPage(function);
			MainPage.BasePageView.AddChidren(rgbwView);
			rgbwView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			break;
			case SPK.LightDimming:
			var dimmerView = new DimmerPage(function);
			MainPage.BasePageView.AddChidren(dimmerView);
			@@ -57,9 +64,21 @@
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			break;
			case SPK.CurtainRoller:
			var rollingShutterView = new RollingShutterPage(function);
			var rollingShutterView = new VenetianBlindsPage(function);
			MainPage.BasePageView.AddChidren(rollingShutterView);
			rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			break;
			case SPK.CurtainShades:
			var curtainShadesView = new RollingShutterPage(function);
			MainPage.BasePageView.AddChidren(curtainShadesView);
			curtainShadesView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			break;
			case SPK.CurtainDream:
			var curtainDreamView = new CurtainDreamPage(function);
			MainPage.BasePageView.AddChidren(curtainDreamView);
			curtainDreamView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			break;
			case SPK.FloorHeatStandard:
			@@ -117,6 +136,10 @@
			case SPK.ElectricTuyaWaterValve2:
			var tyWaterValve = new TuyaWaterValvePage();
			tyWaterValve.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.MechanicalArm:
			var mechanicalArmPage = new MechanicalArmPage();
			mechanicalArmPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.ElectricTuyaWeepRobot:
			case SPK.ElectricTuyaWeepRobot2:
			@@ -142,6 +165,11 @@
			pirPage.ShowColltionButton = false;
			pirPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.SensorHelp:
			var helpPage = new PanelHelpPage();
			helpPage.ShowColltionButton = false;
			helpPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.SensorWater:
			var waterPage = new SensorWaterImmersionPage();
			waterPage.ShowColltionButton = false;
			@@ -157,10 +185,10 @@
			doorwindowPage.ShowColltionButton = false;
			doorwindowPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.SensorMmvPose:
			case SPK.SenesorMegahealth:
			case SPK.SenesorMegahealth2:
			var smPage = new SenesorMegahealthPage();
			smPage.ShowColltionButton = false;
			smPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.SensorGas:
			@@ -182,6 +210,10 @@
			var acPage = new AcControlPage();
			acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.HvacCac:
			var cacPage = new CacControlPage();
			cacPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.IrLearn:
			var irLearinPage = new IrLearnPage();
			irLearinPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			@@ -200,6 +232,89 @@
			var doorLockPage = new DoorLockPage();
			doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
			break;
			case SPK.IpCam_Imou:
			#if __IOS__
			#else
			FunctionList.List.GetIpCamImouList();
			if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
			{
			var waitPage = new Loading();
			MainPage.BaseView.AddChidren(waitPage);
			waitPage.Start("");
			new System.Threading.Thread(() =>
			{
			try
			{
			var http = new HttpServerRequest();
			var pack = http.GetLcSubAccountToken();
			if (pack.Code == StateCode.SUCCESS)
			{
			if (pack.Data == null \|\| string.IsNullOrEmpty(pack.Data.ToString()))
			{
			Application.RunOnMainThread(() =>
			{
			new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
			});
			}
			Application.RunOnMainThread(() =>{
			try
			{
			Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
			Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
			}
			catch (Exception ex)
			{

			}
			});
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
			});
			}
			}
			catch (Exception ex)
			{
			MainPage.Log("加载乐橙摄像头异常");
			}
			finally
			{
			Application.RunOnMainThread(() =>
			{
			if (waitPage != null)
			{
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			});
			}
			})
			{ IsBackground = true }.Start();
			}
			else
			{
			try
			{
			Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
			}
			catch (Exception ex)
			{

			}
			}
			#endif
			break;
			case SPK.VideoDoorLock: {
			//萤石视频门锁
			var form = new VideoDoorLockPage(function, btnName, btnFromFloor,comerom,action);
			MainPage.BasePageView.AddChidren(form);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			form.Show();
			}
			break;
			}
			};
			return eventHandler;