[6.2.6] sp opt , update aicloud upload loc thread
This commit is contained in:
@@ -13,11 +13,11 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
|
||||
import com.mogo.cloud.passport.location.ICurrentLocation
|
||||
import com.mogo.cloud.passport.location.SimpleLocation
|
||||
import com.mogo.cloud.socket.SocketBuildConfig
|
||||
import com.mogo.commons.AbsMogoApplication
|
||||
import com.mogo.commons.constants.SharedPrefsConstants
|
||||
import com.mogo.commons.debug.DebugConfig
|
||||
import com.mogo.commons.module.status.MogoStatusManager
|
||||
import com.mogo.commons.network.NetConfigUtils
|
||||
import com.mogo.commons.storage.SharedPrefsMgr
|
||||
import com.mogo.commons.utils.MogoAnalyticUtils
|
||||
import com.mogo.eagle.core.data.config.FunctionBuildConfig
|
||||
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_CLOUD_INIT
|
||||
@@ -38,8 +38,11 @@ import com.mogo.eagle.core.function.startup.stageone.secret.IPassportSecret
|
||||
import com.mogo.eagle.core.function.startup.stageone.secret.PassPortSecret
|
||||
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
|
||||
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAIN
|
||||
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
|
||||
import com.mogo.eagle.core.utilcode.util.*
|
||||
import com.mogo.eagle.core.utilcode.util.AppUtils
|
||||
import com.mogo.eagle.core.utilcode.util.DeviceUtils
|
||||
import com.mogo.eagle.core.utilcode.util.ProcessUtils
|
||||
import com.mogo.eagle.core.utilcode.util.ThreadPoolService
|
||||
import com.mogo.eagle.core.utilcode.util.TimeUtils
|
||||
import com.rousetime.android_startup.AndroidStartup
|
||||
import com.zhjt.service.chain.ChainLog
|
||||
import kotlin.properties.Delegates
|
||||
@@ -109,10 +112,13 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
|
||||
when (DebugConfig.getNetMode()) {
|
||||
DebugConfig.NET_MODE_DEV -> clientConfig.netMode =
|
||||
MoGoAiCloudClientConfig.HTTP_DNS_ENV_DEV
|
||||
|
||||
DebugConfig.NET_MODE_QA -> clientConfig.netMode =
|
||||
MoGoAiCloudClientConfig.HTTP_DNS_ENV_QA
|
||||
|
||||
DebugConfig.NET_MODE_DEMO -> clientConfig.netMode =
|
||||
MoGoAiCloudClientConfig.HTTP_DNS_ENV_DEMO
|
||||
|
||||
else -> clientConfig.netMode = MoGoAiCloudClientConfig.HTTP_DNS_ENV_RELEASE
|
||||
}
|
||||
// 设置是否是第三APP登录
|
||||
@@ -217,6 +223,8 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
|
||||
override fun onTokenGot(token: String, sn: String) {
|
||||
clientConfig.token = token
|
||||
clientConfig.sn = sn
|
||||
SharedPrefsMgr.getInstance().putToken(token)
|
||||
SharedPrefsMgr.getInstance().putSn(sn)
|
||||
// 由于存在token过期问题,在更新后会回调至此处,增加二次判定
|
||||
if (!gotToken) {
|
||||
CallerLogger.d("$M_MAIN$TAG", "onTokenGot token : $token , sn :$sn")
|
||||
@@ -255,11 +263,11 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
|
||||
if (FunctionBuildConfig.isSecure) {
|
||||
context?.let {
|
||||
val authStatus =
|
||||
SharedPrefsMgr.getInstance(it)
|
||||
SharedPrefsMgr.getInstance()
|
||||
.getBoolean("securityKey-${DebugConfig.getNetMode()}", false)
|
||||
if (authStatus) {
|
||||
// clientConfig设置auth值,并带入header
|
||||
clientConfig.authPubKey = SharedPrefsMgr.getInstance(it)
|
||||
clientConfig.authPubKey = SharedPrefsMgr.getInstance()
|
||||
.getString("securityKey-${DebugConfig.getNetMode()}", "")
|
||||
return@let
|
||||
}
|
||||
@@ -280,12 +288,12 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
|
||||
"onSuccess securityKey:$securityKey , thread:${Thread.currentThread().name}"
|
||||
)
|
||||
clientConfig.securityKey = securityKey
|
||||
SharedPrefsMgr.getInstance(it)
|
||||
SharedPrefsMgr.getInstance()
|
||||
.putString(
|
||||
"securityKey-${DebugConfig.getNetMode()}",
|
||||
securityKey
|
||||
)
|
||||
SharedPrefsMgr.getInstance(it)
|
||||
SharedPrefsMgr.getInstance()
|
||||
.putBoolean("securityKey-${DebugConfig.getNetMode()}", true)
|
||||
}
|
||||
|
||||
@@ -409,20 +417,11 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
|
||||
|
||||
private fun getDefaultSimpleLocation(): SimpleLocation {
|
||||
val ciyCode =
|
||||
SharedPrefsMgr.getInstance(
|
||||
AbsMogoApplication.getApp()
|
||||
)
|
||||
.getString(SharedPrefsConstants.LOCATION_CITY_CODE)
|
||||
SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_CITY_CODE)
|
||||
val latitude =
|
||||
SharedPrefsMgr.getInstance(
|
||||
AbsMogoApplication.getApp()
|
||||
)
|
||||
.getString(SharedPrefsConstants.LOCATION_LATITUDE)
|
||||
SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_LATITUDE)
|
||||
val longitude =
|
||||
SharedPrefsMgr.getInstance(
|
||||
AbsMogoApplication.getApp()
|
||||
)
|
||||
.getString(SharedPrefsConstants.LOCATION_LONGITUDE)
|
||||
SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_LONGITUDE)
|
||||
return try {
|
||||
SimpleLocation(
|
||||
ciyCode, latitude.toDouble(), longitude.toDouble()
|
||||
|
||||
Reference in New Issue
Block a user