From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 6fca48a..59d643c 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -717,9 +717,9 @@
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
+//#if DEBUG
+// functionCount = 1;
+//#endif
#endregion
break;
case ShowFunction.EnergyMonitoring:
@@ -748,7 +748,14 @@
case ShowFunction.SecurityMonitoring:
if (!MainPage.NoLoginMode)
{
- functionCount = 1;
+ if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
+ {
+ functionCount = 0;
+ }
+ else
+ {
+ functionCount = 1;
+ }
}
break;
case ShowFunction.Sensor:
@@ -768,16 +775,19 @@
functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
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;
-
+ if (Common.ApiUtlis.Ins.hadInternet)
+ {
+ functionCount = FunctionList.List.GetVideoDoorLockList().Count;
+ functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
+ || obj.GetAttrState("status").ToString() == "normal_open").Count;
+ }
+ else
+ {
+ functionCount = 0;
+ }
break;
case ShowFunction.Aks:
functionCount = FunctionList.List.GetVideoControlsList().Count;
-#if DEBUG
- functionCount = 1;
-#endif
functionOnCount = 1;
break;
@@ -834,8 +844,10 @@
TextAlignment = TextAlignment.CenterLeft,
IsMoreLines = true,
};
- functionView.AddChidren(btnName);
+ functionView.AddChidren(btnName);
+
//涓嶉渶瑕佹樉绀鸿澶囧紑鐘舵�佹暟閲�;
+ Button btnFunctionCount=null;
if (item != ShowFunction.Aks
&& item != ShowFunction.VideoDoorLock
&& item != ShowFunction.Environmental
@@ -849,7 +861,7 @@
&& item != ShowFunction.Acst && item != ShowFunction.IpCam
&& functionCount != 0)
{
- Button btnFunctionCount = new Button()
+ btnFunctionCount = new Button()
{
X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
Y = btnName.Bottom,
@@ -1213,21 +1225,21 @@
{
var list =CommonMethod.Current.GetVideoDoorLockList();
var form = new VideoDoorLockListPage(()=> {
- functionContentView?.RemoveFromParent();
- this.RefreshFunctionView();
+ UpdateBottomView();
});
form.AddForm(list);
};
break;
case ShowFunction.Aks:
+
+ btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
//鍩冨厠鏂奖闊充腑鎺�
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();
+ UpdateBottomView();
});
form.AddForm(list);
};
@@ -1249,10 +1261,16 @@
{
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 +1485,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 +1493,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 +1808,18 @@
{
}
-#endregion
+ #endregion
+
+ /// <summary>
+ /// 鏇存柊搴曢儴鐣岄潰
+ /// </summary>
+ void UpdateBottomView()
+ {
+ Application.RunOnMainThread(() =>
+ {
+ functionContentView?.RemoveFromParent();
+ this.RefreshFunctionView();
+ });
+ }
}
}
--
Gitblit v1.8.0