From bdc8f378f6d736fda030b3ceceab3acd91505679 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 16:10:50 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-cqy（1.5.9）
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 7ed2eea..e503084 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();
@@ -308,8 +309,12 @@
TextColor = CSS.CSS_Color.TextualColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
};
+ if(Language.CurrentLanguage != "Chinese")
+ {
+ btnPre.Text = "Previous";
+ }
bottomOptionView.AddChidren(btnPre);
- btnPre.MouseUpEventHandler = (sender, e) => {
+ btnPre.MouseUpEventHandler = (sender33, e33) => {
if (pageIndex < 1)
{
return;
@@ -330,8 +335,13 @@
TextColor = CSS.CSS_Color.TextualColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
};
+ if(Language.CurrentLanguage != "Chinese")
+ {
+ btnNext.Text = "Next";
+ }
+
bottomOptionView.AddChidren(btnNext);
- btnNext.MouseUpEventHandler = (sender, e) => {
+ btnNext.MouseUpEventHandler = (sender33, e33) => {
pageIndex++;
if (pageIndex > pageCount-1)
{
@@ -343,9 +353,9 @@
#endregion
- searchTv.TextChangeEventHandler = (sender, e) => {
+ searchTv.TextChangeEventHandler = (sender33, e33) => {
new System.Threading.Thread(() => {
- newlist = UserInfo.Current.regionList.FindAll((obj) => obj.homeName.Contains(e));
+ newlist = UserInfo.Current.regionList.FindAll((obj) => obj.homeName.Contains(e33));
pageCount = newlist.Count;
pageIndex = 0;
Application.RunOnMainThread(() => {
@@ -406,6 +416,7 @@
dialog.Close();
LoadEvent_ChangeCurHome(home);
LoadContentView();
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
};
}
--
Gitblit v1.8.0