diff --git a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt index 8768e47..11cac61 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/TestUtils.kt @@ -14,7 +14,7 @@ object TestUtils { // 插入类型 val typeDao = DBUtils.gasTypeDao() val all = typeDao.getAll() - if (all.isNotEmpty()){ + if (all.isNotEmpty()) { return@launch } val list = mutableListOf() @@ -28,21 +28,21 @@ object TestUtils { val gasDao = DBUtils.gasDao() val gases = mutableListOf() - gases.add(Gas(1, timeMillis - 90 * 1000, "CO", 1.0)) - gases.add(Gas(2, timeMillis - 90 * 1000, "O2", 1.0)) - gases.add(Gas(3, timeMillis - 90 * 1000, "CO2", 1.0)) + gases.add(Gas(timeMillis - 90 * 1000, "CO", 1.0)) + gases.add(Gas(timeMillis - 90 * 1000, "O2", 1.0)) + gases.add(Gas(timeMillis - 90 * 1000, "CO2", 1.0)) - gases.add(Gas(4, timeMillis - 60 * 1000, "CO2", 1.0)) - gases.add(Gas(5, timeMillis - 60 * 1000, "CO", 1.0)) - gases.add(Gas(6, timeMillis - 60 * 1000, "O2", 1.0)) + gases.add(Gas(timeMillis - 60 * 1000, "CO2", 1.0)) + gases.add(Gas(timeMillis - 60 * 1000, "CO", 1.0)) + gases.add(Gas(timeMillis - 60 * 1000, "O2", 1.0)) - gases.add(Gas(7, timeMillis - 30 * 1000, "O2", 1.0)) - gases.add(Gas(8, timeMillis - 30 * 1000, "CO", 1.0)) - gases.add(Gas(9, timeMillis - 30 * 1000, "CO2", 1.0)) + gases.add(Gas(timeMillis - 30 * 1000, "O2", 1.0)) + gases.add(Gas(timeMillis - 30 * 1000, "CO", 1.0)) + gases.add(Gas(timeMillis - 30 * 1000, "CO2", 1.0)) - gases.add(Gas(10, timeMillis, "CO", 1.0)) - gases.add(Gas(11, timeMillis, "CO2", 1.0)) - gases.add(Gas(12, timeMillis, "O2", 1.0)) + gases.add(Gas(timeMillis, "CO", 1.0)) + gases.add(Gas(timeMillis, "CO2", 1.0)) + gases.add(Gas(timeMillis, "O2", 1.0)) gasDao.insertAll(gases) } } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt index 1f8f47a..08e10d0 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Gas.kt @@ -6,12 +6,12 @@ import androidx.room.PrimaryKey @Entity data class Gas( - @PrimaryKey var id: Int, @ColumnInfo(name = "time") var time: Long, @ColumnInfo(name = "gas_name") var gasName: String, @ColumnInfo(name = "gas_value") var gasValue: Double = 0.0, @ColumnInfo(name = "unit") var unit: String = "", @ColumnInfo(name = "threshold_low") var thresholdLow: Double = 0.0, @ColumnInfo(name = "threshold_high") var thresholdHigh: Double = 0.0, - @ColumnInfo(name = "sync_flag") var syncFlag: Boolean = false + @ColumnInfo(name = "sync_flag") var syncFlag: Boolean = false, + @PrimaryKey(autoGenerate = true) var id: Int = 0 ) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt index 315606e..f1d10c3 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/entity/Warning.kt @@ -6,7 +6,6 @@ import androidx.room.PrimaryKey @Entity data class Warning( - @PrimaryKey var id: Int, @ColumnInfo(name = "gas_name") var gasName: String, @ColumnInfo(name = "gas_value") var gasValue: Double, @ColumnInfo(name = "unit") var unit: String, @@ -14,4 +13,5 @@ data class Warning( @ColumnInfo(name = "threshold_high") var thresholdHigh: Double, @ColumnInfo(name = "start_time") var startTime: Long, @ColumnInfo(name = "end_time") var endTime: Long = -1L, + @PrimaryKey(autoGenerate = true) var id: Int = 0 )