From da22725d616af0f3081670c76195eaf57794bc29 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 18 五月 2022 16:03:33 +0800
Subject: [PATCH] Merge branch 'dev-CQY' into dev 1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口
---
HDL-ON_Android/Application.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index dbb5630..cf341fe 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -84,6 +84,7 @@
BusSocketStart();
//鍚庡彴鍥炲埌鍓嶅彴
new HDL_ON.UI.AppUnlockPage().LoadPage();
+
}
}
@@ -93,6 +94,10 @@
mCount--;
if (mCount == 0)
{
+ //if(activity.GetType().Name.Contains("LeChengVideoActivity"))
+ //{
+ // //UserInfo.Current.PushMesLogTime = DateTime.MinValue;
+ //}
Console.WriteLine("HHH OnActivityStopped锛� background");
BusSocketStop();
//杩涘叆鍚庡彴
@@ -110,11 +115,6 @@
public int mCount;
- ///// <summary>
- ///// 鏄惁杩涘叆鍚庡彴
- ///// </summary>
- //public bool IsEnterBackground = false;
-
/// <summary>
/// 杩涘叆鍚庡彴鐨勬椂闂�
/// </summary>
@@ -125,7 +125,6 @@
/// </summary>
void BusSocketStop()
{
- //IsEnterBackground = true;
CloseTime = DateTime.Now;
MainPage.IsEnterBackground = true;
//杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
@@ -139,8 +138,6 @@
/// </summary>
void BusSocketStart()
{
- //IsEnterBackground = false;
-
if (CloseTime.AddSeconds(10) < DateTime.Now)
{
//鍚庡彴瓒呰繃10s灏辨柇寮�MQTT閲嶈繛
--
Gitblit v1.8.0