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

 Conflicts:

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

	app/src/main/java/com/navinfo/omqs/bean/OfflineMapCityBean.kt

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

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

	app/src/main/res/layout/adapter_offline_map_city.xml

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

@@ -0,0 +1,48 @@
+package com.navinfo.collect.library.data.entity
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+enum class StatusEnum(val status: Int) {
+    NONE(0), WAITING(1), LOADING(2), PAUSE(3),
+    ERROR(4), DONE(5), UPDATE(6)
+}
+
+open class OfflineMapCityBean @JvmOverloads constructor(@PrimaryKey var id: String = "",
+                                                        var fileName: String = "",
+                                                        var name: String = "",
+                                                        var url: String = "",
+                                                        var version: Long = 0L,
+                                                        var fileSize: Long = 0L,
+                                                        var currentSize: Long = 0L,
+                                                        var status: Int =0) : RealmObject(){
+    // status的转换对象
+    var statusEnum:StatusEnum
+        get() {
+            return try {
+                StatusEnum.values().find { it.status == status }!!
+            } catch (e: IllegalArgumentException) {
+                StatusEnum.NONE
+            }
+        }
+        set(value) {
+            status = value.status
+        }
+
+    fun getFileSizeText(): String {
+        return if (fileSize < 1024.0)
+            "$fileSize B"
+        else if (fileSize < 1048576.0)
+            "%.2f K".format(fileSize / 1024.0)
+        else if (fileSize < 1073741824.0)
+            "%.2f M".format(fileSize / 1048576.0)
+        else
+            "%.2f M".format(fileSize / 1073741824.0)
+    }
+
+//    constructor(){
+//
+//    }
+//
+
+}

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

@@ -0,0 +1,43 @@
+package com.navinfo.collect.library.data.entity
+
+import io.realm.RealmModel
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import io.realm.annotations.RealmClass
+
+@RealmClass
+open class OfflineMapCityRealmObject: RealmModel {
+    @PrimaryKey
+    var id: String = ""
+    var fileName: String=""
+    var name: String = ""
+    var url: String = ""
+    var version: Long = 0
+    var fileSize: Long = 0
+    var currentSize:Long = 0
+    var status:Int = 0
+
+    constructor(){
+
+    }
+
+    constructor(
+        id: String,
+        fileName: String,
+        name: String,
+        url: String,
+        version: Long,
+        fileSize: Long,
+        currentSize: Long,
+        status: Int
+    ) {
+        this.id = id
+        this.fileName = fileName
+        this.name = name
+        this.url = url
+        this.version = version
+        this.fileSize = fileSize
+        this.currentSize = currentSize
+        this.status = status
+    }
+}