From 226b279e53a222602bb99746ec468a18666a6091 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 15 Oct 2021 22:54:47 +0800 Subject: [PATCH] note the pluigin --- app/build.gradle | 26 +++++++++---------- build.gradle | 6 ++--- gradle.properties | 22 ++++++++-------- modules/mogo-module-common/build.gradle | 4 +-- .../common/drawer/SnapshotSetDataDrawer.java | 11 +++----- 5 files changed, 32 insertions(+), 37 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4efc3a41c6..768f77a866 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,18 +4,18 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'android-aspectjx' -//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 +//} Properties properties = new Properties(); properties.load(project.rootProject.file("gradle.properties").newDataInputStream()) @@ -42,8 +42,6 @@ android { packagingOptions { exclude 'META-INF/proguard/coroutines.pro' exclude 'META-INF/*' - exclude '*/proguard' - pickFirst 'migrateToAndroidx/migration.xml' } signingConfigs { diff --git a/build.gradle b/build.gradle index fc46f91485..8b3d6180a0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply from: "javadoc.gradle" buildscript { repositories { - maven { url "https://artifact.bytedance.com/repository/byteX/" } +// maven { url "https://artifact.bytedance.com/repository/byteX/" } maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/google' } @@ -19,8 +19,8 @@ buildscript { classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31' classpath "com.alibaba:arouter-register:1.0.2" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' - classpath "com.bytedance.android.byteX:base-plugin:0.3.0" - classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" +// classpath "com.bytedance.android.byteX:base-plugin:0.3.0" +// classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" // classpath ("com.tencent.matrix:matrix-gradle-plugin:0.6.6") { changing = true } } diff --git a/gradle.properties b/gradle.properties index 5ce42ef968..eea0949dbd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ kapt.include.compile.classpath=false # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX -android.enableJetifier=false +android.enableJetifier=true android.jetifier.blacklist=module-service-2.0.58.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ @@ -46,16 +46,16 @@ PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 RELEASE=false -#plugin 插件 -android.enableR8.libraries=false -android.enableR8=false -android.enableD8=true -android.enableD8.desugaring=true -android.enableDesugar=true -bytex.enableHtmlLog=true -bytex.forbidUseLenientMutationDuringGetArtifact=true -bytex.verifyProguardConfigurationChanged=false -bytex.ASM_API=ASM7 +##plugin 插件 +#android.enableR8.libraries=false +#android.enableR8=false +#android.enableD8=true +#android.enableD8.desugaring=true +#android.enableDesugar=true +#bytex.enableHtmlLog=true +#bytex.forbidUseLenientMutationDuringGetArtifact=true +#bytex.verifyProguardConfigurationChanged=false +#bytex.ASM_API=ASM7 HOOK_LOG_VERSION=1.4.63 SERVICE_CHAIN_VERSION=1.0.22 diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index bd110d83d2..c6b45a8681 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -73,8 +73,8 @@ dependencies { implementation project(':core:mogo-core-function-call') } - implementation rootProject.ext.dependencies.mogochainbase - implementation rootProject.ext.dependencies.mogochainplugin +// implementation rootProject.ext.dependencies.mogochainbase +// implementation rootProject.ext.dependencies.mogochainplugin annotationProcessor 'com.elegant.spi:compiler:1.0.3' } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 9c9983c420..2ff8412526 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -29,9 +29,6 @@ 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; import java.util.List; @@ -140,10 +137,10 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic * * @param data 自车周边数据 */ - @ChainLog(endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = "PAD_YINGYAN_SHOW", - paramIndexes = 0, - clientPkFileName = "sn") +// @ChainLog(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)) {