From 2de439bf9a829cdd2b78a1d1f7afec0d3bda53ec Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 16 Jun 2023 15:29:01 +0800
Subject: [PATCH] =?UTF-8?q?desc:DB=E7=9B=B8=E5=85=B3=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0common=20lib=E6=96=B9=E4=BE=BF=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yinuo/safetywatcher/TestUtils.kt  |  6 +++---
 .../com/yinuo/safetywatcher/watcher/App.kt     |  6 +++---
 .../safetywatcher/watcher/ui/CloudActivity.kt  |  2 +-
 .../watcher/ui/QueryDataActivity.kt            |  4 ++--
 .../watcher/ui/adapter/HistoryDataAdapter.kt   |  2 +-
 library-common/build.gradle                    |  7 +++++++
 .../com/common/commonlib}/db/AppDatabase.kt    | 18 +++++++++---------
 .../com/common/commonlib}/db/dao/GasDao.kt     |  4 ++--
 .../com/common/commonlib}/db/dao/GasTypeDao.kt |  4 ++--
 .../com/common/commonlib}/db/dao/VideoDao.kt   |  4 ++--
 .../com/common/commonlib}/db/dao/WarningDao.kt |  4 ++--
 .../com/common/commonlib}/db/entity/Gas.kt     |  2 +-
 .../com/common/commonlib}/db/entity/GasType.kt |  2 +-
 .../com/common/commonlib}/db/entity/Video.kt   |  2 +-
 .../com/common/commonlib}/db/entity/Warning.kt |  2 +-
 15 files changed, 38 insertions(+), 31 deletions(-)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/AppDatabase.kt (65%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/dao/GasDao.kt (86%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/dao/GasTypeDao.kt (78%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/dao/VideoDao.kt (78%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/dao/WarningDao.kt (90%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/entity/Gas.kt (92%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/entity/GasType.kt (80%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/entity/Video.kt (87%)
 rename {app/src/main/java/com/yinuo/safetywatcher/watcher => library-common/src/main/java/com/common/commonlib}/db/entity/Warning.kt (92%)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
index 26afb6e..950cea9 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
+++ b/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.yinuo.safetywatcher.watcher.db.entity.Gas
-import com.yinuo.safetywatcher.watcher.db.entity.GasType
+import com.common.commonlib.db.DBUtils
+import com.common.commonlib.db.entity.Gas
+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
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
index 1410837..0d702e9 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
+++ b/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.yinuo.safetywatcher.watcher.db.dao.WarningDao
-import com.yinuo.safetywatcher.watcher.db.entity.Warning
+import com.common.commonlib.db.DBUtils
+import com.common.commonlib.db.dao.WarningDao
+import com.common.commonlib.db.entity.Warning
 import com.yinuo.safetywatcher.watcher.utils.LztekUtil
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt
index 2faae1d..cd5f3c1 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt
+++ b/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
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
index e098ce1..54af63b 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
+++ b/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.yinuo.safetywatcher.watcher.db.entity.Gas
+import com.common.commonlib.db.DBUtils
+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
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/HistoryDataAdapter.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/HistoryDataAdapter.kt
index d1978ef..fb592b4 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/HistoryDataAdapter.kt
+++ b/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 :
diff --git a/library-common/build.gradle b/library-common/build.gradle
index be127c5..b8a2812 100644
--- a/library-common/build.gradle
+++ b/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")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt b/library-common/src/main/java/com/common/commonlib/db/AppDatabase.kt
similarity index 65%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt
rename to library-common/src/main/java/com/common/commonlib/db/AppDatabase.kt
index e4b35de..c424b5a 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt
+++ b/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.yinuo.safetywatcher.watcher.db.dao.GasTypeDao
-import com.yinuo.safetywatcher.watcher.db.dao.VideoDao
-import com.yinuo.safetywatcher.watcher.db.dao.WarningDao
-import com.yinuo.safetywatcher.watcher.db.entity.Gas
-import com.yinuo.safetywatcher.watcher.db.entity.GasType
-import com.yinuo.safetywatcher.watcher.db.entity.Video
-import com.yinuo.safetywatcher.watcher.db.entity.Warning
+import com.common.commonlib.db.dao.GasDao
+import com.common.commonlib.db.dao.GasTypeDao
+import com.common.commonlib.db.dao.VideoDao
+import com.common.commonlib.db.dao.WarningDao
+import com.common.commonlib.db.entity.Gas
+import com.common.commonlib.db.entity.GasType
+import com.common.commonlib.db.entity.Video
+import com.common.commonlib.db.entity.Warning
 
 @Database(
     entities = [Warning::class, Gas::class, GasType::class, Video::class],
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/GasDao.kt
similarity index 86%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt
rename to library-common/src/main/java/com/common/commonlib/db/dao/GasDao.kt
index 90392d3..282351c 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt
+++ b/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 {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasTypeDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
similarity index 78%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasTypeDao.kt
rename to library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
index d8a6f5e..477b75b 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasTypeDao.kt
+++ b/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 {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/VideoDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/VideoDao.kt
similarity index 78%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/VideoDao.kt
rename to library-common/src/main/java/com/common/commonlib/db/dao/VideoDao.kt
index c3b306e..97deeae 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/VideoDao.kt
+++ b/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 {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/WarningDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt
similarity index 90%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/WarningDao.kt
rename to library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt
index c168472..9c79749 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/WarningDao.kt
+++ b/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 {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt b/library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt
similarity index 92%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt
rename to library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt
index 08e10d0..0d0728c 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt
+++ b/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
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/GasType.kt b/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt
similarity index 80%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/GasType.kt
rename to library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt
index 9b08ef5..378a2df 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/GasType.kt
+++ b/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
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Video.kt b/library-common/src/main/java/com/common/commonlib/db/entity/Video.kt
similarity index 87%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Video.kt
rename to library-common/src/main/java/com/common/commonlib/db/entity/Video.kt
index c5ad4c4..ade4378 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Video.kt
+++ b/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
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt b/library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt
similarity index 92%
rename from app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt
rename to library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt
index f1d10c3..53e9682 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt
+++ b/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