From 4975f3d6beb81e3967b1018d629be9c3410b9ea3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 25 三月 2021 15:43:34 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 63c32fc..3d05e6d 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -174,7 +174,7 @@
/// <param name="type">鏄惁閫夋嫨鎵嬫満鐧诲綍</param>
void LoginTypeChange(bool isPhone)
{
- if(isPhone)
+ if (isPhone)
{
if (loginType == 0)
return;
@@ -637,9 +637,12 @@
}
else
{
- BindingResidencePage page = new BindingResidencePage();
- MainPage.BaseView.AddChidren(page);
- page.LoadView();
+ //Application.RunOnMainThread(() =>
+ //{
+ // BindingResidencePage page = new BindingResidencePage();
+ // MainPage.BaseView.AddChidren(page);
+ // page.LoadView();
+ //});
@@ -766,7 +769,7 @@
IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
});
-
+
}
return result;
}
@@ -792,7 +795,7 @@
var unlockDatetime = Utlis.UnixToDateTimeMS(revertData.unlockTime);
var unlockTimeInt = unlockDatetime.Minute - DateTime.Now.Minute;
- if(unlockTimeInt <= 0)
+ if (unlockTimeInt <= 0)
{
unlockTimeInt = 1;
}
@@ -854,7 +857,7 @@
MainPage.Log($"login callBackAction : {ex.Message}");
}
};
-
+
var registerPage = new RegisterPage(autoLoginAction);
registerPage.Show();
--
Gitblit v1.8.0