From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 73 ++++++++++--------------------------
1 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 7d8eace..201b868 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();
+ //});
@@ -648,7 +651,7 @@
UserInfo.Current.LastTime = DateTime.MinValue;
UserInfo.Current.SaveUserInfo();
//鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒
- Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
+ //Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
}
}
}
@@ -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;
}
@@ -811,8 +814,8 @@
bool LoadMethod_GetResidences()
{
var result = false;
- var responsePack = pm.GetHomePager();
- if (responsePack == StateCode.SUCCESS)
+ var code = pm.GetHomePager();
+ if (code == StateCode.SUCCESS)
{
////2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
//if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
@@ -822,10 +825,17 @@
//2020-12-10 娌℃湁浣忓畢鐧诲綍鎴愬姛锛屼絾鏄笉鑳借繘鍏ヤ富鐣岄潰
result = true;
}
+ else if( code == "null")
+ {
+ Application.RunOnMainThread(() =>
+ {
+ MainPage.GoUserPage(false);
+ });
+ }
else
{
// 鎻愮ず閿欒
- IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
+ IMessageCommon.Current.ShowErrorInfoAlter(code);
}
return result;
}
@@ -839,12 +849,6 @@
{
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-
-#if DEBUG
- TestEZSDK();
- return;
-#endif
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -860,42 +864,12 @@
MainPage.Log($"login callBackAction : {ex.Message}");
}
};
-
+
var registerPage = new RegisterPage(autoLoginAction);
registerPage.Show();
registerPage.ShowDialog();
};
- }
-
-
- void TestESVideo()
- {
-
-#if __Android__
-#else
- //EZSDK.IOS.EZSDK.Go2EZvizMonitor();
- Shared.ESVideoInfo eSVideoInfo = new Shared.ESVideoInfo();
- eSVideoInfo.DeviceName = "瀹ゅ鏈�88";
- eSVideoInfo.ESVideoUUID = "JJY000019VPLLF";
- eSVideoInfo.ESRoomID = 801;
- eSVideoInfo.RoomName = "0801";
- Shared.ESVideo.ShowESVideoMonitor(eSVideoInfo);
- return;
-#endif
-
- }
-
- void TestEZSDK()
- {
-
-#if __Android__
-#else
- EZSDK.IOS.EZSDK.Go2EZvizMonitor();
-
- return;
-#endif
-
}
/// <summary>
@@ -907,11 +881,6 @@
{
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-#if DEBUG
- TestESVideo();
- return;
-#endif
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
--
Gitblit v1.8.0