From 96ee3d1ec5aeb9fbe058175eba6a863fd0bc203c Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Sat, 6 May 2023 18:43:19 +0800
Subject: [PATCH] merge code

---
 app/build.gradle             |  2 +-
 collect-library/build.gradle | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0d6c2905..decf7d32 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'com.google.dagger.hilt.android'
+    id 'realm-android'
     id 'kotlin-parcelize' // 序列化
     id 'androidx.navigation.safeargs.kotlin'//Safe Args传递数据
 }
@@ -73,7 +74,6 @@ android {
 
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation project(':collect-library')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
diff --git a/collect-library/build.gradle b/collect-library/build.gradle
index 6c9d5d8a..63bc27c2 100644
--- a/collect-library/build.gradle
+++ b/collect-library/build.gradle
@@ -1,10 +1,11 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-parcelize' // 序列化
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'realm-android'
 }
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'realm-android'
 
 ext.roomversion = "2.1.0"
 ext.vtmVersion = "0.18.0"
@@ -48,9 +49,15 @@ android {
     }
 }
 
+//configurations.all {
+//    resolutionStrategy {
+//        force 'com.intellij:annotations:13.0'
+//    }
+//}
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     api files('libs/BaiduLBS_Android.jar')
+
     api 'androidx.core:core-ktx:1.9.0'
     api 'androidx.appcompat:appcompat:1.6.1'
     api 'com.google.android.material:material:1.8.0'
@@ -112,6 +119,17 @@ dependencies {
     kapt "androidx.room:room-compiler:2.5.1"
     kapt "androidx.room:room-ktx:2.5.1"
 
+//    //分页加载
+//    api "androidx.room:room-paging:$roomversion"
+//    api "androidx.paging:paging-runtime-ktx:3.1.1"
+
     androidTestImplementation "android.arch.persistence.room:testing:1.1.1"
     api 'com.tencent.wcdb:wcdb-android:1.1-19'
+    //api 'de.mrmaffen:libvlc-android:2.1.12@aar'
+//    // 协程核心库
+//    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+//    // 协程Android支持库
+//    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+//    // 协程Java8支持库
+//    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4'
 }
\ No newline at end of file