~wxr/OnPro.git - Gitblit

			@@ -772,7 +772,11 @@
			break;
			case ShowFunction.Acst:
			functionCount = FunctionList.List.GetAcstParentList().Count;
			functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionOnCount = 0;
			break;
			case ShowFunction.InverterJinmao:
			functionCount = FunctionList.List.GetInverterJinmaoList().Count;
			functionOnCount = 0;
			break;
			case ShowFunction.VideoDoorLock:
			if (Common.ApiUtlis.Ins.hadInternet)
			@@ -858,7 +862,7 @@
			&& item != ShowFunction.Music
			&& item != ShowFunction.EnergyMonitoring
			&& item != ShowFunction.SecurityCenter
			&& item != ShowFunction.Acst && item != ShowFunction.IpCam
			&& item != ShowFunction.Acst && item != ShowFunction.IpCam && item != ShowFunction.InverterJinmao
			&& functionCount != 0)
			{
			btnFunctionCount = new Button()
			@@ -1174,8 +1178,7 @@
			};
			break;
			case ShowFunction.Acst:
			btnName.TextID = StringId.Acst;

			case ShowFunction.InverterJinmao:
			Button btnJMLogo = new Button()
			{
			Y = specialList.Contains(index) ? Application.GetRealWidth(147) : Application.GetRealWidth(104),
			@@ -1185,30 +1188,10 @@
			};
			functionView.AddChidren(btnJMLogo);

			//Button btnAcstPower = 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(btnAcstPower);
			//btnAcstPower.MouseUpEventHandler = (sender, e) =>
			//{
			// btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
			// string onoff = btnAcstPower.IsSelected ? "on" : "off";
			// Dictionary<string, string> d = new Dictionary<string, string>();
			// d.Add(FunctionAttributeKey.OnOff, onoff);
			// foreach (var temp in FunctionList.List.GetAcstParentList())
			// {
			// Control.Ins.SendWriteCommand(temp, d);
			// }
			//};

			if (item == ShowFunction.Acst)
			{
			btnName.TextID = StringId.Acst;

			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			@@ -1217,6 +1200,18 @@
			page.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			}
			else if (item == ShowFunction.InverterJinmao)
			{
			btnName.TextID = StringId.NewEnergy;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			var page = new InverterJinmaoPage();
			MainPage.BasePageView.AddChidren(page);
			page.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			}
			break;
			case ShowFunction.VideoDoorLock:
			//萤石视频门锁
			@@ -1257,7 +1252,7 @@
			&& ShowFunction.VideoIntercom != item
			&& ShowFunction.SecurityCenter != item
			&& ShowFunction.Series != item
			&& ShowFunction.Acst != item)
			&& ShowFunction.Acst != item && ShowFunction.InverterJinmao != item)
			{
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{