From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/BindingResidence/BindingResidencePage.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
old mode 100644
new mode 100755
index 9c47c9b..92e3bfe
--- a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
+++ b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -124,11 +124,21 @@
if (result.Code == DAL.Server.StateCode.SUCCESS)
{
+ //璋冪敤On鍘熸潵鐨勬柟娉�,鍒锋柊浣忓畢鍒楄〃鍙婂叾缂撳瓨
+ pm.GetHomePager();
//璺宠浆椤甸潰----
- MainPage.GoUserPage();
- //鏄剧ず娆㈣繋鍥炲鐨勫脊绐楃晫闈�
- var form = new WellcomToHomeForm();
- form.ShowForm();
+ MainPage.GoUserPage(false, () =>
+ {
+ //鏄剧ず娆㈣繋鍥炲鐨勫脊绐楃晫闈�
+ var form = new WellcomToHomeForm();
+ form.ShowForm();
+ });
+ }
+ //鍏朵粬鎯呭喌鍏ㄩ儴鎻愮ず澶辨晥
+ else
+ {
+ //鏄剧ず浜岀淮鐮佸凡缁忚繃鏈熺殑寮圭獥
+ this.ShowQrCodeTimeOutView();
}
}
@@ -139,6 +149,7 @@
{
//鏁翠釜鐣岄潰鐨勭伆鑹茶儗鏅�
var frameBack = new Dialog();
+ frameBack.Show();
//涓棿鐧借壊鍖哄煙
var frameWite = new FrameLayout();
@@ -156,7 +167,7 @@
picIcon.Height = Application.GetRealWidth(160);
picIcon.Width = Application.GetRealWidth(160);
picIcon.Gravity = Gravity.CenterHorizontal;
- picIcon.UnSelectedImagePath = "oRobot.png";
+ picIcon.UnSelectedImagePath = "ErrorIcon.png";
frameBack.AddChidren(picIcon);
//浜岀淮鐮佸け鏁堬紝璇烽噸璇�
--
Gitblit v1.8.0