From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL-ON_Android/SplashActivity.cs | 130 ++++++++++++++++++++++++++++++++++---------
1 files changed, 103 insertions(+), 27 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 1fbe7c2..274ce31 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -1,17 +1,16 @@
锘縰sing System;
+using Android;
using Android.App;
using Android.Content;
using Android.Content.PM;
+using Android.Locations;
using Android.Net;
using Android.OS;
+using Android.Support.V4.App;
+using Android.Support.V4.Content;
using CN.Jpush.Android.Api;
//using Android.Widget;
-using Com.Hdl.ON.Jpush.Androidjpush;
using HDL_ON;
-using Java.Util;
-using Microsoft.AppCenter;
-using Microsoft.AppCenter.Analytics;
-using Microsoft.AppCenter.Crashes;
using Shared;
namespace HDL_ON_Android
@@ -46,14 +45,24 @@
{
base.OnCreate(savedInstanceState);
+ if(Shared.Application.Activity != null && Shared.Application.Activity.GetType() == typeof(BaseActivity))
+ {
+ Finish();
+ return;
+ }
+
//Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
//StartActivityForResult(i, 1);
//OverridePendingTransition(0, 0);
//initAll();
+#if DEBUG
+ HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy = true;
+#endif
if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
{
+ //OnAppConfig.Instance.FirstRunApp = false;
+ //OnAppConfig.Instance.SaveConfig();
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█缂╁啓:" + localeList.Language);
if (localeList.Language == "zh")
@@ -72,6 +81,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -92,10 +105,29 @@
}
}
+
+ public void Permissions()
+ {
+ string[] mPermissionList = new string[]
+ {
+ Manifest.Permission.ReadSms
+ };
+
+ foreach (string permissions in mPermissionList)
+ {
+ if (ContextCompat.CheckSelfPermission(this, permissions) != 0)
+ {
+ ActivityCompat.RequestPermissions(this, new string[] { permissions }, 1);
+ }
+ }
+ }
+
+
+
void initOhterSdk()
{
//娉ㄥ唽鏈鐞嗗紓甯镐簨浠�
- AppCenter.Start("64ac5859-2cd7-4ef8-a5da-5455e29679ec", typeof(Analytics), typeof(Crashes));
+ //AppCenter.Start("64ac5859-2cd7-4ef8-a5da-5455e29679ec", typeof(Analytics), typeof(Crashes));
//鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
//OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
//#if DEBUG
@@ -104,8 +136,7 @@
JPushInterface.Init(this);
//Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
-
-
+
BaseActivity.OnCreateActoin += (activity, application) =>
{
@@ -114,10 +145,17 @@
};
- //鍒濆鍖栧弸鐩焥dk
- Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
- //鍒濆鍖栧弸鐩焥dk config
- Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
+ //try
+ //{
+ // //鍒濆鍖栧弸鐩焥dk
+ // Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
+ // ////鍒濆鍖栧弸鐩焥dk config
+ // Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
+ //}
+ //catch (Exception ex)
+ //{
+ // Console.WriteLine("鍒濆鍖栧弸鐩烻DK寮傚父:" + ex.Message);
+ //}
}
@@ -159,10 +197,9 @@
}
};
- BaseActivity.OnCreateActoin += (activity, application) =>
+ BaseActivity.OnCreateActoin = (activity, application) =>
{
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█缂栧彿" + localeList.Language);
if (localeList.Language == "zh")
@@ -181,6 +218,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -208,10 +249,9 @@
HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
};
};
- BaseActivity.RefreshUIAction += (activity) =>
+ BaseActivity.RefreshUIAction = (activity) =>
{
Language.CurrentLanguage = "Chinese";
- Locale locale1 = Locale.Default;
var localeList = Resources.Configuration.Locale;
Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
if (localeList.Language == "zh")
@@ -230,6 +270,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -237,11 +281,11 @@
MainPage.Show();
checkSomeInfo();
};
- BaseActivity.OnResumeAction += (activity) =>
+ BaseActivity.OnResumeAction = (activity) =>
{
checkSomeInfo();
};
- BaseActivity.OnDestroyAction += (activity) =>
+ BaseActivity.OnDestroyAction = (activity) =>
{
Console.WriteLine("OnDestroyAction");
//BusSocket.Stop();
@@ -252,17 +296,19 @@
HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
//Shared.Application.IsGpsEnable = true;
- bool isfirst = true;
+ //bool isfirst = true;
+
+
+
+ var isfirst = true;
//鑾峰彇缁忕含搴�
Shared.Application.LocationAction = (lon, lat) =>
{
try
{
-
if (isfirst)
{
//鍙Е鍙戜竴娆�
- //Shared.Application.LocationAction = null;
new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
}
isfirst = false;
@@ -279,6 +325,8 @@
};
}
+
+
/// <summary>
///
/// </summary>
@@ -289,7 +337,7 @@
{
//淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
var tokenID = JPushInterface.GetRegistrationID(activity);
- Console.WriteLine("RegistrationID: " + tokenID);
+ Console.WriteLine("鏋佸厜鎺ㄩ�両d: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -303,14 +351,13 @@
{
System.Threading.Thread.Sleep(1000);
tokenID = JPushInterface.GetRegistrationID(activity);
- Console.WriteLine("Sleep.tokenID + " + JPushInterface.GetRegistrationID(activity));
loadTokenCount++;
if (loadTokenCount > 30)
{
break;
}
}
- Console.WriteLine("RegistrationID: " + tokenID);
+ Console.WriteLine("鏋佸厜鎺ㄩ�両d: " + tokenID);
if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
{
OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -385,7 +432,36 @@
}
+
+
+
+ // 鍦ㄤ綘鐨勬椿鍔紙Activity锛夋垨鐗囨锛團ragment锛変腑鐨勬煇涓柟娉曚腑锛屽紑濮嬬洃鍚綅缃彉鍖�
+ void StartLocationUpdates()
+ {
+ // 鍒涘缓浣嶇疆绠＄悊鍣�
+ var locationManager = (LocationManager)GetSystemService(Context.LocationService);
+
+ // 璁剧疆浣嶇疆鐩戝惉鍣�
+ var locationListener = new MyLocationListener_V2();
+
+ // 璇锋眰浣嶇疆鏇存柊
+ locationManager.RequestLocationUpdates(LocationManager.GpsProvider, 0, 0, locationListener);
+ }
+
+ // 鍦ㄤ綘鐨勬椿鍔紙Activity锛夋垨鐗囨锛團ragment锛変腑鐨勬煇涓柟娉曚腑锛屽仠姝㈢洃鍚綅缃彉鍖�
+ void StopLocationUpdates()
+ {
+ // 鍒涘缓浣嶇疆绠＄悊鍣�
+ var locationManager = (LocationManager)GetSystemService(Context.LocationService);
+
+ // 璁剧疆浣嶇疆鐩戝惉鍣�
+ var locationListener = new MyLocationListener_V2();
+
+ // 鍋滄浣嶇疆鏇存柊
+ locationManager.RemoveUpdates(locationListener);
+ }
+
+
+
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0