From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 7ed2eea..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,13 +304,14 @@
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,
};
+
bottomOptionView.AddChidren(btnPre);
- btnPre.MouseUpEventHandler = (sender, e) => {
+ btnPre.MouseUpEventHandler = (sender33, e33) => {
if (pageIndex < 1)
{
return;
@@ -325,13 +327,14 @@
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,
};
+
bottomOptionView.AddChidren(btnNext);
- btnNext.MouseUpEventHandler = (sender, e) => {
+ btnNext.MouseUpEventHandler = (sender33, e33) => {
pageIndex++;
if (pageIndex > pageCount-1)
{
@@ -343,9 +346,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 +409,7 @@
dialog.Close();
LoadEvent_ChangeCurHome(home);
LoadContentView();
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
};
}
--
Gitblit v1.8.0