From df93e50c747a585aa3acad599ba9be7d9617872d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 四月 2022 10:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL-ON_Android/SplashActivity.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 5c1b1c3..e5c0d5a 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using Android.App;
using Android.Content;
+using Android.Content.PM;
using Android.Net;
using Android.OS;
using CN.Jpush.Android.Api;
@@ -15,7 +16,7 @@
namespace HDL_ON_Android
{
- [Activity(Theme = "@style/SplashTheme", MainLauncher = true, Name = "com.hdl.onpro.SplashActivity")]
+ [Activity(Theme = "@style/SplashTheme", MainLauncher = true, Name = "com.hdl.onpro.SplashActivity",ScreenOrientation = ScreenOrientation.Portrait) ]
[IntentFilter(new string[] { "com.hdl.onpro.SplashActivity", Intent.ActionView })]
public class SplashActivity : Activity
{
@@ -40,6 +41,7 @@
base.OnActivityResult(requestCode, resultVal, data);
}
+
protected override void OnCreate(Bundle savedInstanceState)
{
base.OnCreate(savedInstanceState);
@@ -49,7 +51,9 @@
//OverridePendingTransition(0, 0);
//initAll();
- if (HDL_ON.OnAppConfig.Instance.FirstRunApp)
+
+
+ if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
{
Intent intent = new Intent(this, typeof(AgreementActivity));
@@ -87,6 +91,10 @@
};
+ //鍒濆鍖栧弸鐩焥dk
+ Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
+ //鍒濆鍖栧弸鐩焥dk config
+ Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
}
@@ -133,6 +141,10 @@
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
+ }
+ else if(localeList.Language == "es")
+ {
+ Language.CurrentLanguage = "Spanish";
}
else
{
@@ -191,7 +203,7 @@
{
//鍙Е鍙戜竴娆�
//Shared.Application.LocationAction = null;
- new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString(), lat.ToString());
+ new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
}
isfirst = false;
///鐩戝惉缁忕含搴�
@@ -315,4 +327,6 @@
}
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0