From 3f5aa574ce351d01dccb125196554c2e4e4ebbb0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:07:58 +0800
Subject: [PATCH] 2021-02-05 1.去掉测试方法
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 74 ++-----------------------------------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 40 ++------------------
2 files changed, 8 insertions(+), 106 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 12637fb..83ab54a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,36 +1,11 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
- <Files>
- <File FileName="HDL-ON_iOS/Other/ESVideo.cs" Line="4" Column="17" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="899" Column="25" />
- <File FileName="../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/ApiDefinition.cs" />
- <File FileName="../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/Properties/AssemblyInfo.cs" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" />
- <File FileName="HDL-ON_iOS/ViewController.cs" Line="20" Column="42" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="545" Column="37" />
- </Files>
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
-<<<<<<< HEAD
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="References" expanded="True">
- <Node name="EZSDK.IOS" selected="True" />
-=======
- <Node name="HDL_ON" expanded="True">
- <Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
- </Node>
- </Node>
- <Node name="Entity" expanded="True" />
- <Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
->>>>>>> parent of bbb4e590... 2021-02-05 1.鍘绘帀娴嬭瘯浠ｇ爜
- </Node>
+ <Node name="References" expanded="True" selected="True" />
</Node>
</Node>
</State>
@@ -38,14 +13,7 @@
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <DisabledProjects>
- <String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
- <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
- <String>Shared.IOS/Shared.IOS.csproj</String>
- <String>../Xamarin鎺т欢搴�/EZOpenSDK/EZSDK.IOS/EZSDK.IOS/EZSDK.IOS.csproj</String>
- <String>../ESVideoPhoneSDKProject/xamarin/Shared.IOS.ESVideoPhoneSDK/Shared.IOS.ESVideoPhoneSDK.csproj</String>
- </DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index e526391..03ce998 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;
@@ -768,7 +766,7 @@
IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
});
-
+
}
return result;
}
@@ -794,7 +792,7 @@
var unlockDatetime = Utlis.UnixToDateTimeMS(revertData.unlockTime);
var unlockTimeInt = unlockDatetime.Minute - DateTime.Now.Minute;
- if(unlockTimeInt <= 0)
+ if (unlockTimeInt <= 0)
{
unlockTimeInt = 1;
}
@@ -842,12 +840,6 @@
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-#if DEBUG
- TestEZSDK();
- return;
-#endif
-
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -862,65 +854,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 +871,6 @@
{
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-#if DEBUG
- TestESVideo();
- return;
-#endif
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
--
Gitblit v1.8.0