From bbb4e5908bb4581d7aa381b522173bcf02a94bc6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 09:56:19 +0800
Subject: [PATCH] 2021-02-05 1.去掉测试代码
---
HDL_ON/UI/.DS_Store | 0
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 66 ---------------------------------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 17 +-------
3 files changed, 3 insertions(+), 80 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 7c93c2e..9b38448 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,6 @@
锘�<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>
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -21,7 +11,6 @@
<Node name="HttpUtil.cs" selected="True" />
</Node>
</Node>
- <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI1-Login" expanded="True" />
</Node>
@@ -40,7 +29,7 @@
<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/.DS_Store b/HDL_ON/UI/.DS_Store
index fc80acb..490e9ba 100644
--- a/HDL_ON/UI/.DS_Store
+++ b/HDL_ON/UI/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index e526391..63c32fc 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
{
@@ -842,12 +840,6 @@
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-#if DEBUG
- TestEZSDK();
- return;
-#endif
-
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -870,59 +862,6 @@
};
}
-
- 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>
/// 蹇樿瀵嗙爜
/// </summary>
@@ -932,11 +871,6 @@
{
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
-
-#if DEBUG
- TestESVideo();
- return;
-#endif
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
--
Gitblit v1.8.0