diff --git a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java index a26bc65..b7f84e1 100644 --- a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java +++ b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java @@ -4,7 +4,6 @@ import androidx.room.Delete; import androidx.room.Insert; import androidx.room.Query; -import androidx.room.Update; import com.casic.br.operationsite.bean.PointBean; @@ -18,15 +17,9 @@ @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); - @Update - void updatePoint(PointBean point); - @Query("SELECT * FROM camera_inspection_point WHERE thirdType = :point") List queryPoint(int point); @Delete void deletePoint(PointBean point); - - @Query("DELETE FROM camera_inspection_point WHERE id = :id") - void deletePointById(long id); } diff --git a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java index a26bc65..b7f84e1 100644 --- a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java +++ b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java @@ -4,7 +4,6 @@ import androidx.room.Delete; import androidx.room.Insert; import androidx.room.Query; -import androidx.room.Update; import com.casic.br.operationsite.bean.PointBean; @@ -18,15 +17,9 @@ @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); - @Update - void updatePoint(PointBean point); - @Query("SELECT * FROM camera_inspection_point WHERE thirdType = :point") List queryPoint(int point); @Delete void deletePoint(PointBean point); - - @Query("DELETE FROM camera_inspection_point WHERE id = :id") - void deletePointById(long id); } diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt b/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt index 9fe5d16..f104b18 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt @@ -16,17 +16,6 @@ return String(hexChars) } -/** - * ByteArray转ASCII中文字符 - * */ -fun ByteArray.toAsciiCode(): String { - val builder = StringBuilder() - this.forEach { - builder.append(Char(it.toInt())) - } - return builder.toString() -} - fun ByteArray.handleGasConcentration(): Int { /** * [1, 0, 0, 0, 13, 14] diff --git a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java index a26bc65..b7f84e1 100644 --- a/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java +++ b/app/src/main/java/com/casic/br/operationsite/dao/PointBeanDao.java @@ -4,7 +4,6 @@ import androidx.room.Delete; import androidx.room.Insert; import androidx.room.Query; -import androidx.room.Update; import com.casic.br.operationsite.bean.PointBean; @@ -18,15 +17,9 @@ @Query("SELECT * FROM camera_inspection_point WHERE secondType = 1") List getFirstLinePoints(); - @Update - void updatePoint(PointBean point); - @Query("SELECT * FROM camera_inspection_point WHERE thirdType = :point") List queryPoint(int point); @Delete void deletePoint(PointBean point); - - @Query("DELETE FROM camera_inspection_point WHERE id = :id") - void deletePointById(long id); } diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt b/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt index 9fe5d16..f104b18 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/ByteArray.kt @@ -16,17 +16,6 @@ return String(hexChars) } -/** - * ByteArray转ASCII中文字符 - * */ -fun ByteArray.toAsciiCode(): String { - val builder = StringBuilder() - this.forEach { - builder.append(Char(it.toInt())) - } - return builder.toString() -} - fun ByteArray.handleGasConcentration(): Int { /** * [1, 0, 0, 0, 13, 14] diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ConditionalFilterDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ConditionalFilterDialog.kt index 683f18e..290d455 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ConditionalFilterDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ConditionalFilterDialog.kt @@ -6,12 +6,11 @@ import android.widget.ArrayAdapter import com.casic.br.operationsite.databinding.DialogConditionalFilterBinding import com.casic.br.operationsite.model.SystemDictModel -import com.pengxh.kt.lite.R import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.initDialogLayoutParams class ConditionalFilterDialog private constructor(builder: Builder) : - Dialog(builder.context, R.style.UserDefinedDialogStyle) { + Dialog(builder.context) { private val kTag = "ConditionalFilterDialog" private val context = builder.context