From 0fc2962749e7e1f4078717a9914ac8175a2c4b26 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 26 九月 2024 20:53:55 +0800
Subject: [PATCH] 可视对讲，注册
---
HDL-ON_Android/SplashActivity.cs | 68 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index afcffdf..7143579 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -9,13 +9,7 @@
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
@@ -24,10 +18,6 @@
[IntentFilter(new string[] { "com.hdl.onpro.SplashActivity", Intent.ActionView })]
public class SplashActivity : Activity
{
-
-
-
-
protected override void OnActivityResult(int requestCode, Result resultVal, Intent data)
{
if (requestCode == 99)
@@ -54,14 +44,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")
@@ -80,6 +80,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -122,7 +126,7 @@
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
@@ -130,7 +134,7 @@
//#endif
JPushInterface.Init(this);
- Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+ //Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
BaseActivity.OnCreateActoin += (activity, application) =>
@@ -140,10 +144,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);
+ }
}
@@ -185,10 +196,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")
@@ -207,6 +217,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -234,10 +248,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")
@@ -256,6 +269,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -263,11 +280,11 @@
MainPage.Show();
checkSomeInfo();
};
- BaseActivity.OnResumeAction += (activity) =>
+ BaseActivity.OnResumeAction = (activity) =>
{
checkSomeInfo();
};
- BaseActivity.OnDestroyAction += (activity) =>
+ BaseActivity.OnDestroyAction = (activity) =>
{
Console.WriteLine("OnDestroyAction");
//BusSocket.Stop();
@@ -319,7 +336,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;
@@ -333,14 +350,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;
--
Gitblit v1.8.0