From 6668460ef703ef6cbc3954ebd60c7fa11990d4c8 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期四, 09 四月 2026 11:45:23 +0800
Subject: [PATCH] 更改默认语言为法语 升级版本号

---
 app/src/main/java/com/driver/igotrip/base/MyApplication.kt |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/driver/igotrip/base/MyApplication.kt b/app/src/main/java/com/driver/igotrip/base/MyApplication.kt
index 3e91ea8..b04952e 100644
--- a/app/src/main/java/com/driver/igotrip/base/MyApplication.kt
+++ b/app/src/main/java/com/driver/igotrip/base/MyApplication.kt
@@ -1,16 +1,19 @@
 package com.driver.igotrip.base
 
+//import cn.jpush.android.api.JPushInterface
+//import cn.jpush.android.api.TagAliasCallback
+//import com.tencent.bugly.crashreport.CrashReport
+//import com.umeng.commonsdk.UMConfigure
+//import com.umeng.socialize.PlatformConfig
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
-import android.content.Context
 import android.content.Intent
 import android.os.*
+import android.text.TextUtils
 import android.util.Log
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-//import cn.jpush.android.api.JPushInterface
-//import cn.jpush.android.api.TagAliasCallback
 import cn.sinata.rxnetty.LogHelper.initLogs
 import cn.sinata.rxnetty.LogHelper.logRecord
 import cn.sinata.rxnetty.NettyClient
@@ -23,21 +26,17 @@
 import com.driver.igotrip.bean.OrderSimpleData
 import com.driver.igotrip.bean.websocket.HeartBean
 import com.driver.igotrip.netUtls.*
-import com.driver.igotrip.ui.main.TripActivity
 import com.driver.igotrip.ui.main.small_cargo.SmallCargoActivity
 import com.driver.igotrip.ui.pub.LoginActivity
 import com.driver.igotrip.utils.AudioRecoderUtils
 import com.driver.igotrip.utils.Cache.CacheKey
 import com.driver.igotrip.utils.Cache.CacheUtil
-import com.driver.igotrip.utils.LanguageManager
+import com.driver.igotrip.utils.LanguageSP
 import com.driver.igotrip.utils.LogUtils
 import com.google.android.gms.maps.model.LatLng
 import com.google.cloud.texttospeech.v1.*
 import com.google.gson.Gson
 import com.google.protobuf.ByteString
-//import com.tencent.bugly.crashreport.CrashReport
-//import com.umeng.commonsdk.UMConfigure
-//import com.umeng.socialize.PlatformConfig
 import com.xuexiang.xui.XUI
 import org.greenrobot.eventbus.EventBus
 import org.jetbrains.anko.startActivity
@@ -72,6 +71,7 @@
         appContext = this
 //        Places.initialize(applicationContext, Const.google_key)
 //        handleSSLHandshake()
+        setDefaultLanguage()
         //如果是主进程
         XUI.init(this)
 //        UMConfigure.init(
@@ -93,14 +93,20 @@
         setAlisa()
     }
 
-
-    override fun attachBaseContext(base: Context?) {
-        var language = SPUtils.getString("language")
-        // super.attachBaseContext(LanguageUtil.changeAppLanguage(base, language, ""))
-
-        super.attachBaseContext(LanguageManager.wrapContext(base))
+    //设置默认语言
+    private fun setDefaultLanguage() {
+        val language = SPUtils.getString(Const.language)
+        if (TextUtils.isEmpty(language)) {
+            SPUtils.save(Const.language, Const.Language.DEFAULT_LANGUAGE)
+            val appLa = when (Const.Language.DEFAULT_LANGUAGE) {
+                Const.Language.FRENCH -> LanguageSP.LanguageConst.FR_FR
+                Const.Language.CHINESE -> LanguageSP.LanguageConst.ZH_CN
+                else -> LanguageSP.LanguageConst.EN_US
+            }
+            // 保存新语言到 SP
+            LanguageSP.saveLanguage(this, appLa)
+        }
     }
-
 
     public fun setAlisa() {
         if (CacheKey.getUserId().isNotEmpty()) {
@@ -516,7 +522,7 @@
         }
     }
 
-    private fun getOrderWhenNoSocket(){
+    private fun getOrderWhenNoSocket() {
         Log.e("sendLocation: ", "定时获取司机订单数据" + (getUserId() != -1).toString())
         if (getUserId() != -1) {
             val map = getMapByAny()
@@ -530,7 +536,10 @@
     }
 
     private fun sendLocation() {
-        Log.e("sendLocation: ", "发送定位 userId = ${getUserId()}, aMapLocation = ${Gson().toJson(aMapLocation)}")
+        Log.e(
+            "sendLocation: ",
+            "发送定位 userId = ${getUserId()}, aMapLocation = ${Gson().toJson(aMapLocation)}"
+        )
         if (getUserId() != -1 && aMapLocation != null) {
             val map = getMapByAny()
             map["orderId"] = currentOrderId

--
Gitblit v1.7.1