fix: 合并代码

app/src/main/java/com/navinfo/omqs/hilt/ActivityModule.kt

@@ -0,0 +1,66 @@
+package com.navinfo.omqs.hilt
+
+import android.content.Context
+import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.omqs.db.RealmOperateHelper
+import com.navinfo.omqs.db.RoomAppDatabase
+import com.navinfo.omqs.http.RetrofitNetworkServiceAPI
+import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
+import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityRetainedComponent
+import dagger.hilt.android.qualifiers.ActivityContext
+import dagger.hilt.android.scopes.ActivityRetainedScoped
+
+@InstallIn(ActivityRetainedComponent::class)
+@Module
+class ActivityModule {
+
+    /**
+     * 注入地图控制器，在activity范围内使用，单例
+     */
+    @ActivityRetainedScoped
+    @Provides
+    fun providesMapController(): NIMapController = NIMapController()
+
+    /**
+     * 注入离线地图下载管理，在activity范围内使用，单例
+     */
+    @ActivityRetainedScoped
+    @Provides
+    fun providesOfflineMapDownloadManager(
+        networkServiceAPI: RetrofitNetworkServiceAPI,
+        roomAppDatabase: RoomAppDatabase,
+        mapController: NIMapController
+    ): OfflineMapDownloadManager =
+        OfflineMapDownloadManager(networkServiceAPI, roomAppDatabase, mapController)
+
+    /**
+     * 注入任务下载
+     */
+    @ActivityRetainedScoped
+    @Provides
+    fun providesTaskListDownloadManager(
+        networkServiceAPI: RetrofitNetworkServiceAPI,
+        importFactory: ImportOMDBHiltFactory,
+    ): TaskDownloadManager =
+        TaskDownloadManager(importFactory, networkServiceAPI)
+
+    /**
+     * 实验失败，这样创建，viewmodel不会在activity销毁的时候同时销毁
+     * 4-14:因为没有传入activity的 owner,无法检测生命周期，
+     */
+//    @ActivityRetainedScoped
+//    @Provides
+//    fun providesMainViewModel(mapController: NIMapController): MainViewModel {
+//        return MainViewModel(mapController)
+//    }
+
+    @ActivityRetainedScoped
+    @Provides
+    fun providesRealmOperateHelper(): RealmOperateHelper {
+        return RealmOperateHelper()
+    }
+}

app/src/main/java/com/navinfo/omqs/hilt/GlobalModule.kt

@@ -17,6 +17,7 @@ import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import io.realm.Realm
 import kotlinx.coroutines.*
@@ -36,7 +37,7 @@ class GlobalModule {
 
     @Singleton
     @Provides
-    fun provideApplication(application: Application): OMQSApplication {
+    fun provideApplication(@ApplicationContext application: Application): OMQSApplication {
         return application as OMQSApplication
     }
 

app/src/main/java/com/navinfo/omqs/hilt/MainActivityModule.kt

@@ -1,63 +1,21 @@
 package com.navinfo.omqs.hilt
 
+import android.content.Context
 import com.navinfo.collect.library.map.NIMapController
-import com.navinfo.omqs.db.RealmOperateHelper
-import com.navinfo.omqs.db.RoomAppDatabase
-import com.navinfo.omqs.http.RetrofitNetworkServiceAPI
-import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
-import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityRetainedComponent
-import dagger.hilt.android.scopes.ActivityRetainedScoped
+import dagger.hilt.android.components.ActivityComponent
+import dagger.hilt.android.qualifiers.ActivityContext
+import dagger.hilt.android.scopes.ActivityScoped
 
-@InstallIn(ActivityRetainedComponent::class)
+@InstallIn(ActivityComponent::class)
 @Module
 class MainActivityModule {
-
     /**
      * 注入地图控制器，在activity范围内使用，单例
      */
-    @ActivityRetainedScoped
+    @ActivityScoped
     @Provides
-    fun providesMapController(): NIMapController = NIMapController()
-
-    /**
-     * 注入离线地图下载管理，在activity范围内使用，单例
-     */
-    @ActivityRetainedScoped
-    @Provides
-    fun providesOfflineMapDownloadManager(
-        networkServiceAPI: RetrofitNetworkServiceAPI,
-        roomAppDatabase: RoomAppDatabase,
-        mapController: NIMapController
-    ): OfflineMapDownloadManager =
-        OfflineMapDownloadManager(networkServiceAPI, roomAppDatabase, mapController)
-
-    /**
-     * 注入任务下载
-     */
-    @ActivityRetainedScoped
-    @Provides
-    fun providesTaskListDownloadManager(
-        networkServiceAPI: RetrofitNetworkServiceAPI,
-    ): TaskDownloadManager =
-        TaskDownloadManager(networkServiceAPI)
-
-    /**
-     * 实验失败，这样创建，viewmodel不会在activity销毁的时候同时销毁
-     * 4-14:因为没有传入activity的 owner,无法检测生命周期，
-     */
-//    @ActivityRetainedScoped
-//    @Provides
-//    fun providesMainViewModel(mapController: NIMapController): MainViewModel {
-//        return MainViewModel(mapController)
-//    }
-
-    @ActivityRetainedScoped
-    @Provides
-    fun providesRealmOperateHelper(): RealmOperateHelper {
-        return RealmOperateHelper()
-    }
+    fun providesContext(@ActivityContext context: Context): Context = context
 }

app/src/main/java/com/navinfo/omqs/hilt/Qualifiers.kt

@@ -0,0 +1,7 @@
+//package com.navinfo.omqs.hilt
+//
+//import javax.inject.Qualifier
+//
+//@Qualifier
+//@Retention(AnnotationRetention.RUNTIME)
+//annotation class ActivityContext