From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index e503084..11ce006 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -225,8 +225,31 @@
var regionId = (string)btnHomeName.Tag;
dialog.Close();
LoadEvent_ChangeCurHome(home);
- LoadContentView();
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
+ new System.Threading.Thread(() => {
+ try
+ {
+ while (true)
+ {
+ if (Common.ApiUtlis.Ins.DownloadDataComplete)
+ {
+ System.Threading.Thread.Sleep(100);
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ LoadContentView();
+ });
+ break;
+ }
+ }
+ }
+ catch { }
+ {
+
+ }
+ }) { IsBackground = true }.Start();
+
};
}
dialog.Show();
@@ -270,6 +293,7 @@
BorderColor = CSS.CSS_Color.DividingLineColor,
BorderWidth = 3,
TextColor = CSS.CSS_Color.TextualColor,
+ Radius = 1,
};
searchView.AddChidren(searchTv);
@@ -304,15 +328,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)
@@ -330,15 +351,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,8 +432,31 @@
var regionId = (string)btnHomeName.Tag;
dialog.Close();
LoadEvent_ChangeCurHome(home);
- LoadContentView();
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
+ new System.Threading.Thread(() => {
+ try
+ {
+ while (true)
+ {
+ if (Common.ApiUtlis.Ins.DownloadDataComplete)
+ {
+ System.Threading.Thread.Sleep(100);
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ LoadContentView();
+ });
+ break;
+ }
+ }
+ }
+ catch { }
+ {
+
+ }
+ })
+ { IsBackground = true }.Start();
};
}
--
Gitblit v1.8.0