From 753e67c3705dddb8e913bd853db151f94f81d600 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 六月 2023 09:45:05 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr'
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index f485677..be1fc7d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -226,6 +226,7 @@
dialog.Close();
LoadEvent_ChangeCurHome(home);
LoadContentView();
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
};
}
dialog.Show();
@@ -303,15 +304,12 @@
Width = Application.GetRealWidth(374 / 2),
Height = Application.GetRealHeight(50) - 1,
BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
- Text = "涓婁竴椤�",
+ TextID = StringId.PreviousPage,
TextAlignment = TextAlignment.Center,
TextColor = CSS.CSS_Color.TextualColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
};
- if(Language.CurrentLanguage != "Chinese")
- {
- btnPre.Text = "Previous";
- }
+
bottomOptionView.AddChidren(btnPre);
btnPre.MouseUpEventHandler = (sender33, e33) => {
if (pageIndex < 1)
@@ -329,15 +327,11 @@
Width = Application.GetRealWidth(374 / 2),
Height = Application.GetRealHeight(50) - 1,
BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
- Text = "涓嬩竴椤�",
+ TextID = StringId.NextPage,
TextAlignment = TextAlignment.Center,
TextColor = CSS.CSS_Color.TextualColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
};
- if(Language.CurrentLanguage != "Chinese")
- {
- btnNext.Text = "Next";
- }
bottomOptionView.AddChidren(btnNext);
btnNext.MouseUpEventHandler = (sender33, e33) => {
@@ -415,6 +409,7 @@
dialog.Close();
LoadEvent_ChangeCurHome(home);
LoadContentView();
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
};
}
--
Gitblit v1.8.0