From 2a3f24ee7a01ab00b1a3c98062c5450ec75e7764 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 09:37:11 +0800
Subject: [PATCH] 2020-12-21 1.修复个人中心跳转二维码页面，弹出欢迎回家问题。
---
HDL_ON/UI/BindingResidence/BindingResidencePage.cs | 2 +-
HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs | 14 +++++++++++---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 24 ++++++++++++++++++------
3 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 315191c..4c79728 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,14 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs">
+ <Files>
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="402" Column="4" />
+ <File FileName="HDL_ON/Common/OnAppConfig.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/Common/R.cs" Line="14" Column="41" />
+ <File FileName="HDL_ON/UI/BindingResidence/WellcomToHomeForm.cs" Line="12" Column="35" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="124" Column="22" />
+ <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" Line="133" Column="36" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -8,12 +16,16 @@
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="IMessageCommon.cs" selected="True" />
- </Node>
+ <Node name="Server" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="BindingResidence" expanded="True" />
<Node name="UI1-Login" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="MyQRCodePage.cs" selected="True" />
+ </Node>
+ </Node>
</Node>
</Node>
<Node name="HDL-ON_Android" expanded="True">
@@ -32,7 +44,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="552" column="1" />
diff --git a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
old mode 100755
new mode 100644
index 92e3bfe..984dd84
--- a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
+++ b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -103,7 +103,7 @@
//鎴戠殑浜岀淮鐮�
var page = new MyQRCodePage();
AddChidren(page);
- page.LoadPage();
+ page.LoadPage(true);
//MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
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..b9cdfb0
--- 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>
--
Gitblit v1.8.0