From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 224 ++++++++++++++++++++++++++++---------------------------
1 files changed, 115 insertions(+), 109 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 6fca48a..841d748 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1,11 +1,11 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Security.Cryptography;
using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
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;
@@ -716,10 +716,10 @@
#region 鐢靛櫒
functionCount = FunctionList.List.GetElectricals().Count;
- functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
-#if DEBUG
- functionCount = 1;
-#endif
+ functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+//#if DEBUG
+// functionCount = 1;
+//#endif
#endregion
break;
case ShowFunction.EnergyMonitoring:
@@ -745,19 +745,17 @@
break;
case ShowFunction.Panel:
break;
- case ShowFunction.SecurityMonitoring:
- if (!MainPage.NoLoginMode)
- {
- functionCount = 1;
- }
- break;
+
case ShowFunction.Sensor:
functionCount = FunctionList.List.GetArmSensorList().Count;
break;
case ShowFunction.VideoIntercom:
if (FunctionList.List.videoIntercom != null && FunctionList.List.videoIntercom.Count > 0)
{
- functionCount = 1;
+ if (Common.ApiUtlis.Ins.hadInternet)
+ {
+ functionCount = 1;
+ }
}
break;
case ShowFunction.SecurityCenter:
@@ -765,24 +763,13 @@
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.VideoDoorLock:
- functionCount = FunctionList.List.GetVideoDoorLockList().Count;
- functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
- || obj.GetAttrState("status").ToString() == "normal_open").Count;
-
+ case ShowFunction.InverterJinmao:
+ functionCount = FunctionList.List.GetInverterJinmaoList().Count;
+ functionOnCount = 0;
break;
- case ShowFunction.Aks:
- functionCount = FunctionList.List.GetVideoControlsList().Count;
-#if DEBUG
- functionCount = 1;
-#endif
- functionOnCount = 1;
- break;
-
-
-
+
}
if (functionCount == 0)
@@ -834,22 +821,21 @@
TextAlignment = TextAlignment.CenterLeft,
IsMoreLines = true,
};
- functionView.AddChidren(btnName);
+ functionView.AddChidren(btnName);
+
//涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
- if (item != ShowFunction.Aks
- && item != ShowFunction.VideoDoorLock
- && item != ShowFunction.Environmental
+ Button btnFunctionCount=null;
+ 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.IpCam
+ && item != ShowFunction.Acst && item != ShowFunction.IpCam && item != ShowFunction.InverterJinmao
&& functionCount != 0)
{
- Button btnFunctionCount = new Button()
+ btnFunctionCount = new Button()
{
X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
Y = btnName.Bottom,
@@ -1132,13 +1118,6 @@
case ShowFunction.Panel:
btnName.TextID = StringId.Panel;
break;
- case ShowFunction.SecurityMonitoring:
- btnName.TextID = StringId.EZVIZ;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- HDLCommon.Current.Go2EZvizMonitor(bodyView);
- };
- break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
functionPageTitleId = StringId.Sensor;
@@ -1162,8 +1141,14 @@
};
break;
case ShowFunction.Acst:
- btnName.TextID = StringId.Acst;
-
+ case ShowFunction.InverterJinmao:
+ //if(item == ShowFunction.Acst)
+ //{
+ // btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";
+ //}else if (item == ShowFunction.InverterJinmao)
+ //{
+ // btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";
+ //}
Button btnJMLogo = new Button()
{
Y = specialList.Contains(index) ? Application.GetRealWidth(147) : Application.GetRealWidth(104),
@@ -1172,87 +1157,89 @@
Height = Application.GetRealWidth(57),
};
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;
+ try
+ {
+ var acstFunction = FunctionList.List.GetAcstParentList()[0];
+ btnName.Text = acstFunction.name;
+ if (acstFunction.extend.Contains("jinmao") && acstFunction.extend.Contains("true"))
+ {
+ btnJMLogo.Visible = true;
+ }
+ else
+ {
+ btnJMLogo.Visible = false;
+ }
-
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Error", $"鍔犺浇閲戣寕绉戞妧绯荤粺涓绘帶鍚嶇О寮傚父:{ex.Message}");
+ }
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new AcstParentPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+ else if (item == ShowFunction.InverterJinmao)
{
- var page = new AcstParentPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- 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;
- case ShowFunction.Aks:
- //鍩冨厠鏂奖闊充腑鎺�
- btnName.TextID = StringId.jiatingyingyuan;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
- {
- var list = HDL_ON.UI.UI2.FuntionControlView.Aks.AksCommonMethod.Current.GetVideoControlsList();
- var form = new HDL_ON.UI.UI2.FuntionControlView.Aks.AksListPage(() => {
- functionContentView?.RemoveFromParent();
- this.RefreshFunctionView();
- });
- form.AddForm(list);
- };
+ btnName.TextID = StringId.NewEnergy;
+ try
+ {
+ var jinmaoInverterFunction = FunctionList.List.GetInverterJinmaoList()[0];
+ btnName.Text = jinmaoInverterFunction.name;
+ if (jinmaoInverterFunction.extend.Contains("jinmao") && jinmaoInverterFunction.extend.Contains("true"))
+ {
+ btnJMLogo.Visible = true;
+ }
+ else
+ {
+ btnJMLogo.Visible = false;
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Error", $"鍔犺浇閲戣寕鍌ㄨ兘鍚嶇О寮傚父:{ex.Message}");
+ }
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new InverterJinmaoPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
break;
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�--鍩冨厠鏂奖闊充腑鎺�
- if (item != ShowFunction.VideoDoorLock
- && item != ShowFunction.Aks
- && item != ShowFunction.Music
+ if ( 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)
+ && ShowFunction.Acst != item && ShowFunction.InverterJinmao != item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
+
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(functionPageTitleId);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ skipView.DelAction += () =>
+ {
+
+ UpdateBottomView();
+ };
};
}
index++;
@@ -1467,7 +1454,7 @@
//#if __Android__
//閫傞厤娌夋蹈寮忓鑸爮
- h5BasePage.Y = Application.GetRealHeight(20);
+ h5BasePage.Y = Application.GetRealHeight(35);
h5BasePage.Height = Application.GetRealHeight(646);
//#endif
MainPage.BasePageView.AddChidren(h5BasePage);
@@ -1475,7 +1462,14 @@
h5BasePage.AddChidren(Inverter.Ins.H5Page);//000
string lz = "zh";
- if (Language.CurrentLanguage != "Chinese")
+ if (Language.CurrentLanguage == "Ukraine") {
+ lz = "ua";
+ }
+ else if (Language.CurrentLanguage == "Chinese")
+ {
+ lz = "zh";
+ }
+ else
{
lz = "en";
}
@@ -1783,6 +1777,18 @@
{
}
-#endregion
+ #endregion
+
+ /// <summary>
+ /// 鏇存柊搴曢儴鐣岄潰
+ /// </summary>
+ void UpdateBottomView()
+ {
+ Application.RunOnMainThread(() =>
+ {
+ functionContentView?.RemoveFromParent();
+ this.RefreshFunctionView();
+ });
+ }
}
}
--
Gitblit v1.8.0