zhangxn
/
puwei
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main
xiaowusky 2 years ago
parent e34ad9ddab
commit 2de439bf9a
15 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt
Unescape Escape View File

@ -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

6
app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
Unescape Escape View File

@ -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

2
app/src/main/java/com/yinuo/safetywatcher/watcher/ui/CloudActivity.kt
Unescape Escape View File

@ -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

4
app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt
Unescape Escape View File

@ -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

2
app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/HistoryDataAdapter.kt
Unescape Escape View File

@ -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 :

7
library-common/build.gradle
Unescape Escape View File

@ -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")
}

18
app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt → library-common/src/main/java/com/common/commonlib/db/AppDatabase.kt
Unescape Escape View File

@ -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],

4
app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt → library-common/src/main/java/com/common/commonlib/db/dao/GasDao.kt
Unescape Escape View File

@ -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 {

4
app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasTypeDao.kt → library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt
Unescape Escape View File

@ -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 {

4
app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/VideoDao.kt → library-common/src/main/java/com/common/commonlib/db/dao/VideoDao.kt
Unescape Escape View File

@ -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 {

4
app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/WarningDao.kt → library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt
Unescape Escape View File

@ -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 {

2
app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt → library-common/src/main/java/com/common/commonlib/db/entity/Gas.kt
Unescape Escape View File

@ -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

2
app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/GasType.kt → library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt
Unescape Escape View File

@ -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

2
app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Video.kt → library-common/src/main/java/com/common/commonlib/db/entity/Video.kt
Unescape Escape View File

@ -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

2
app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt → library-common/src/main/java/com/common/commonlib/db/entity/Warning.kt
Unescape Escape View File

@ -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
Write Preview
Loading…
Cancel
Save