diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt index e6db5773db..146ce9adc3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt @@ -4,7 +4,6 @@ import android.os.Process import android.text.TextUtils import android.widget.Toast import com.mogo.commons.debug.DebugConfig -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_INIT_ENV_CHECK import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_INIT_ENV_RESTART import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_INIT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS @@ -50,14 +49,6 @@ object ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope { } } - @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_INIT, - endpoint = PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ENV_CHECK, - paramIndexes = [0,1,2], - clientPkFileName = "sn" - ) override fun onEnvChanged(buildType: String, netType: String, dockerVersion: String) { if (!hasInit.get()) { return @@ -94,7 +85,7 @@ object ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope { val appRelaunched = ApmEnvConfig.isAppRelaunched() if ((!isEnvValid || (buildTypeChanged || netTypeChanged || dockerVersionChanged)) && !appRelaunched) { ApmEnvConfig.setAppRelaunched(true) - restartApp() + restartApp("buildType:$buildType,netType:$netType,dockerVersion:$dockerVersion") return@launch } if (isFirstDockerVersionSet) { @@ -124,10 +115,10 @@ object ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope { linkCode = CHAIN_LINK_INIT, endpoint = PAD, nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ENV_RESTART, - paramIndexes = [-1], + paramIndexes = [0], clientPkFileName = "sn" ) - private fun restartApp() { + private fun restartApp(envStr:String) { launch(Dispatchers.Main) { Toast.makeText(Utils.getApp(), "发现系统环境不一致,正在重启...", Toast.LENGTH_SHORT).show() delay(50) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index f5b23c8beb..cf1fd1655e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -56,7 +56,6 @@ class ChainConstant { const val CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK = "CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK" - const val CHAIN_ALIAS_CODE_INIT_ENV_CHECK = "CHAIN_ALIAS_CODE_INIT_ENV_CHECK" const val CHAIN_ALIAS_CODE_INIT_ENV_RESTART = "CHAIN_ALIAS_CODE_INIT_ENV_RESTART" const val CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE = "CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE" const val CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED = "CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED"