From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1

---
 HDL_ON/UI/BindingResidence/BindingResidencePage.cs |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
index 9c47c9b..601d6d5 100644
--- a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
+++ b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -103,13 +103,12 @@
                 //鎴戠殑浜岀淮鐮�
                 var page = new MyQRCodePage();
                 AddChidren(page);
-                page.LoadPage();
-                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                page.LoadPage(true);
             };
 
             btnLogout.MouseUpEventHandler = (sender, e) =>
             {
-                MainPage.GoLoginPage(UserInfo.Current);
+                HDLCommon.Current.Logout();
             };
         }
 
@@ -124,11 +123,21 @@
 
             if (result.Code == DAL.Server.StateCode.SUCCESS)
             {
+                //璋冪敤On鍘熸潵鐨勬柟娉�,鍒锋柊浣忓畢鍒楄〃鍙婂叾缂撳瓨
+                pm.GetHomePager();
                 //璺宠浆椤甸潰----
-                MainPage.GoUserPage();
-                //鏄剧ず娆㈣繋鍥炲鐨勫脊绐楃晫闈�
-                var form = new WellcomToHomeForm();
-                form.ShowForm();
+                MainPage.GoUserPage(true, false, () =>
+                {
+                    //鏄剧ず娆㈣繋鍥炲鐨勫脊绐楃晫闈�
+                    var form = new WellcomToHomeForm();
+                    form.ShowForm();
+                });
+            }
+            //鍏朵粬鎯呭喌鍏ㄩ儴鎻愮ず澶辨晥
+            else
+            {
+                //鏄剧ず浜岀淮鐮佸凡缁忚繃鏈熺殑寮圭獥
+                this.ShowQrCodeTimeOutView();
             }
         }
 
@@ -139,6 +148,7 @@
         {
             //鏁翠釜鐣岄潰鐨勭伆鑹茶儗鏅�
             var frameBack = new Dialog();
+            frameBack.Show();
 
             //涓棿鐧借壊鍖哄煙
             var frameWite = new FrameLayout();
@@ -156,7 +166,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