Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS

app/.gitignore

@@ -1 +1,2 @@
 /build
+/release

app/build.gradle

@@ -3,7 +3,6 @@ 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传递数据
 }
@@ -74,7 +73,7 @@ android {
 
 
 dependencies {
-    implementation project(':collect-library')
+    api project(':collect-library')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@@ -89,11 +88,6 @@ dependencies {
     implementation 'com.google.dagger:hilt-android:2.45'
     kapt 'com.google.dagger:hilt-compiler:2.45'
 
-    // Retrofit 网络请求相关
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation('com.squareup.okhttp3:okhttp:5.0.0-alpha.11')
-    implementation('com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11')
 
     kapt 'android.arch.persistence.room:compiler:1.1.1'// compiler 需要用 room 的
     kapt "androidx.room:room-compiler:2.5.1"

app/src/main/java/com/navinfo/omqs/Constant.kt

@@ -47,11 +47,6 @@ class Constant {
          */
         lateinit var DOWNLOAD_PATH: String
 
-        /**
-         * 服务器地址
-         */
-        const val SERVER_ADDRESS = "http://fastmap.navinfo.com/"
-
         const val DEBUG = true
 
         var IS_VIDEO_SPEED by kotlin.properties.Delegates.notNull<Boolean>()

app/src/main/java/com/navinfo/omqs/db/MyRealmModule.kt

@@ -1,7 +1,6 @@
 package com.navinfo.omqs.db
 
-import com.navinfo.collect.library.data.entity.HadLinkDvoBean
+import com.navinfo.collect.library.data.entity.TaskBean
-import com.navinfo.omqs.bean.TaskBean
 import io.realm.annotations.RealmModule
 
 @RealmModule(classes = [TaskBean::class])

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

@@ -7,6 +7,7 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.navinfo.collect.library.data.dao.impl.TraceDataBase
+import com.navinfo.collect.library.system.Constant.SERVER_ADDRESS
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.OMQSApplication
 import com.navinfo.omqs.db.RoomAppDatabase
@@ -82,7 +83,7 @@ class GlobalModule {
         converterFactory: GsonConverterFactory,
     ): Retrofit {
         val retrofitBuilder = Retrofit.Builder()
-            .baseUrl(Constant.SERVER_ADDRESS)
+            .baseUrl(SERVER_ADDRESS)
             .client(client.get())
             .addConverterFactory(converterFactory)
 

app/src/main/java/com/navinfo/omqs/http/NetworkService.kt

@@ -1,7 +1,7 @@
 package com.navinfo.omqs.http
 
 import com.navinfo.omqs.bean.OfflineMapCityBean
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 
 
 /**

app/src/main/java/com/navinfo/omqs/http/NetworkServiceImpl.kt

@@ -1,7 +1,7 @@
 package com.navinfo.omqs.http
 
 import com.navinfo.omqs.bean.OfflineMapCityBean
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject

app/src/main/java/com/navinfo/omqs/http/RetrofitNetworkServiceAPI.kt

@@ -2,9 +2,8 @@ package com.navinfo.omqs.http
 
 import com.navinfo.omqs.bean.EvaluationInfo
 import com.navinfo.omqs.bean.OfflineMapCityBean
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import okhttp3.ResponseBody
-import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.*
 

app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadManager.kt

@@ -4,13 +4,10 @@ import android.content.Context
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
 import com.navinfo.collect.library.map.NIMapController
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.omqs.hilt.ImportOMDBHiltFactory
-import com.navinfo.omqs.hilt.OMDBDataBaseHiltFactory
 import com.navinfo.omqs.http.RetrofitNetworkServiceAPI
-import dagger.hilt.android.qualifiers.ActivityContext
 import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
 
 
 /**

app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import com.navinfo.omqs.Constant
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.omqs.db.ImportOMDBHelper
 import com.navinfo.omqs.tools.FileManager
 import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus

app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadManager.kt

@@ -3,7 +3,7 @@ package com.navinfo.omqs.http.taskupload
 import android.content.Context
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.omqs.http.RetrofitNetworkServiceAPI
 import java.util.concurrent.ConcurrentHashMap
 

app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt

@@ -8,16 +8,10 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import com.navinfo.collect.library.data.entity.QsRecordBean
 import com.navinfo.omqs.bean.EvaluationInfo
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
-import com.navinfo.omqs.http.NetResult
-import com.navinfo.omqs.tools.FileManager
 import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus
 import io.realm.Realm
 import kotlinx.coroutines.*
-import okhttp3.ResponseBody
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 import java.util.*
 
 class TaskUploadScope(

app/src/main/java/com/navinfo/omqs/tools/FileManager.kt

@@ -3,7 +3,7 @@ package com.navinfo.omqs.tools
 import android.content.Context
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.bean.OfflineMapCityBean
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import java.io.File
 
 class FileManager {

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt

@@ -176,7 +176,7 @@ class LoginViewModel @Inject constructor(
             .directory(userFolder)
             .name("OMQS.realm")
             .encryptionKey(password)
-            .modules(Realm.getDefaultModule(), MyRealmModule())
+//            .modules(Realm.getDefaultModule(), MyRealmModule())
             .schemaVersion(1)
             .build()
         Realm.setDefaultConfiguration(config)

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -31,7 +31,7 @@ import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.ImportConfig
 import com.navinfo.omqs.bean.SignBean
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.ui.dialog.CommonDialog
 import com.navinfo.omqs.ui.manager.TakePhotoManager

app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt

@@ -1,18 +1,11 @@
 package com.navinfo.omqs.ui.fragment.tasklist
 
 import android.content.Context
-import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import androidx.lifecycle.Observer
 import com.navinfo.collect.library.data.entity.QsRecordBean
 import com.navinfo.omqs.R
-import com.navinfo.omqs.bean.TaskBean
 import com.navinfo.omqs.databinding.AdapterQsRecordListBinding
-import com.navinfo.omqs.databinding.AdapterTaskListBinding
-import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
-import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
 

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt

@@ -1,25 +1,19 @@
 package com.navinfo.omqs.ui.fragment.tasklist
 
-import android.content.Context
-import android.graphics.Color
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.Observer
 import com.navinfo.omqs.R
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.omqs.databinding.AdapterTaskListBinding
 import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
 import com.navinfo.omqs.http.taskupload.TaskUploadManager
-import com.navinfo.omqs.tools.FileManager
 import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus
 import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
-import java.io.File
-import java.util.*
-import javax.inject.Inject
 
 /**
  * 离线地图城市列表 RecyclerView 适配器

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt

@@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.Constant
-import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.omqs.http.NetResult
 import com.navinfo.omqs.http.NetworkService
 import com.navinfo.omqs.tools.FileManager

collect-library/build.gradle

@@ -132,4 +132,10 @@ dependencies {
 //    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 //    // 协程Java8支持库
 //    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4'
+
+    // Retrofit 网络请求相关
+    api("com.squareup.retrofit2:retrofit:2.9.0")
+    api("com.squareup.retrofit2:converter-gson:2.9.0")
+    api('com.squareup.okhttp3:okhttp:5.0.0-alpha.11')
+    api('com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11')
 }

collect-library/src/main/java/com/navinfo/collect/library/data/entity/TaskBean.kt

@@ -1,10 +1,7 @@
-package com.navinfo.omqs.bean
+package com.navinfo.collect.library.data.entity
 
 import com.google.gson.annotations.SerializedName
-import com.navinfo.collect.library.data.entity.HadLinkDvoBean
+import com.navinfo.collect.library.system.Constant
-import com.navinfo.omqs.Constant
-import com.navinfo.omqs.tools.FileManager
-import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.Ignore
@@ -56,12 +53,12 @@ open class TaskBean @JvmOverloads constructor(
     /**
      * 当前下载状态
      */
-    var status: Int = FileDownloadStatus.NONE,
+    var status: Int = 0,
 
     /**
      * 上传状态
      */
-    var syncStatus: Int = FileManager.Companion.FileUploadStatus.NONE,
+    var syncStatus: Int = 0,
 
     @Ignore
     var message: String = "",

collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java

@@ -32,5 +32,10 @@ public class Constant {
     public static final int OVER_ZOOM = 21;
     public static final int MAX_ZOOM = 25;
     public static final int OMDB_MIN_ZOOM = 18;
+
+    /**
+     * 服务器地址
+     */
+    public static final String SERVER_ADDRESS = "http://fastmap.navinfo.com/";
 }