From 90017a92aa81a371fd6073e21daba011d3be7f1b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 10 Mar 2022 15:56:05 +0800 Subject: [PATCH] changed the these files due to room problem --- .../mogo-core-function-devatools/build.gradle | 13 ++++++++++--- .../mogo-core-function-devatools/proguard-rules.pro | 4 +++- .../mogo-core-function-notice/build.gradle | 6 ++++++ .../core/function/notice/dao/PushBeanDatabase.kt | 2 +- .../core/function/v2x/events/V2XEventManager.kt | 2 +- .../v2x/events/view/CarZegoLiveVideoView.java | 2 +- .../v2x/events/view/V2XCrossRoadVideoView.java | 2 +- .../v2x/events/view/V2XLiveGSYVideoView.java | 2 +- 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index 9874e99d32..36ad868944 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -26,6 +26,12 @@ android { arg("AROUTER_MODULE_NAME", project.getName()) } } + + javaCompileOptions { + annotationProcessorOptions { + arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] + } + } } buildTypes { @@ -62,15 +68,16 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.mogologlib implementation rootProject.ext.dependencies.mogochainbase - kapt rootProject.ext.dependencies.androidxroomcompiler - implementation rootProject.ext.dependencies.androidxroomruntime - implementation rootProject.ext.dependencies.androidxroomktx implementation rootProject.ext.dependencies.androidx_datastore + implementation rootProject.ext.dependencies.androidxroomruntime + kapt rootProject.ext.dependencies.androidxroomcompiler + implementation rootProject.ext.dependencies.androidxroomktx implementation rootProject.ext.dependencies.google_proto_java implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout diff --git a/core/function-impl/mogo-core-function-devatools/proguard-rules.pro b/core/function-impl/mogo-core-function-devatools/proguard-rules.pro index 481bb43481..3dbb226707 100644 --- a/core/function-impl/mogo-core-function-devatools/proguard-rules.pro +++ b/core/function-impl/mogo-core-function-devatools/proguard-rules.pro @@ -18,4 +18,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + +-dontwarn android.arch.persistence.** \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-notice/build.gradle b/core/function-impl/mogo-core-function-notice/build.gradle index 31b5a813f3..111633d37e 100644 --- a/core/function-impl/mogo-core-function-notice/build.gradle +++ b/core/function-impl/mogo-core-function-notice/build.gradle @@ -24,6 +24,12 @@ android { } } + javaCompileOptions{ + annotationProcessorOptions{ + arguments = ["room.schemaLocation":"$projectDir/schemas".toString()] + } + } + } buildTypes { diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDatabase.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDatabase.kt index 178a980271..4844c46560 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDatabase.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDatabase.kt @@ -4,7 +4,7 @@ import androidx.room.Database import androidx.room.RoomDatabase import com.mogo.eagle.core.function.notice.model.PushBean -@Database(entities = [PushBean::class], version = 1) +@Database(entities = [PushBean::class], version = 1,exportSchema = false) abstract class PushBeanDatabase : RoomDatabase() { abstract fun pushBeanDao(): PushBeanDao } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt index 20086e42d8..b17c1d4dd2 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt @@ -36,6 +36,7 @@ import com.mogo.eagle.core.function.v2x.events.observer.V2XOptimalRouteObserver import com.mogo.eagle.core.function.v2x.events.receiver.SceneBroadcastReceiver import com.mogo.eagle.core.function.v2x.events.scenario.impl.V2XScenarioManager import com.mogo.eagle.core.function.v2x.events.utils.* +import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceManager import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils @@ -50,7 +51,6 @@ import com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum import com.mogo.module.common.enums.EventTypeEnum import com.mogo.module.common.enums.EventTypeEnum.FOURS_BLOCK_UP import com.mogo.module.common.utils.Const -import com.mogo.module.v2x.voice.V2XVoiceManager import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor import com.mogo.service.statusmanager.StatusDescriptor.ACC_STATUS diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/CarZegoLiveVideoView.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/CarZegoLiveVideoView.java index 3b6a572a22..6d5ea3e021 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/CarZegoLiveVideoView.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/CarZegoLiveVideoView.java @@ -20,10 +20,10 @@ import com.mogo.eagle.core.function.v2x.R; import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceCallbackListener; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceConstants; +import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceManager; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.eagle.core.widget.RoundLayout; import com.mogo.map.location.IMogoLocationClient; -import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; /** diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java index a58b34b138..07f32a2eef 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java @@ -23,12 +23,12 @@ import com.mogo.eagle.core.function.v2x.R; import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceCallbackListener; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceConstants; +import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceManager; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.eagle.core.widget.RoundLayout; import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer; import com.mogo.map.location.IMogoLocationClient; import com.mogo.module.common.entity.MarkerCarInfo; -import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.shuyu.gsyvideoplayer.GSYVideoManager; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XLiveGSYVideoView.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XLiveGSYVideoView.java index 84ff7ea605..56c11bb432 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XLiveGSYVideoView.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XLiveGSYVideoView.java @@ -19,11 +19,11 @@ import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.function.v2x.R; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceCallbackListener; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceConstants; +import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceManager; import com.mogo.eagle.core.network.utils.GsonUtil; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.eagle.core.widget.RoundLayout; import com.mogo.module.common.entity.MarkerCarInfo; -import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.tencent.rtmp.ITXLivePlayListener; import com.tencent.rtmp.TXLiveConstants;