[2.13.0-arch-opt] remove unuse code and add trace log
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
package com.mogo.functions.test
|
package com.mogo.functions.test
|
||||||
|
|
||||||
import android.os.Debug
|
import android.os.Debug
|
||||||
import android.util.Log
|
|
||||||
import androidx.test.core.app.ActivityScenario
|
import androidx.test.core.app.ActivityScenario
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||||
import androidx.test.filters.LargeTest
|
import androidx.test.filters.LargeTest
|
||||||
@@ -30,7 +29,6 @@ class RxJavaBackPressureTest {
|
|||||||
fun before() {
|
fun before() {
|
||||||
launch = ActivityScenario.launch(MainLauncherActivity::class.java)
|
launch = ActivityScenario.launch(MainLauncherActivity::class.java)
|
||||||
RxJavaPlugins.setErrorHandler {
|
RxJavaPlugins.setErrorHandler {
|
||||||
Log.e("RxJava2", it.message, it)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
android:theme="@style/AppTheme.App"
|
android:theme="@style/AppTheme.App"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
tools:replace="android:label">
|
tools:replace="android:label">
|
||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="design_width_in_dp"
|
android:name="design_width_in_dp"
|
||||||
android:value="2560"/>
|
android:value="2560"/>
|
||||||
@@ -25,27 +26,6 @@
|
|||||||
android:name="design_height_in_dp"
|
android:name="design_height_in_dp"
|
||||||
android:value="1600"/>
|
android:value="1600"/>
|
||||||
|
|
||||||
<!-- <provider-->
|
|
||||||
<!-- android:name="com.rousetime.android_startup.provider.StartupProvider"-->
|
|
||||||
<!-- android:authorities="${applicationId}.android_startup"-->
|
|
||||||
<!-- android:exported="false" >-->
|
|
||||||
<!-- <meta-data-->
|
|
||||||
<!-- android:name="com.mogo.launcher.stageone.HttpDnsStartUp"-->
|
|
||||||
<!-- android:value="android.startup" />-->
|
|
||||||
<!-- <meta-data-->
|
|
||||||
<!-- android:name="com.mogo.launcher.stageone.MogoStartupProviderConfig"-->
|
|
||||||
<!-- android:value="android.startup.provider.config" />-->
|
|
||||||
<!-- </provider>-->
|
|
||||||
|
|
||||||
<!-- <!– 暂不使用Shizuku-API –>-->
|
|
||||||
<!-- <provider-->
|
|
||||||
<!-- android:name="rikka.shizuku.ShizukuProvider"-->
|
|
||||||
<!-- android:authorities="${applicationId}.shizuku"-->
|
|
||||||
<!-- android:enabled="true"-->
|
|
||||||
<!-- android:exported="true"-->
|
|
||||||
<!-- android:multiprocess="false"-->
|
|
||||||
<!-- android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />-->
|
|
||||||
|
|
||||||
<!-- 配置APP ID -->
|
<!-- 配置APP ID -->
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="BUGLY_APPID"
|
android:name="BUGLY_APPID"
|
||||||
|
|||||||
@@ -11,9 +11,7 @@ import android.util.Log;
|
|||||||
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
|
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.FilenameFilter;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
|
|||||||
@@ -2,12 +2,17 @@ package com.zhjt.mogo_core_function_devatools.apm
|
|||||||
|
|
||||||
import android.os.Process
|
import android.os.Process
|
||||||
import android.text.TextUtils
|
import android.text.TextUtils
|
||||||
import android.util.*
|
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import com.mogo.commons.debug.DebugConfig
|
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
|
||||||
import com.mogo.eagle.core.function.api.devatools.apm.*
|
import com.mogo.eagle.core.function.api.devatools.apm.*
|
||||||
import com.mogo.eagle.core.utilcode.util.*
|
import com.mogo.eagle.core.utilcode.util.*
|
||||||
import com.zhjt.mogo_core_function_devatools.apm.config.*
|
import com.zhjt.mogo_core_function_devatools.apm.config.*
|
||||||
|
import com.zhjt.service.chain.ChainLog
|
||||||
|
import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import java.util.concurrent.atomic.AtomicBoolean
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
import java.util.concurrent.atomic.AtomicReference
|
import java.util.concurrent.atomic.AtomicReference
|
||||||
@@ -45,6 +50,14 @@ 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) {
|
override fun onEnvChanged(buildType: String, netType: String, dockerVersion: String) {
|
||||||
if (!hasInit.get()) {
|
if (!hasInit.get()) {
|
||||||
return
|
return
|
||||||
@@ -53,7 +66,6 @@ object ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
launch {
|
launch {
|
||||||
Log.d(TAG, "onEnvChanged[1]:[buildType: $buildType, netType:$netType, dockerVersion:$dockerVersion]")
|
|
||||||
var buildTypeChanged = false
|
var buildTypeChanged = false
|
||||||
if (ApmEnvConfig.getBuildType() != buildType) {
|
if (ApmEnvConfig.getBuildType() != buildType) {
|
||||||
buildTypeChanged = true
|
buildTypeChanged = true
|
||||||
@@ -80,7 +92,6 @@ object ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
|
|||||||
isEnvValid = buildType == "0" || (buildType == "1" && netType == DebugConfig.NET_MODE_RELEASE.toString() && dockerVersion.endsWith("release", true))
|
isEnvValid = buildType == "0" || (buildType == "1" && netType == DebugConfig.NET_MODE_RELEASE.toString() && dockerVersion.endsWith("release", true))
|
||||||
}
|
}
|
||||||
val appRelaunched = ApmEnvConfig.isAppRelaunched()
|
val appRelaunched = ApmEnvConfig.isAppRelaunched()
|
||||||
Log.d(TAG, "onEnvChanged[2]: buildTypeChanged: $buildTypeChanged, netTypeChanged: $netTypeChanged, dockerVersionChanged:$dockerVersionChanged], isAppLaunched:$appRelaunched")
|
|
||||||
if ((!isEnvValid || (buildTypeChanged || netTypeChanged || dockerVersionChanged)) && !appRelaunched) {
|
if ((!isEnvValid || (buildTypeChanged || netTypeChanged || dockerVersionChanged)) && !appRelaunched) {
|
||||||
ApmEnvConfig.setAppRelaunched(true)
|
ApmEnvConfig.setAppRelaunched(true)
|
||||||
restartApp()
|
restartApp()
|
||||||
@@ -108,9 +119,16 @@ object ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ChainLog(
|
||||||
|
linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
|
||||||
|
linkCode = CHAIN_LINK_INIT,
|
||||||
|
endpoint = PAD,
|
||||||
|
nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ENV_RESTART,
|
||||||
|
paramIndexes = [-1],
|
||||||
|
clientPkFileName = "sn"
|
||||||
|
)
|
||||||
private fun restartApp() {
|
private fun restartApp() {
|
||||||
launch(Dispatchers.Main) {
|
launch(Dispatchers.Main) {
|
||||||
Log.d(TAG, "restartApp ---")
|
|
||||||
Toast.makeText(Utils.getApp(), "发现系统环境不一致,正在重启...", Toast.LENGTH_SHORT).show()
|
Toast.makeText(Utils.getApp(), "发现系统环境不一致,正在重启...", Toast.LENGTH_SHORT).show()
|
||||||
delay(50)
|
delay(50)
|
||||||
Utils.getApp().startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
|
Utils.getApp().startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import android.graphics.Color
|
|||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.text.Html
|
import android.text.Html
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.util.Log
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.annotation.RequiresApi
|
import androidx.annotation.RequiresApi
|
||||||
|
|||||||
@@ -2,9 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.res.TypedArray;
|
import android.content.res.TypedArray;
|
||||||
import android.graphics.Color;
|
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|||||||
@@ -56,14 +56,15 @@ class ChainConstant {
|
|||||||
|
|
||||||
const val CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK = "CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK"
|
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"
|
||||||
|
|
||||||
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL"
|
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL"
|
||||||
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS"
|
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS"
|
||||||
const val CHAIN_ALIAS_CODE_CLOUD_RECONNECT = "CHAIN_ALIAS_CODE_CLOUD_RECONNECT"
|
const val CHAIN_ALIAS_CODE_CLOUD_RECONNECT = "CHAIN_ALIAS_CODE_CLOUD_RECONNECT"
|
||||||
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST"
|
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST"
|
||||||
const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_ERROR = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_ERROR"
|
|
||||||
const val CHAIN_ALIAS_CODE_HTTP_DNS_CHANGED = "CHAIN_ALIAS_CODE_HTTP_DNS_CHANGED"
|
|
||||||
const val CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED = "CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED"
|
|
||||||
const val CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE = "CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE"
|
|
||||||
const val CHAIN_ALIAS_CODE_CLOUD_V2N = "CHAIN_ALIAS_CODE_CLOUD_V2N"
|
const val CHAIN_ALIAS_CODE_CLOUD_V2N = "CHAIN_ALIAS_CODE_CLOUD_V2N"
|
||||||
|
|
||||||
const val CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED = "CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED"
|
const val CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED = "CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.mogo.aicloud.services.httpdns;
|
package com.mogo.aicloud.services.sthttpdns;
|
||||||
|
|
||||||
import androidx.annotation.Keep;
|
import androidx.annotation.Keep;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.mogo.test.crashreport.apm;
|
package com.mogo.test.crashreport.apm;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import com.alibaba.android.arouter.facade.annotation.Route;
|
import com.alibaba.android.arouter.facade.annotation.Route;
|
||||||
import com.apm.insight.AttachUserData;
|
import com.apm.insight.AttachUserData;
|
||||||
@@ -59,7 +58,6 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
|
|||||||
boolean isDebug = DebugConfig.isDebug();
|
boolean isDebug = DebugConfig.isDebug();
|
||||||
if (provider != null) {
|
if (provider != null) {
|
||||||
Boolean enabled = provider.isDebugEnabled();
|
Boolean enabled = provider.isDebugEnabled();
|
||||||
Log.d("ApmCrashReportProvider", "--- isDebugEnabled:" + enabled);
|
|
||||||
if (enabled != null) {
|
if (enabled != null) {
|
||||||
isDebug = enabled;
|
isDebug = enabled;
|
||||||
}
|
}
|
||||||
@@ -80,7 +78,6 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
|
|||||||
mCityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE);
|
mCityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE);
|
||||||
mLat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE);
|
mLat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE);
|
||||||
mLogt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE);
|
mLogt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE);
|
||||||
// Log.d(TAG, "cityCode = " + mCityCode + " --lat = " +mLat + " --logt = " + mLogt);
|
|
||||||
//地图版本
|
//地图版本
|
||||||
String mapSDKVersion = DebugConfig.getMapVersion();
|
String mapSDKVersion = DebugConfig.getMapVersion();
|
||||||
map.put("MAP_SDK_VERSION", mapSDKVersion);
|
map.put("MAP_SDK_VERSION", mapSDKVersion);
|
||||||
|
|||||||
Reference in New Issue
Block a user