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 | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index dbb5630..e0d59a4 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -5,15 +5,13 @@
using Android.App;
using Android.Content;
using Android.Net;
+using Android.Net.Wifi;
using Android.OS;
using Android.Runtime;
using Android.Widget;
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
@@ -21,9 +19,12 @@
/// <summary>
/// 璁惧畾涓洪粯璁ゅ惎鍔ㄧ殑Application
/// </summary>
- [Android.App.Application]
+ [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)
{
var intent = new Intent(application, typeof(BaseActivity));
@@ -35,6 +36,7 @@
public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
public override void OnCreate()
{
+
if (Shared.Application.Activity != null)
{
//reStartApp(this);
@@ -42,6 +44,25 @@
}
base.OnCreate();
+
+ WifiManager manager = (WifiManager)this.GetSystemService(Context.WifiService);
+
+ multicast = manager.CreateMulticastLock("UDPwifi");
+
+
+ Language.CurrentLanguage = "Chinese";
+ Locale locale1 = Locale.Default;
+ var localeList = Resources.Configuration.Locale;
+ Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
+ if (localeList.Language == "zh")
+ {
+ Language.CurrentLanguage = "Chinese";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
+ }
+
RegisterActivityLifecycleCallbacks(this);
}
@@ -82,9 +103,13 @@
{
Console.WriteLine("HHH OnActivityStarted锛歠oreground");
BusSocketStart();
+ multicast.Acquire();
+
//鍚庡彴鍥炲埌鍓嶅彴
new HDL_ON.UI.AppUnlockPage().LoadPage();
+
}
+
}
public void OnActivityStopped(Activity activity)
@@ -95,9 +120,9 @@
{
Console.WriteLine("HHH OnActivityStopped锛� background");
BusSocketStop();
+ multicast.Release();
//杩涘叆鍚庡彴
UserInfo.Current.unlockTime = DateTime.Now;
-
}
}
@@ -125,7 +150,7 @@
/// </summary>
void BusSocketStop()
{
- //IsEnterBackground = true;
+
CloseTime = DateTime.Now;
MainPage.IsEnterBackground = true;
//杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
@@ -139,8 +164,6 @@
/// </summary>
void BusSocketStart()
{
- //IsEnterBackground = false;
-
if (CloseTime.AddSeconds(10) < DateTime.Now)
{
//鍚庡彴瓒呰繃10s灏辨柇寮�MQTT閲嶈繛
--
Gitblit v1.8.0