From 311aa775e05f567795e9cc131c67310b3bb133aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 10:49:09 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/Common/HDLCommon.cs | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 208 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 0be5c25..70b5864 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -6,6 +6,7 @@
using HDL_ON.UI;
using HDL_ON.Entity;
using System.Threading;
+using HDL_ON.DriverLayer;
namespace HDL_ON
{
@@ -257,11 +258,11 @@
{
Shared.Application.RunOnMainThread(() =>
{
- //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
- new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
+ ////璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
+ //new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
//閫�鍑虹櫥褰曟搷浣�
CheckLogout();
-
+
});
return;
}
@@ -269,8 +270,15 @@
{
Shared.Application.RunOnMainThread(() =>
{
- new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
GetPushMessageAction?.Invoke();
+ //鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
+ if (jpushMessageInfo.messageType != null && jpushMessageInfo.messageType.Contains("Alarm"))
+ {
+ //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
+ ShowAlarmPushMessage(jpushMessageInfo);
+ //new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
+ }
+
});
return;
}
@@ -282,16 +290,35 @@
}
/// <summary>
+ /// 璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
+ /// 瑕佸湪涓荤嚎绋嬭皟鐢�
/// 閫�鍑虹櫥褰曟搷浣�
/// </summary>
public void CheckLogout()
{
+ //娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
+ switch (UserInfo.Current.AccountString)
+ {
+ case "13415629083":
+ case "18316120654":
+ case "15622703419":
+ case "18824864143":
+ case "464027401@qq.com":
+ case "2791308028@qq.com":
+ case "13697499568":
+ case "18666455392":
+ case "13375012446":
+ case "13602944661":
+ case "18778381374":
+ case "18316672920":
+ return;
+ }
+
//鏈櫥褰曚笉鐢ㄥ鐞�
if (!UserInfo.Current.IsLogin) return;
-#if DEBUG
- return;
-#endif
+ //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
+ new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
Logout();
}
@@ -303,7 +330,7 @@
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
- MainPage.BasePageView.AddChidren(waitPage);
+ MainPage.BaseView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
new Thread(() =>
@@ -335,6 +362,58 @@
}
}).Start();
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ ConfirmDialog alarmPushConfirmDialog;
+ /// <summary>
+ /// 鎶ヨ鎺ㄩ�佸脊绐楁彁绀�,鐐瑰嚮鏌ョ湅璺宠浆淇℃伅涓績
+ /// </summary>
+ /// <param name="jpushMessageInfo"></param>
+ public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo)
+ {
+ //娌＄櫥褰曚笉澶勭悊
+ if (UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null)
+ {
+ return;
+ }
+
+ //璺宠浆淇℃伅涓績椤甸潰
+ Action goAction = () =>
+ {
+ //Dialog
+ alarmPushConfirmDialog = null;
+ Action backAction = () =>
+ {
+
+ };
+ var skipPage = new MessageCenterPage();
+ MainPage.BasePageView.AddChidren(skipPage);
+ skipPage.LoadPage(backAction);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
+ //鍙栨秷浜嬩欢
+ Action cancelAction = () =>
+ {
+ alarmPushConfirmDialog = null;
+ };
+
+ //闃叉澶氭寮圭獥澶勭悊
+ if (alarmPushConfirmDialog == null)
+ {
+ alarmPushConfirmDialog = new ConfirmDialog();
+ alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);
+ }
+ else
+ {
+ alarmPushConfirmDialog.RefreshDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);
+
+ }
+
+ }
+
#endregion
#region 鈻� 甯哥敤鏂规硶_______________________
@@ -377,6 +456,127 @@
{
return string.IsNullOrEmpty(userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : userName;
}
+
+
+ /// <summary>
+ /// 鐩戝惉缃戠粶鍙樺寲鍚庡鐞嗕簨浠�
+ /// 鍒锋柊缃戠粶鐘舵��
+ /// </summary>
+ /// <param name="internetStatus">缃戠粶鍙樺寲</param>
+ /// <param name="IsEnterBackground">鏄惁杩涘叆浜嗗悗鍙�</param>
+ public void UpdateInternetStatus(int internetStatus, bool IsEnterBackground = false)
+ {
+ MainPage.Log($"缃戠粶鐘舵�佸彉鍖栵紝褰撳墠缃戠粶:{internetStatus} 鏄惁鍚庡彴:{IsEnterBackground.ToString()}");
+ //缃戠粶鐘舵�佸彉鍖� 閲嶇疆缃戝叧鐘舵�侀噸鏂版悳绱�
+ Control.Ins.GatewayOnline_Cloud = false;
+ Control.Ins.GatewayOnline_Local = false;
+
+ DAL.Mqtt.MqttClient.DisConnectRemote("UpdateInternetStatus", false);
+
+ if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
+ {
+ MainPage.InternetStatus = 0;
+ }
+ else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1
+ {
+ MainPage.InternetStatus = 1;
+ Control.Ins.SearchLoaclGateway();
+
+ }
+ else if (internetStatus == 2)//WiFi缃戠粶
+ {
+ MainPage.InternetStatus = 2;
+ Control.Ins.SearchLoaclGateway();
+ }
+ }
+ #endregion
+
+ #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+
+ /// <summary>
+ /// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
+ /// </summary>
+ /// <param name="bodyView"></param>
+ public void Go2EZvizMonitor(FrameLayout bodyView)
+ {
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+ new Thread(() =>
+ {
+ try
+ {
+ //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
+ var result = new HttpServerRequest().EZGetChildToken();
+ if (result.Code == StateCode.SUCCESS)
+ {
+ var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString());
+ Application.RunOnMainThread(() =>
+ {
+ if (!string.IsNullOrEmpty(ezChildAccessToken.accessToken))
+ {
+#if __IOS__
+ //iOS
+
+ //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
+ EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
+ EZSDK.IOS.EZSDK.SetRequestHttpsHost(OnAppConfig.Instance.RequestHttpsHost);
+ //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
+ EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken.accessToken);
+ //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+ EZSDK.IOS.EZSDK.Go2EZvizMonitor();
+
+#else
+ //Android
+ //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
+ //2.璁剧疆钀ょ煶瀛愯处鍙风殑token
+ //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+ ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
+ {
+ if (b)
+ {
+ Android.Content.Intent intent = new Android.Content.Intent();
+ var bundle = new Android.OS.Bundle();
+ //浼犻�抧ame鍙傛暟涓簍inyphp
+ bundle.PutString("Token", ezChildAccessToken.accessToken);
+ bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
+ bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
+ intent.PutExtras(bundle);
+ intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+ Shared.Application.Activity.StartActivity(intent);
+ }
+ });
+#endif
+
+
+ }
+
+ });
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
#endregion
}
}
--
Gitblit v1.8.0