From 16b65f9019f8df3b154ab835b92879ca618be1c3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 03 二月 2021 16:28:10 +0800
Subject: [PATCH] 2021-02-03 1.增加丰林可视对讲测试验证
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 64bb698..3383d85 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -6,6 +6,8 @@
using Shared;
using HDL_ON.Entity;
using HDL_ON.DAL.Server;
+using System.Security.Cryptography;
+using System.Text;
namespace HDL_ON.UI.UI1Login
{
@@ -840,6 +842,12 @@
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
+
+#if DEBUG
+ TestEZSDK();
+ return;
+#endif
+
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -862,6 +870,77 @@
};
}
+
+ void TestESVideo()
+ {
+ var mESVideoInfo = new ESVideoInfo()
+ {
+ DeviceName = "瀹ゅ鏈�88",
+ ESVideoUUID = "JJY000019VPLLF",
+ ESRoomID = 801,
+ RoomName = "801"
+
+ };
+
+#if __Android__
+
+ Android.Content.Intent intent = new Android.Content.Intent(Application.Activity, typeof(HDL_ON_Android.VideoActivity));
+ intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);//瀹ゅ鏈虹殑鍚嶇О锛屼緥锛屽澶栨満
+ intent.PutExtra("ESRoomID", mESVideoInfo.ESRoomID);//褰撳墠鐢ㄦ埛鐨勬埧闂� ID
+ intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);//瀹ゅ鏈篣UID锛屼緥:JJY000007FSEYX
+ intent.PutExtra("IsCollect", mESVideoInfo.IsCollect);//鏄惁鏀惰棌
+ intent.PutExtra("RoomName", mESVideoInfo.RoomName);//鎴块棿鍛藉悕锛屼緥 8鏍�1鍗曞厓0801
+ intent.AddFlags(Android.Content.ActivityFlags.NewTask);
+ intent.PutExtra("Type", 0);//绫诲瀷锛�0 鐩戞帶锛�1鍙嶅懠
+ Application.Activity.StartActivity(intent);
+#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>
@@ -871,15 +950,11 @@
{
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
Application.HideSoftInput();
+
#if DEBUG
-#if __Android__
-#else
- EZSDK.IOS.EZSDK.Go2EZvizMonitor();
- return;
+ TestESVideo();
+ return;
#endif
-#endif
-
-
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -942,4 +1017,33 @@
new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
}
}
+
+ public class ESVideoInfo
+ {
+ /// <summary>
+ /// 瀹ゅ鏈虹殑UUID
+ /// 渚嬶細JJY000007FSEYX
+ /// </summary>
+ public string ESVideoUUID = string.Empty;
+ /// <summary>
+ /// 褰撳墠鐢ㄦ埛鐨勬埧闂碔D
+ /// 渚嬶細0801
+ /// </summary>
+ public int ESRoomID;
+ /// <summary>
+ /// 瀹ゅ鏈虹殑鍚嶇О
+ /// 渚嬶細瀹ゅ鏈�
+ /// </summary>
+ public string DeviceName = string.Empty;
+ /// <summary>
+ /// 鎴块棿鍛藉悕
+ /// 渚嬶細8鏍�1鍗曞厓0801
+ /// </summary>
+ public string RoomName = string.Empty;
+ /// <summary>
+ /// 鏄惁鏀惰棌
+ /// </summary>
+ public bool IsCollect;
+
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0