From c90de55be7a33e196029c1f4a1bb7f84ea449f29 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 二月 2021 10:39:11 +0800
Subject: [PATCH] 2021-02-01 1.增加丰林可视对讲测试
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index c5a084d..7d8eace 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -598,7 +598,7 @@
if (verAccount == etPassword.Text.Trim())
{
//璺宠浆椤甸潰----
- MainPage.GoUserPage();
+ MainPage.GoUserPage(true);
return;
}
});
@@ -629,8 +629,10 @@
//}
Application.RunOnMainThread(() =>
{
+ //20201223-鐧诲綍鎴愬姛涔嬪悗锛屽皢涓嬭浇鏁版嵁瀹屾垚鏍囪鏍囪涓篺alse锛岄槻姝富椤垫彁鍓嶅姞杞�
+ Common.ApiUtlis.Ins.DownloadDataComplete = false;
//璺宠浆椤甸潰----
- MainPage.GoUserPage();
+ MainPage.GoUserPage(true);
});
}
else
@@ -835,6 +837,15 @@
{
btnRegister.MouseUpEventHandler += (sender, e) =>
{
+ //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ Application.HideSoftInput();
+
+
+#if DEBUG
+ TestEZSDK();
+ return;
+#endif
+
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -849,11 +860,42 @@
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
+
+ }
+
+ void TestEZSDK()
+ {
+
+#if __Android__
+#else
+ EZSDK.IOS.EZSDK.Go2EZvizMonitor();
+
+ return;
+#endif
+
}
/// <summary>
@@ -863,6 +905,14 @@
{
btnForgetPassword.MouseUpEventHandler += (sender, e) =>
{
+ //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ Application.HideSoftInput();
+
+#if DEBUG
+ TestESVideo();
+ return;
+#endif
+
//鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
if (CheckPrivacyPolicy() == false) return;
@@ -878,6 +928,7 @@
MainPage.Log($"login callBackAction : {ex.Message}");
}
};
+
var forgetPasswordDialog = new ForgetPasswordPage(autoLoginAction);
forgetPasswordDialog.Show();
forgetPasswordDialog.ShowDialog();
--
Gitblit v1.8.0