From dbb62bbe04a2ee77c8015b5a42c7d0e55faede76 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 22 Feb 2023 19:10:03 +0800
Subject: [PATCH] [2.13.0-arch-opt] remove unuse code and add trace log

---
 .../functions/test/RxJavaBackPressureTest.kt  |  2 --
 app/src/main/AndroidManifest.xml              | 22 +---------------
 .../com/mogo/launcher/crash/CrashSystem.java  |  2 --
 .../apm/ApmEnvProviderImpl.kt                 | 26 ++++++++++++++++---
 .../hmi/ui/setting/DebugSettingView.kt        |  1 -
 .../hmi/ui/widget/TapPositionView.java        |  2 --
 .../core/data/deva/chain/ChainConstant.kt     |  9 ++++---
 .../services/httpdns/HttpDnsConst.java        |  2 +-
 .../apm/ApmCrashReportProvider.java           |  3 ---
 9 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt b/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt
index 192fb9905d..ef335d6bff 100644
--- a/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt
+++ b/app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt
@@ -1,7 +1,6 @@
 package com.mogo.functions.test
 
 import android.os.Debug
-import android.util.Log
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
@@ -30,7 +29,6 @@ class RxJavaBackPressureTest {
     fun before() {
         launch = ActivityScenario.launch(MainLauncherActivity::class.java)
         RxJavaPlugins.setErrorHandler {
-            Log.e("RxJava2", it.message, it)
         }
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 86e6613133..1fd891b416 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
         android:theme="@style/AppTheme.App"
         android:usesCleartextTraffic="true"
         tools:replace="android:label">
+
         <meta-data
             android:name="design_width_in_dp"
             android:value="2560"/>
@@ -25,27 +26,6 @@
             android:name="design_height_in_dp"
             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>-->
-
-<!--        &lt;!&ndash; 暂不使用Shizuku-API &ndash;&gt;-->
-<!--        <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 -->
         <meta-data
             android:name="BUGLY_APPID"
diff --git a/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java b/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java
index 91742834a7..846e5d3f05 100644
--- a/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java
+++ b/app/src/main/java/com/mogo/launcher/crash/CrashSystem.java
@@ -11,9 +11,7 @@ import android.util.Log;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
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 1a6a181a80..e6db5773db 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
@@ -2,12 +2,17 @@ package com.zhjt.mogo_core_function_devatools.apm
 
 import android.os.Process
 import android.text.TextUtils
-import android.util.*
 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
 import com.mogo.eagle.core.function.api.devatools.apm.*
 import com.mogo.eagle.core.utilcode.util.*
 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 java.util.concurrent.atomic.AtomicBoolean
 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) {
         if (!hasInit.get()) {
             return
@@ -53,7 +66,6 @@ object ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
             return
         }
         launch {
-            Log.d(TAG, "onEnvChanged[1]:[buildType: $buildType, netType:$netType, dockerVersion:$dockerVersion]")
             var buildTypeChanged = false
             if (ApmEnvConfig.getBuildType() != buildType) {
                 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))
             }
             val appRelaunched = ApmEnvConfig.isAppRelaunched()
-            Log.d(TAG, "onEnvChanged[2]: buildTypeChanged: $buildTypeChanged, netTypeChanged: $netTypeChanged, dockerVersionChanged:$dockerVersionChanged], isAppLaunched:$appRelaunched")
             if ((!isEnvValid || (buildTypeChanged || netTypeChanged || dockerVersionChanged)) && !appRelaunched) {
                 ApmEnvConfig.setAppRelaunched(true)
                 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() {
         launch(Dispatchers.Main) {
-            Log.d(TAG, "restartApp ---")
             Toast.makeText(Utils.getApp(), "发现系统环境不一致，正在重启...", Toast.LENGTH_SHORT).show()
             delay(50)
             Utils.getApp().startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 05606d4bba..c5a07964f2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -9,7 +9,6 @@ import android.graphics.Color
 import android.os.Build
 import android.text.Html
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.annotation.RequiresApi
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java
index c8de687a2a..60cc5b0106 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java
@@ -2,9 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
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 b3b4418ca4..f5b23c8beb 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,14 +56,15 @@ 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"
+
         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_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_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_INIT_ON_MAP_LOADED = "CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED"
diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java
index a98969c3cf..9e9da09eff 100644
--- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java
+++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/httpdns/HttpDnsConst.java
@@ -1,4 +1,4 @@
-package com.mogo.aicloud.services.httpdns;
+package com.mogo.aicloud.services.sthttpdns;
 
 import androidx.annotation.Keep;
 
diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
index 40bab898f4..407880933c 100644
--- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
+++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
@@ -1,7 +1,6 @@
 package com.mogo.test.crashreport.apm;
 
 import android.content.Context;
-import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.apm.insight.AttachUserData;
@@ -59,7 +58,6 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
         boolean isDebug = DebugConfig.isDebug();
         if (provider != null) {
             Boolean enabled = provider.isDebugEnabled();
-            Log.d("ApmCrashReportProvider", "--- isDebugEnabled:" + enabled);
             if (enabled != null) {
                 isDebug = enabled;
             }
@@ -80,7 +78,6 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
                         mCityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE);
                         mLat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE);
                         mLogt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE);
-//                        Log.d(TAG, "cityCode = " + mCityCode + " --lat = " +mLat + " --logt = " + mLogt);
                         //地图版本
                         String mapSDKVersion = DebugConfig.getMapVersion();
                         map.put("MAP_SDK_VERSION", mapSDKVersion);