rebade

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.protobuf_java
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout

core/function-impl/mogo-core-function-devatools/proguard-rules.pro

@@ -19,3 +19,5 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontwarn android.arch.persistence.**

core/function-impl/mogo-core-function-notice/build.gradle

@@ -24,6 +24,12 @@ android {
             }
         }
 
+        javaCompileOptions{
+            annotationProcessorOptions{
+                arguments = ["room.schemaLocation":"$projectDir/schemas".toString()]
+            }
+        }
+
     }
 
     buildTypes {

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
 }

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

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;
 
 /**

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;

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;