diff --git a/app/src/main/java/com/idormy/sms/forwarder/App.kt b/app/src/main/java/com/idormy/sms/forwarder/App.kt index 259f4a2b986..bf7821a1d1a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/App.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/App.kt @@ -21,7 +21,12 @@ import com.hjq.language.MultiLanguages import com.idormy.sms.forwarder.activity.MainActivity import com.idormy.sms.forwarder.core.Core import com.idormy.sms.forwarder.database.AppDatabase -import com.idormy.sms.forwarder.database.repository.* +import com.idormy.sms.forwarder.database.repository.FrpcRepository +import com.idormy.sms.forwarder.database.repository.LogsRepository +import com.idormy.sms.forwarder.database.repository.MsgRepository +import com.idormy.sms.forwarder.database.repository.RuleRepository +import com.idormy.sms.forwarder.database.repository.SenderRepository +import com.idormy.sms.forwarder.database.repository.TaskRepository import com.idormy.sms.forwarder.entity.SimInfo import com.idormy.sms.forwarder.receiver.BatteryReceiver import com.idormy.sms.forwarder.receiver.CactusReceiver @@ -30,7 +35,17 @@ import com.idormy.sms.forwarder.receiver.NetworkChangeReceiver import com.idormy.sms.forwarder.service.ForegroundService import com.idormy.sms.forwarder.service.HttpServerService import com.idormy.sms.forwarder.service.LocationService -import com.idormy.sms.forwarder.utils.* +import com.idormy.sms.forwarder.utils.AppInfo +import com.idormy.sms.forwarder.utils.CactusSave +import com.idormy.sms.forwarder.utils.FRONT_CHANNEL_ID +import com.idormy.sms.forwarder.utils.FRONT_CHANNEL_NAME +import com.idormy.sms.forwarder.utils.FRONT_NOTIFY_ID +import com.idormy.sms.forwarder.utils.FRPC_LIB_VERSION +import com.idormy.sms.forwarder.utils.HistoryUtils +import com.idormy.sms.forwarder.utils.HttpServerUtils +import com.idormy.sms.forwarder.utils.Log +import com.idormy.sms.forwarder.utils.SettingUtils +import com.idormy.sms.forwarder.utils.SharedPreference import com.idormy.sms.forwarder.utils.sdkinit.UMengInit import com.idormy.sms.forwarder.utils.sdkinit.XBasicLibInit import com.idormy.sms.forwarder.utils.sdkinit.XUpdateInit @@ -42,13 +57,16 @@ import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers -import kotlinx.coroutines.* +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.SupervisorJob import java.io.BufferedWriter import java.io.File import java.io.FileWriter import java.io.IOException import java.text.SimpleDateFormat -import java.util.* +import java.util.Date +import java.util.Locale +import java.util.TimeZone import java.util.concurrent.TimeUnit @Suppress("DEPRECATION") @@ -262,6 +280,7 @@ class App : Application(), CactusCallback, Configuration.Provider by Core { // 配置文件初始化 SharedPreference.init(applicationContext) // 初始化日志打印 + SettingUtils.init(applicationContext) isDebug = SettingUtils.enableDebugMode Log.init(applicationContext) // 转发历史工具类初始化 diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt index 3e21bc48ba1..9fe0527e38b 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt @@ -1,12 +1,18 @@ package com.idormy.sms.forwarder.utils +import android.content.Context import android.location.Criteria import com.idormy.sms.forwarder.R -import com.xuexiang.xutil.resource.ResUtils.getString class SettingUtils private constructor() { companion object { + private lateinit var appContext: Context + + fun init(context: Context) { + appContext = context.applicationContext + } + //是否启动时检查更新 var autoCheckUpdate: Boolean by SharedPreference(AUTO_CHECK_UPDATE, true) @@ -99,7 +105,7 @@ class SettingUtils private constructor() { var requestTimeout: Int by SharedPreference(SP_REQUEST_TIMEOUT, 10) //通知内容 - var notifyContent: String by SharedPreference(SP_NOTIFY_CONTENT, getString(R.string.notification_content)) + var notifyContent: String by SharedPreference(SP_NOTIFY_CONTENT, appContext.getString(R.string.notification_content)) //设备名称 var extraDeviceMark: String by SharedPreference(SP_EXTRA_DEVICE_MARK, "")