desc:DB相关移动到common lib方便其他模块调用

app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt

@@ -8,9 +8,9 @@ import android.os.Build
 import android.provider.Settings
 import com.common.commonlib.net.bean.BaseResponse
 import com.common.commonlib.net.callback.RequestResultCallBack
-import com.yinuo.safetywatcher.watcher.db.DBUtils
+import com.common.commonlib.db.DBUtils
-import com.yinuo.safetywatcher.watcher.db.entity.Gas
+import com.common.commonlib.db.entity.Gas
-import com.yinuo.safetywatcher.watcher.db.entity.GasType
+import com.common.commonlib.db.entity.GasType
 import com.yinuo.safetywatcher.watcher.net.api.UploadFileApi
 import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog
 import com.yinuo.safetywatcher.watcher.utils.DateUtils

app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt

@@ -3,9 +3,9 @@ package com.yinuo.safetywatcher.watcher
 import com.common.commonlib.CommonApplication
 import com.lztek.toolkit.Lztek
 import com.yinuo.safetywatcher.TestUtils
-import com.yinuo.safetywatcher.watcher.db.DBUtils
+import com.common.commonlib.db.DBUtils
-import com.yinuo.safetywatcher.watcher.db.dao.WarningDao
+import com.common.commonlib.db.dao.WarningDao
-import com.yinuo.safetywatcher.watcher.db.entity.Warning
+import com.common.commonlib.db.entity.Warning
 import com.yinuo.safetywatcher.watcher.utils.LztekUtil
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt

@@ -5,7 +5,7 @@ import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.TestUtils
 import com.yinuo.safetywatcher.databinding.ActivityCloudBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
-import com.yinuo.safetywatcher.watcher.db.DBUtils
+import com.common.commonlib.db.DBUtils
 import com.yinuo.safetywatcher.watcher.net.api.UploadFileApi
 import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog
 import kotlinx.coroutines.DelicateCoroutinesApi

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt

@@ -12,8 +12,8 @@ import com.yinuo.safetywatcher.watcher.ui.adapter.HistoryDataAdapter
 import com.yinuo.safetywatcher.watcher.base.BaseActivity
 import com.yinuo.safetywatcher.watcher.constant.DEFAULT_QUERY_TIME_INTERVAL
 import com.yinuo.safetywatcher.watcher.constant.TimeStep
-import com.yinuo.safetywatcher.watcher.db.DBUtils
+import com.common.commonlib.db.DBUtils
-import com.yinuo.safetywatcher.watcher.db.entity.Gas
+import com.common.commonlib.db.entity.Gas
 import com.yinuo.safetywatcher.watcher.utils.DateUtils
 import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
 import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/HistoryDataAdapter.kt

@@ -4,7 +4,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.yinuo.safetywatcher.databinding.LayoutItemHistoryBinding
 import com.yinuo.safetywatcher.watcher.base.BaseRvAdapter
-import com.yinuo.safetywatcher.watcher.db.entity.Gas
+import com.common.commonlib.db.entity.Gas
 import com.yinuo.safetywatcher.watcher.utils.DateUtils
 
 class HistoryDataAdapter :

library-common/build.gradle

@@ -69,4 +69,11 @@ dependencies {
     implementation rootProject.ext.dependencies.lifecycle_process
     // glide注解
     kapt rootProject.ext.dependencies.annotationProcessor
+
+    // room
+    var room_version = "2.5.0"
+    implementation("androidx.room:room-runtime:$room_version")
+    annotationProcessor("androidx.room:room-compiler:$room_version")
+    kapt("androidx.room:room-compiler:$room_version")
+    implementation("androidx.room:room-ktx:$room_version")
 }

library-common/src/main/java/com/common/commonlib/db/AppDatabase.kt

@@ -1,17 +1,17 @@
-package com.yinuo.safetywatcher.watcher.db
+package com.common.commonlib.db
 
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import com.common.commonlib.CommonApplication
-import com.yinuo.safetywatcher.watcher.db.dao.GasDao
+import com.common.commonlib.db.dao.GasDao
-import com.yinuo.safetywatcher.watcher.db.dao.GasTypeDao
+import com.common.commonlib.db.dao.GasTypeDao
-import com.yinuo.safetywatcher.watcher.db.dao.VideoDao
+import com.common.commonlib.db.dao.VideoDao
-import com.yinuo.safetywatcher.watcher.db.dao.WarningDao
+import com.common.commonlib.db.dao.WarningDao
-import com.yinuo.safetywatcher.watcher.db.entity.Gas
+import com.common.commonlib.db.entity.Gas
-import com.yinuo.safetywatcher.watcher.db.entity.GasType
+import com.common.commonlib.db.entity.GasType
-import com.yinuo.safetywatcher.watcher.db.entity.Video
+import com.common.commonlib.db.entity.Video
-import com.yinuo.safetywatcher.watcher.db.entity.Warning
+import com.common.commonlib.db.entity.Warning
 
 @Database(
     entities = [Warning::class, Gas::class, GasType::class, Video::class],

library-common/src/main/java/com/common/commonlib/db/dao/GasDao.kt

@@ -1,10 +1,10 @@
-package com.yinuo.safetywatcher.watcher.db.dao
+package com.common.commonlib.db.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import com.yinuo.safetywatcher.watcher.db.entity.Gas
+import com.common.commonlib.db.entity.Gas
 
 @Dao
 interface GasDao {

library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt

@@ -1,10 +1,10 @@
-package com.yinuo.safetywatcher.watcher.db.dao
+package com.common.commonlib.db.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import com.yinuo.safetywatcher.watcher.db.entity.GasType
+import com.common.commonlib.db.entity.GasType
 
 @Dao
 interface GasTypeDao {

library-common/src/main/java/com/common/commonlib/db/dao/VideoDao.kt

@@ -1,10 +1,10 @@
-package com.yinuo.safetywatcher.watcher.db.dao
+package com.common.commonlib.db.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import com.yinuo.safetywatcher.watcher.db.entity.Video
+import com.common.commonlib.db.entity.Video
 
 @Dao
 interface VideoDao {

library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt

@@ -1,11 +1,11 @@
-package com.yinuo.safetywatcher.watcher.db.dao
+package com.common.commonlib.db.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
-import com.yinuo.safetywatcher.watcher.db.entity.Warning
+import com.common.commonlib.db.entity.Warning
 
 @Dao
 interface WarningDao {

library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.db.entity
+package com.common.commonlib.db.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.db.entity
+package com.common.commonlib.db.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

library-common/src/main/java/com/common/commonlib/db/entity/Video.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.db.entity
+package com.common.commonlib.db.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt

@@ -1,4 +1,4 @@
-package com.yinuo.safetywatcher.watcher.db.entity
+package com.common.commonlib.db.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity