~wxr/OnPro.git - Gitblit

			@@ -5,6 +5,7 @@
			using HDL_ON.Entity;
			using HDL_ON.UI;
			using HDL_ON.UI.CSS;
			using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Shared;
			@@ -605,21 +606,35 @@
			};
			}


			/// <summary>
			/// 加载功能列表界面
			/// </summary>
			void LoadFunctionPageView()
			void LoadFunctionPageView ()
			{
			#region
			functionsPageView = new VerticalScrolViewLayout()
			{
			BackgroundColor = CSS_Color.BackgroundColor,
			Height = Application.GetRealHeight(667 - 64 - 49 + 20),
			};
			contentPageView.AddChidren(functionsPageView);
			this.RefreshFunctionView();

			FrameLayout functionContentView;
			}
			FrameLayout functionContentView;
			/// <summary>
			/// 显示功能列表界面
			/// </summary>
			void RefreshFunctionView()
			{
			#region
			//functionsPageView = new VerticalScrolViewLayout()
			//{
			// BackgroundColor = CSS_Color.BackgroundColor,
			// Height = Application.GetRealHeight(667 - 64 - 49 + 20),
			//};
			//contentPageView.AddChidren(functionsPageView);

			//FrameLayout functionContentView;
			functionContentView = new FrameLayout()
			{
			Y = Application.GetRealHeight(16),
			@@ -649,12 +664,23 @@
			var lastY2 = Application.GetRealWidth(16);
			var functionContentViewHeight = Application.GetRealWidth(16);

			foreach (var item in DB_ResidenceData.Instance.functionTypeList)
			foreach (var item in DB_ResidenceData.Instance.ShowFunctionTypeList)
			{
			int functionCount = 0;
			int functionOnCount = 0;
			switch (item)
			{
			case ShowFunction.Series:
			functionCount = FunctionList.List.GetSeries().Count;
			//functionOnCount = FunctionList.List.GetSeries().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.IpCam:
			functionCount = FunctionList.List.GetIpCamImouList().Count;
			break;
			case ShowFunction.MechanicalArm:
			functionCount = FunctionList.List.GetMechanicalArmList().Count;
			functionOnCount = FunctionList.List.GetMechanicalArmList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.Light:
			#region Light
			functionCount = FunctionList.List.GetLightList().Count;
			@@ -738,6 +764,14 @@
			functionCount = FunctionList.List.GetAcstParentList().Count;
			functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.VideoDoorLock:
			functionCount = FunctionList.List.GetVideoDoorLockList().Count;
			#if DEBUG
			//functionCount = 1;
			#endif
			functionOnCount = 1;
			break;



			}
			@@ -791,12 +825,12 @@
			TextAlignment = TextAlignment.CenterLeft,
			IsMoreLines = true,
			};
			functionView.AddChidren(btnName);
			functionView.AddChidren(btnName);

			if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
			&& item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
			&& item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
			&& item != ShowFunction.Acst
			&& item != ShowFunction.Acst && item != ShowFunction.IpCam
			&& functionCount != 0)
			{
			Button btnFunctionCount = new Button()
			@@ -810,21 +844,29 @@
			TextAlignment = TextAlignment.CenterLeft,
			Text = "/" + functionCount,
			};
			functionView.AddChidren(btnFunctionCount);
			Button btnOpenCount = new Button()
			if (item == ShowFunction.Series)
			{
			X = Application.GetRealWidth(16),
			Y = btnName.Bottom,
			Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
			Height = Application.GetRealHeight(24),
			TextColor = CSS_Color.MainColor,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			TextAlignment = TextAlignment.CenterLeft,
			Text = functionOnCount.ToString(),
			Tag = item + "_onCount",
			BorderWidth = 0,
			};
			functionView.AddChidren(btnOpenCount);
			btnFunctionCount.Text = functionCount.ToString();
			}
			functionView.AddChidren(btnFunctionCount);

			if (item != ShowFunction.Series)
			{
			Button btnOpenCount = new Button()
			{
			X = Application.GetRealWidth(16),
			Y = btnName.Bottom,
			Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
			Height = Application.GetRealHeight(24),
			TextColor = CSS_Color.MainColor,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			TextAlignment = TextAlignment.CenterLeft,
			Text = functionOnCount.ToString(),
			Tag = item + "_onCount",
			BorderWidth = 0,
			};
			functionView.AddChidren(btnOpenCount);
			}
			}


			@@ -839,6 +881,16 @@
			int functionPageTitleId = 0;
			switch (item)
			{
			case ShowFunction.Series:
			btnName.TextID = StringId.HorseRaceLamp;
			functionPageTitleId = StringId.HorseRaceLamp;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
			var page2 = new UI2.Classification.SeriesFunctionListPage();
			MainPage.BasePageView.AddChidren(page2);
			page2.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			break;
			case ShowFunction.Light:
			#region Light
			btnName.TextID = StringId.Lights;
			@@ -862,6 +914,36 @@
			functionPageTitleId = StringId.Lights;

			#endregion
			break;
			case ShowFunction.IpCam:
			btnName.TextID = StringId.SecurityMonitoring;

			btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";

			functionPageTitleId = StringId.SecurityMonitoring;

			break;
			case ShowFunction.MechanicalArm:
			btnName.TextID = StringId.MechanicalArm;
			Button btnMaPower = new Button()
			{
			X = Application.GetRealWidth(120),
			Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
			Width = Application.GetRealWidth(32),
			Height = Application.GetRealWidth(32),
			SelectedImagePath = "Public/PowerOpen.png",
			UnSelectedImagePath = "Public/PowerClose.png",
			IsSelected = functionOnCount > 0,
			Tag = item + "_AllControl",
			};
			functionView.AddChidren(btnMaPower);

			btnMaPower.MouseUpEventHandler = (sender, e) =>
			{
			LoadEvent_SwitchFunction(btnMaPower, item, functionView);
			};
			functionPageTitleId = StringId.MechanicalArm;

			break;
			case ShowFunction.AC:
			#region AC
			@@ -1033,7 +1115,7 @@
			btnName.TextID = StringId.Panel;
			break;
			case ShowFunction.SecurityMonitoring:
			btnName.TextID = StringId.SecurityMonitoring;
			btnName.TextID = StringId.EZVIZ;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			HDLCommon.Current.Go2EZvizMonitor(bodyView);
			@@ -1106,12 +1188,31 @@
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			break;

			case ShowFunction.VideoDoorLock:
			//萤石视频门锁
			btnName.TextID = StringId.yingshishipinmensuo;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			var list =CommonMethod.Current.GetVideoDoorLockList();
			var form = new VideoDoorLockListPage(()=> {
			functionContentView?.RemoveFromParent();
			this.RefreshFunctionView();
			});
			form.AddForm(list);
			};
			break;

			}
			//界面跳转--音乐跳转自己的界面--环境跳转自己的界面
			if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
			&& ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
			//界面跳转--音乐跳转自己的界面--环境跳转自己的界面--(萤石视频门锁)跳转自己的界面
			if (item != ShowFunction.VideoDoorLock
			&& item != ShowFunction.Music
			&& item != ShowFunction.Environmental
			&& item != ShowFunction.SecurityMonitoring
			&& item != ShowFunction.DoorLock
			&& ShowFunction.EnergyMonitoring != item
			&& ShowFunction.VideoIntercom != item
			&& ShowFunction.SecurityCenter != item
			&& ShowFunction.Series != item
			&& ShowFunction.Acst != item)
			{
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			@@ -1346,12 +1447,18 @@
			{
			lz = "en";
			}
			string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={OnAppConfig.Instance.RequestHttpsHost}&language={lz}";
			string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={OnAppConfig.Instance.RequestHttpsHost}&language={lz}&weather={MainPage.cityInfo.weather}";
			Inverter.Ins.ShowWebviewFormUrl(url);

			Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
			{
			#if __IOS__
			JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
			#else
			var valuePairs = "";
			dictionary.TryGetValue("method", out valuePairs);
			JObject jObj = JObject.Parse(valuePairs);
			#endif

			if (!jObj.ContainsKey("method") \|\| !jObj.ContainsKey("data"))
			{
			@@ -1404,9 +1511,11 @@

			s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);

			#endregion
			#endregion
			}



			void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration)
			{
			new System.Threading.Thread(() =>