From fe2b566c8d9c097d2568ad211088fa5bc6f8c229 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 23 三月 2021 13:48:25 +0800
Subject: [PATCH] 2.增加住宅绑定网关判断，没有绑定网关的住宅，ON+不再显示
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 83 +++++------------------------------------
1 files changed, 10 insertions(+), 73 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index e526391..3d05e6d 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -6,8 +6,6 @@
using Shared;
using HDL_ON.Entity;
using HDL_ON.DAL.Server;
-using System.Security.Cryptography;
-using System.Text;
namespace HDL_ON.UI.UI1Login
{
@@ -176,7 +174,7 @@
/// <param name="type">鏄惁閫夋嫨鎵嬫満鐧诲綍</param>
void LoginTypeChange(bool isPhone)
{
- if(isPhone)
+ if (isPhone)
{
if (loginType == 0)
return;
@@ -639,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();
+ //});
@@ -768,7 +769,7 @@
IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
});
-
+
}
return result;
}
@@ -794,7 +795,7 @@
var unlockDatetime = Utlis.UnixToDateTimeMS(revertData.unlockTime);
var unlockTimeInt = unlockDatetime.Minute - DateTime.Now.Minute;
- if(unlockTimeInt <= 0)
+ if (unlockTimeInt <= 0)
{
unlockTimeInt = 1;
}
@@ -842,12 +843,6 @@
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-#if DEBUG
- TestEZSDK();
- return;
-#endif
-
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -862,65 +857,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
-
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="signstr"></param>
- /// <returns></returns>
- static string SignMD5Encrypt(string s)
- {
- byte[] sign = MD5.Create().ComputeHash(UTF8Encoding.UTF8.GetBytes(s));
- string signstr = string.Empty;
- foreach (byte item in sign)
- {
- signstr += item.ToString("X2");
- }
- return signstr.ToLower();
- }
-
- void TestEZSDK()
- {
-
-#if __Android__
-#else
- //璁剧疆瀛愯处鍙稟ccessToken鏂规
- EZSDK.IOS.EZSDK.SetEZAccessToken("ra.cekz6j9y1zg7mqgj3rmb099p49fuf6w3-9keosamseq-00wktld-brmhuciz1");
-
- EZSDK.IOS.EZSDK.Go2EZvizMonitor();
-
-
- //var psw = SignMD5Encrypt("1aa98a90489b4838b966b57018b4b04b#123456");
-
- //Utlis.WriteLine("MD5 psw: " + psw);
- return;
-#endif
-
}
/// <summary>
@@ -932,11 +874,6 @@
{
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-#if DEBUG
- TestESVideo();
- return;
-#endif
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
--
Gitblit v1.8.0