From f75a1ba69f5922cab8d2ab43f4447b74bd9b9ea9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 26 五月 2022 09:52:34 +0800
Subject: [PATCH] 备份

---
 HDL-ON_Android/SplashActivity.cs |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 5c1b1c3..ac78c22 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));
@@ -80,13 +84,17 @@
             JPushInterface.Init(this);
 
 
-            BaseActivity.OnCreateActoin += (activity, application) =>
+            BaseActivity.OnCreateActoin = (activity, application) =>
             {
                 //鑾峰彇鏋佸厜鎺ㄩ�両D
                 GetJPushRegistrationID(activity);
 
             };
 
+            //鍒濆鍖栧弸鐩焥dk
+            Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");
+            //鍒濆鍖栧弸鐩焥dk config
+            Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");
 
         }
 
@@ -125,7 +133,7 @@
                 }
             };
 
-            BaseActivity.OnCreateActoin += (activity, application) =>
+            BaseActivity.OnCreateActoin = (activity, application) =>
             {
                 Language.CurrentLanguage = "Chinese";
                 Locale locale1 = Locale.Default;
@@ -133,6 +141,10 @@
                 if (localeList.Language == "zh")
                 {
                     Language.CurrentLanguage = "Chinese";
+                }
+                else if(localeList.Language == "es")
+                {
+                    Language.CurrentLanguage = "Spanish";
                 }
                 else
                 {
@@ -161,16 +173,16 @@
                     HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
                 };
             };
-            BaseActivity.RefreshUIAction += (activity) =>
+            BaseActivity.RefreshUIAction = (activity) =>
             {
                 MainPage.Show();
                 checkSomeInfo();
             };
-            BaseActivity.OnResumeAction += (activity) =>
+            BaseActivity.OnResumeAction = (activity) =>
             {
                 checkSomeInfo();
             };
-            BaseActivity.OnDestroyAction += (activity) =>
+            BaseActivity.OnDestroyAction = (activity) =>
             {
                 Console.WriteLine("OnDestroyAction");
                 //BusSocket.Stop();
@@ -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;
                     ///鐩戝惉缁忕含搴�
@@ -217,7 +229,7 @@
             {
                 //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
                 var tokenID = JPushInterface.GetRegistrationID(activity);
-                Console.WriteLine("RegistrationID:  " + tokenID);
+                Console.WriteLine("RegistrationID1:  " + tokenID);
                 if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                 {
                     OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -238,7 +250,7 @@
                             break;
                         }
                     }
-                    Console.WriteLine("RegistrationID:  " + tokenID);
+                    Console.WriteLine("RegistrationID2:  " + tokenID);
                     if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                     {
                         OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -315,4 +327,6 @@
     }
 
 
+    
+
 }
\ No newline at end of file

--
Gitblit v1.8.0