From dd7e4794fd611de967c6322dd0bb7ffda41c2f7b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 29 十一月 2021 16:32:55 +0800
Subject: [PATCH] 增加了安防相关功能

---
 HDL_ON/UI/UI1-Login/LoginPageBLL.cs |   50 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index c5a084d..7b9c9c7 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;
@@ -598,7 +598,7 @@
                             if (verAccount == etPassword.Text.Trim())
                             {
                                 //璺宠浆椤甸潰----
-                                MainPage.GoUserPage();
+                                MainPage.GoUserPage(true);
                                 return;
                             }
                         });
@@ -629,15 +629,20 @@
                             //}
                             Application.RunOnMainThread(() =>
                             {
+                                //20201223-鐧诲綍鎴愬姛涔嬪悗锛屽皢涓嬭浇鏁版嵁瀹屾垚鏍囪鏍囪涓篺alse锛岄槻姝富椤垫彁鍓嶅姞杞�
+                                Common.ApiUtlis.Ins.DownloadDataComplete = false;
                                 //璺宠浆椤甸潰----
-                                MainPage.GoUserPage();
+                                MainPage.GoUserPage(true);
                             });
                         }
                         else
                         {
-                            BindingResidencePage page = new BindingResidencePage();
-                            MainPage.BaseView.AddChidren(page);
-                            page.LoadView();
+                            //Application.RunOnMainThread(() =>
+                            //{
+                            //    BindingResidencePage page = new BindingResidencePage();
+                            //    MainPage.BaseView.AddChidren(page);
+                            //    page.LoadView();
+                            //});
 
 
 
@@ -646,7 +651,7 @@
                             UserInfo.Current.LastTime = DateTime.MinValue;
                             UserInfo.Current.SaveUserInfo();
                             //鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒
-                            Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
+                            //Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
                         }
                     }
                 }
@@ -721,6 +726,12 @@
                 //UserInfo.Current.CurrentRegion.RegionID = "";
                 UserInfo.Current.SaveUserInfo();
                 MainPage.Log("鐧诲綍鎴愬姛銆�");
+#if __IOS__
+                var sdm = new SiriKit.SceneDateManager();
+                sdm.AccessToken = UserInfo.Current.LoginTokenString;
+                sdm.RefreshToken = UserInfo.Current.RefreshToken;
+#endif
+
                 result = true;
                 //鑾峰彇鐢ㄦ埛淇℃伅
                 new Thread(() =>
@@ -764,7 +775,7 @@
                     IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
                 });
 
-            
+
             }
             return result;
         }
@@ -790,7 +801,7 @@
 
                     var unlockDatetime = Utlis.UnixToDateTimeMS(revertData.unlockTime);
                     var unlockTimeInt = unlockDatetime.Minute - DateTime.Now.Minute;
-                    if(unlockTimeInt <= 0)
+                    if (unlockTimeInt <= 0)
                     {
                         unlockTimeInt = 1;
                     }
@@ -809,8 +820,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)
@@ -820,10 +831,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;
         }
@@ -835,6 +853,9 @@
         {
             btnRegister.MouseUpEventHandler += (sender, e) =>
             {
+                //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+                Application.HideSoftInput();
+
                 //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
                 if (CheckPrivacyPolicy() == false) return;
 
@@ -849,6 +870,7 @@
                         MainPage.Log($"login callBackAction : {ex.Message}");
                     }
                 };
+
 
                 var registerPage = new RegisterPage(autoLoginAction);
                 registerPage.Show();
@@ -863,6 +885,9 @@
         {
             btnForgetPassword.MouseUpEventHandler += (sender, e) =>
             {
+                //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+                Application.HideSoftInput();
+
                 //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
                 if (CheckPrivacyPolicy() == false) return;
 
@@ -878,6 +903,7 @@
                         MainPage.Log($"login callBackAction : {ex.Message}");
                     }
                 };
+
                 var forgetPasswordDialog = new ForgetPasswordPage(autoLoginAction);
                 forgetPasswordDialog.Show();
                 forgetPasswordDialog.ShowDialog();

--
Gitblit v1.8.0