From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL-ON_Android/Application.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index cf341fe..d55801d 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -21,7 +21,7 @@
/// <summary>
/// 璁惧畾涓洪粯璁ゅ惎鍔ㄧ殑Application
/// </summary>
- [Android.App.Application]
+ [Android.App.Application(Theme = "@style/MyTheme")]
public class Application : Android.App.Application, Android.App.Application.IActivityLifecycleCallbacks
{
static void reStartApp(Android.App.Application application)
@@ -84,7 +84,6 @@
BusSocketStart();
//鍚庡彴鍥炲埌鍓嶅彴
new HDL_ON.UI.AppUnlockPage().LoadPage();
-
}
}
@@ -94,10 +93,6 @@
mCount--;
if (mCount == 0)
{
- //if(activity.GetType().Name.Contains("LeChengVideoActivity"))
- //{
- // //UserInfo.Current.PushMesLogTime = DateTime.MinValue;
- //}
Console.WriteLine("HHH OnActivityStopped锛� background");
BusSocketStop();
//杩涘叆鍚庡彴
@@ -115,6 +110,11 @@
public int mCount;
+ ///// <summary>
+ ///// 鏄惁杩涘叆鍚庡彴
+ ///// </summary>
+ //public bool IsEnterBackground = false;
+
/// <summary>
/// 杩涘叆鍚庡彴鐨勬椂闂�
/// </summary>
@@ -125,6 +125,7 @@
/// </summary>
void BusSocketStop()
{
+ //IsEnterBackground = true;
CloseTime = DateTime.Now;
MainPage.IsEnterBackground = true;
//杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
@@ -138,6 +139,8 @@
/// </summary>
void BusSocketStart()
{
+ //IsEnterBackground = false;
+
if (CloseTime.AddSeconds(10) < DateTime.Now)
{
//鍚庡彴瓒呰繃10s灏辨柇寮�MQTT閲嶈繛
--
Gitblit v1.8.0