From 1de41bc038dcf623834b63422da350693429570b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 13 十二月 2023 16:20:47 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_Android/Application.cs | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index c5b0a2c..e0d59a4 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -12,9 +12,6 @@
using CN.Jpush.Android.Api;
using HDL_ON;
using Java.Util;
-using Microsoft.AppCenter;
-using Microsoft.AppCenter.Analytics;
-using Microsoft.AppCenter.Crashes;
using Shared;
namespace HDL_ON_Android
@@ -25,6 +22,7 @@
[Android.App.Application(Theme = "@style/MyTheme")]
public class Application : Android.App.Application, Android.App.Application.IActivityLifecycleCallbacks
{
+ //澶勭悊瀹夊崜鎺ユ敹涓嶅埌udp鍛戒护闂
WifiManager.MulticastLock multicast;
static void reStartApp(Android.App.Application application)
@@ -38,9 +36,6 @@
public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
public override void OnCreate()
{
-
-
-
if (Shared.Application.Activity != null)
{
@@ -112,6 +107,7 @@
//鍚庡彴鍥炲埌鍓嶅彴
new HDL_ON.UI.AppUnlockPage().LoadPage();
+
}
}
@@ -127,7 +123,6 @@
multicast.Release();
//杩涘叆鍚庡彴
UserInfo.Current.unlockTime = DateTime.Now;
-
}
}
@@ -155,7 +150,7 @@
/// </summary>
void BusSocketStop()
{
- //IsEnterBackground = true;
+
CloseTime = DateTime.Now;
MainPage.IsEnterBackground = true;
//杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
@@ -169,8 +164,6 @@
/// </summary>
void BusSocketStart()
{
- //IsEnterBackground = false;
-
if (CloseTime.AddSeconds(10) < DateTime.Now)
{
//鍚庡彴瓒呰繃10s灏辨柇寮�MQTT閲嶈繛
--
Gitblit v1.8.0