Merge remote-tracking branch 'origin/dev_MogoAP_eagle-220_211207_8.0.15' into dev_MogoAP_eagle-220_211207_8.0.15

# Conflicts:
#	app/build.gradle

app/build.gradle

@@ -4,20 +4,20 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'android-aspectjx'
 apply plugin: 'bugly'
-//apply ByteX宿主
 apply plugin: 'apm-plugin'
-////apply ByteX宿主
-//apply plugin: 'bytex'
-//ByteX {
-//    enable true
-//    enableInDebug true
-//    logLevel "DEBUG"
-//}
-//
-//apply plugin: 'chain.log.hook'
-//hooklog{
-//    enableLoggerToServer true
-//}
+
+//apply ByteX宿主
+apply plugin: 'bytex'
+ByteX {
+    enable true
+    enableInDebug true
+    logLevel "DEBUG"
+}
+
+apply plugin: 'chain.log.hook'
+hooklog{
+    enableLoggerToServer true
+}
 bugly {
     appId = 'ac71228f85' // 注册时分配的App ID
     appKey = '3c736249-d6be-4066-b577-b7a6dc975cf7' // 注册时分配的App Key

gradle.properties

@@ -56,8 +56,8 @@ bytex.forbidUseLenientMutationDuringGetArtifact=true
 bytex.verifyProguardConfigurationChanged=false
 bytex.ASM_API=ASM7
 
-HOOK_LOG_VERSION=1.4.75
-SERVICE_CHAIN_VERSION=1.0.30
+HOOK_LOG_VERSION=1.4.90
+SERVICE_CHAIN_VERSION=1.0.32
 ################  外部依赖引用 ################
 # loglib
 LOGLIB_VERSION=1.0.4

modules/mogo-module-common/build.gradle

@@ -59,7 +59,7 @@ dependencies {
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
 
-//    implementation rootProject.ext.dependencies.mogochainbase
+    implementation rootProject.ext.dependencies.mogochainbase
 
     api rootProject.ext.dependencies.mogoaicloudrealtime
 

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java

@@ -29,6 +29,8 @@ import com.mogo.utils.ViewUtils;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.carchattingprovider.ICarsChattingProvider;
 import com.zhidao.carchattingprovider.MogoDriverInfo;
+import com.zhjt.service.chain.ChainLog;
+import com.zhjt.service.chain.TracingConstants;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -138,11 +140,11 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
      *
      * @param data 自车周边数据
      */
-//    @ChainLog(linkCode = 0,
-//            endpoint = TracingConstants.Endpoint.PAD,
-//            nodeAliasCode = "PAD_YINGYAN_SHOW",
-//            paramIndexes = {0},
-//            clientPkFileName = "sn")
+    @ChainLog(linkCode = 0,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = "PAD_YINGYAN_SHOW",
+            paramIndexes = {0},
+            clientPkFileName = "sn")
     public void renderSnapshotData(SocketDownData.LauncherSnapshotProto data) {
         final long start = System.nanoTime();
         if (clear(data)) {