From 6ee339fc947c01b08a6e549e232f320253f16120 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 14 九月 2023 18:04:03 +0800
Subject: [PATCH] 2023年09月14日18:04:01
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 8aa0b44..66b07f4 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -89,14 +89,14 @@
#region top
FrameLayout topView = new FrameLayout()
{
- Height = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(74),
BackgroundColor = CSS_Color.TopViewColor,
};
bodyView.AddChidren(topView);
btnRoomTilte = new Button()
{
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = Application.GetRealWidth(170),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterRight,
@@ -111,7 +111,7 @@
btnFuncTitle = new Button()
{
X = Application.GetRealWidth(209),
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = Application.GetRealWidth(170),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterLeft,
@@ -125,8 +125,8 @@
contentPageView = new PageLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64 - 49 + 30),
+ Y = Application.GetRealHeight(74),
+ Height = Application.GetRealHeight(667 - 74 - 49 + 30),
BackgroundColor = CSS_Color.MainBackgroundColor,
IsShowPoint = false
};
@@ -1215,8 +1215,7 @@
{
var list =CommonMethod.Current.GetVideoDoorLockList();
var form = new VideoDoorLockListPage(()=> {
- functionContentView?.RemoveFromParent();
- this.RefreshFunctionView();
+ UpdateBottomView();
});
form.AddForm(list);
};
@@ -1228,8 +1227,7 @@
{
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);
};
@@ -1258,8 +1256,8 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
skipView.DelAction += () =>
{
- functionContentView?.RemoveFromParent();
- this.RefreshFunctionView();
+
+ UpdateBottomView();
};
};
}
@@ -1483,7 +1481,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";
}
--
Gitblit v1.8.0