From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码
---
HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
old mode 100755
new mode 100644
index f5e52e8..862fb16
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
@@ -17,7 +17,11 @@
bodyView = this;
}
- public void LoadPage()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="isStartCheckResidenceThread">鏄惁寮�鍚綇瀹呯洃鍚嚎绋嬶紝娌℃湁浣忓畢鐨勬椂鍊欏埆浜烘壂鐮佹坊鍔犱綘涓烘垚鍛樼殑鏃跺�欒皟鐢�</param>
+ public void LoadPage(bool isStartCheckResidenceThread = false)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(StringId.MyQRcode)).LoadTopView();
@@ -114,8 +118,12 @@
//};
//backView.AddChidren(headImage2);
- //寮�鍚娴嬩綇瀹呮槸鍚﹀凡缁忔坊鍔犱簡鐨勭嚎绋�
- this.StartCheckResidenceThread();
+
+ if (isStartCheckResidenceThread)
+ {
+ //寮�鍚娴嬩綇瀹呮槸鍚﹀凡缁忔坊鍔犱簡鐨勭嚎绋�
+ this.StartCheckResidenceThread();
+ }
}
/// <summary>
@@ -131,12 +139,15 @@
while (this.Parent != null)
{
System.Threading.Thread.Sleep(4000);
-
+ if (this.Parent == null)
+ {
+ break;
+ }
//璁块棶浜戠鑾峰彇鍒楄〃
var resultObj = DAL.Server.HttpUtil.RequestHttpsPost(DAL.Server.NewAPI.API_POST_Gethomepager, requestJson);
if (resultObj.Code == DAL.Server.StateCode.SUCCESS)
{
- var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
+ var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString());
if (homeList == null || homeList.Count == 0)
{
//濡傛灉杩樻病鏈変綇瀹呯殑璇�,缁х画涓嬩竴娆℃娴�
@@ -147,8 +158,13 @@
pm.GetHomePager();
Application.RunOnMainThread(() =>
{
+ if (this.Parent == null)
+ {
+ return ;
+ }
+
//璺宠浆椤甸潰----
- MainPage.GoUserPage(false, () =>
+ MainPage.GoUserPage(true, false, () =>
{
//鏄剧ず娆㈣繋鍥炲鐨勫脊绐楃晫闈�
var form = new WellcomToHomeForm();
--
Gitblit v1.8.0