From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL-ON_Android/SplashActivity.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 3c6626e..1a8e648 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+锘縰sing System;
using Android.App;
using Android.Content;
using Android.Content.PM;
@@ -86,7 +86,7 @@
JPushInterface.Init(this);
- BaseActivity.OnCreateActoin = (activity, application) =>
+ BaseActivity.OnCreateActoin += (activity, application) =>
{
//鑾峰彇鏋佸厜鎺ㄩ�両D
GetJPushRegistrationID(activity);
@@ -138,7 +138,7 @@
}
};
- BaseActivity.OnCreateActoin = (activity, application) =>
+ BaseActivity.OnCreateActoin += (activity, application) =>
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
@@ -183,7 +183,7 @@
HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
};
};
- BaseActivity.RefreshUIAction = (activity) =>
+ BaseActivity.RefreshUIAction += (activity) =>
{
Language.CurrentLanguage = "Chinese";
Locale locale1 = Locale.Default;
@@ -208,11 +208,11 @@
MainPage.Show();
checkSomeInfo();
};
- BaseActivity.OnResumeAction = (activity) =>
+ BaseActivity.OnResumeAction += (activity) =>
{
checkSomeInfo();
};
- BaseActivity.OnDestroyAction = (activity) =>
+ BaseActivity.OnDestroyAction += (activity) =>
{
Console.WriteLine("OnDestroyAction");
//BusSocket.Stop();
@@ -237,7 +237,7 @@
}
isfirst = false;
///鐩戝惉缁忕含搴�
- HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.CurrLogicMethod.AppLatAndLonEvent(lon, lat);
+ HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.Current.AppLatAndLonEvent(lon, lat);
//鍏抽棴瀹氫綅鏈嶅姟
//Shared.Application.StopGPSLocationService();
}
@@ -259,7 +259,7 @@
{
//淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
var tokenID = JPushInterface.GetRegistrationID(activity);
- Console.WriteLine("RegistrationID1: " + tokenID);
+ Console.WriteLine("RegistrationID: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -280,7 +280,7 @@
break;
}
}
- Console.WriteLine("RegistrationID2: " + tokenID);
+ Console.WriteLine("RegistrationID: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
--
Gitblit v1.8.0