diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml new file mode 100644 index 0000000..e82f94c --- /dev/null +++ b/app/src/main/res/drawable/switch_background_off.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml new file mode 100644 index 0000000..e82f94c --- /dev/null +++ b/app/src/main/res/drawable/switch_background_off.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml new file mode 100644 index 0000000..91213fc --- /dev/null +++ b/app/src/main/res/drawable/switch_background_on.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml new file mode 100644 index 0000000..e82f94c --- /dev/null +++ b/app/src/main/res/drawable/switch_background_off.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml new file mode 100644 index 0000000..91213fc --- /dev/null +++ b/app/src/main/res/drawable/switch_background_on.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml new file mode 100644 index 0000000..c049f3d --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_off.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml new file mode 100644 index 0000000..e82f94c --- /dev/null +++ b/app/src/main/res/drawable/switch_background_off.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml new file mode 100644 index 0000000..91213fc --- /dev/null +++ b/app/src/main/res/drawable/switch_background_on.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml new file mode 100644 index 0000000..c049f3d --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_off.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml new file mode 100644 index 0000000..0b4f0d5 --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_on.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml new file mode 100644 index 0000000..e82f94c --- /dev/null +++ b/app/src/main/res/drawable/switch_background_off.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml new file mode 100644 index 0000000..91213fc --- /dev/null +++ b/app/src/main/res/drawable/switch_background_on.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml new file mode 100644 index 0000000..c049f3d --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_off.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml new file mode 100644 index 0000000..0b4f0d5 --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_on.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index e672c7e..34ee6cc 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -1,5 +1,6 @@ - + android:layout_marginEnd="@dimen/dp_10" + android:thumb="@drawable/select_switch_circle" + android:track="@drawable/select_switch_background" + tools:ignore="UseSwitchCompatOrMaterialXml" /> diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml new file mode 100644 index 0000000..e82f94c --- /dev/null +++ b/app/src/main/res/drawable/switch_background_off.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml new file mode 100644 index 0000000..91213fc --- /dev/null +++ b/app/src/main/res/drawable/switch_background_on.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml new file mode 100644 index 0000000..c049f3d --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_off.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml new file mode 100644 index 0000000..0b4f0d5 --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_on.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index e672c7e..34ee6cc 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -1,5 +1,6 @@ - + android:layout_marginEnd="@dimen/dp_10" + android:thumb="@drawable/select_switch_circle" + android:track="@drawable/select_switch_background" + tools:ignore="UseSwitchCompatOrMaterialXml" /> diff --git a/app/src/main/res/layout/item_sensor_list_rv.xml b/app/src/main/res/layout/item_sensor_list_rv.xml index 1fb8eed..a6419e0 100644 --- a/app/src/main/res/layout/item_sensor_list_rv.xml +++ b/app/src/main/res/layout/item_sensor_list_rv.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="离线" - android:textColor="@color/subTextColor" /> + android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" /> \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0d897b4..298022e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,21 +22,6 @@ versionCode 4 versionName "1.0.3" - // 添加手机架构过滤，去掉老旧手机兼容 - /** - * 只适配armeabi： - * 优点：基本可以适配所有手机机型，除了淘汰的mips和mips_64 - * 缺点：在大多数手机上都需要利用辅助ABI或者动态转码来兼容，性能较差 - - * 只适配 armeabi-v7a - * 筛掉了一部分老旧设备,在性能和兼容二者中比较平衡 - - * 只适配 arm64-v8 - * 优点：性能最佳（微信大哥采用的） - * 缺点：只能运行在arm64-v8上，要放弃部分老旧设备用户 - * */ - ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8" } - manifestPlaceholders = [ GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4" ] @@ -47,6 +32,10 @@ minifyEnabled false signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + ndk { + abiFilters "arm64-v8a", "armeabi-v7a" + } } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt index c48c9d5..f9a8fe3 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderCompletedAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -77,7 +77,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt index 3d3c9e3..df3426a 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderInHandleAdapter.kt @@ -11,13 +11,13 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -76,7 +76,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt index 8cc8886..5dcd0a0 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -11,12 +11,12 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.arrowAnimation import com.casic.app.smartwell.model.ExpandableDataModel -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.TimeLineItemDecoration class OrderNotConfirmedAdapter( private val context: Context, - private val dataRows: MutableList + private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -70,7 +70,7 @@ } } - private fun createExpandableList(rowsBean: WorkOrderListModel.DataBean.RowsBean): MutableList { + private fun createExpandableList(rowsBean: OrderListModel.DataBean.RowsBean): MutableList { val expandableList: MutableList = ArrayList() expandableList.add(ExpandableDataModel(rowsBean.createTime, "发起工单")) expandableList.add( diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt index 3e8fe0c..ba7eae6 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -7,11 +7,11 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderNotProcessedAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index fa3c5cf..007f630 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -23,19 +23,20 @@ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 val rowsBean = dataRows[position] - holder.wellCodeView.text = rowsBean.devcode + holder.wellCodeView.text = String.format("设备编号：${rowsBean.devcode}") if (rowsBean.onlineState == "0") { holder.wellStateView.setTextColor(R.color.redTextColor.convertColor(context)) } else { holder.wellStateView.setTextColor(R.color.greenTextColor.convertColor(context)) } holder.wellStateView.text = rowsBean.onlineStateName - val value = rowsBean.data.toString() - if (value.isBlank()) { - holder.watchDataView.text = String.format("${rowsBean.watchType}：未知") + + val value = if (rowsBean.data.toString().isBlank()) { + "未知" } else { - holder.watchDataView.text = String.format("${rowsBean.watchType}：$value") + rowsBean.data.toString() } + holder.watchDataView.text = "${rowsBean.watchType}：$value" holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") val time = rowsBean.logtime.toString() if (time.isBlank()) { diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt b/app/src/main/java/com/casic/app/smartwell/extensions/View.kt deleted file mode 100644 index 0b1ea77..0000000 --- a/app/src/main/java/com/casic/app/smartwell/extensions/View.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.app.smartwell.extensions - -import android.graphics.Bitmap -import android.view.View - -/** - * 把一个view转化成bitmap对象 - */ -fun View.toBitmap(): Bitmap? { - var bitmap: Bitmap? = null - try { - this.measure( - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - ) - this.layout(0, 0, this.measuredWidth, this.measuredHeight) - this.buildDrawingCache() - bitmap = this.drawingCache - } catch (e: Exception) { - e.printStackTrace() - } - return bitmap -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f87118d..de322e4 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Build +import android.util.Log import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.BuildConfig @@ -34,6 +35,7 @@ class MinePageFragment : KotlinBaseFragment() { + private val kTag = "MinePageFragment" private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean private lateinit var userViewModel: UserViewModel @@ -61,6 +63,9 @@ progressDialog.setProgressDrawable(resources.getDrawable(R.drawable.download_progress)) progressDialog.setCanceledOnTouchOutside(false) progressDialog.setCancelable(false) + + //默认打开通知 + noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean } override fun initEvent() { @@ -79,6 +84,15 @@ updateVersionLayout.setOnClickListener { userViewModel.updateVersion() } + + noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index 32c5436..b876865 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderCompletedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderCompletedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index df30f73..e6c7951 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderInHandleAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -24,7 +24,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 5739787..a3f435d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderNotConfirmedDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -21,7 +21,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 90fddfd..75465ee 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -26,7 +26,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 647a601..3981224 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotProcessedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.view.OrderNotProcessedDetailActivity import com.casic.app.smartwell.vm.OperationViewModel @@ -29,7 +29,7 @@ private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 5c961bd..a328ccd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -6,7 +6,7 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.app.smartwell.extensions.showEmptyPage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.view.OrderInHandleDetailActivity import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -24,7 +24,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter - private var dataBeans: MutableList = ArrayList() + private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java new file mode 100644 index 0000000..ed70468 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt b/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt deleted file mode 100644 index 6911fd1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/AlarmContentTypeModel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.app.smartwell.model - -class AlarmContentTypeModel { - /** - * code : 200 - * data : {"list":[{"deviceType":"1","alarmType":"1","name":"井盖开盖报警","value":"1"},{"deviceType":"2","alarmType":"1","name":"液位超限","value":"4"},{"deviceType":"3","alarmType":"1","name":"有害气体超标","value":"10"},{"deviceType":"5","alarmType":"1","name":"温湿度超限","value":"11"},{"deviceType":"6","alarmType":"1","name":"疑似开挖","value":"12"},{"deviceType":"4","alarmType":"1","name":"浓度超限","value":"13"},{"deviceType":"8","alarmType":"1","name":"噪声超限","value":"22"}]} - * message : success - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - - class DataBean { - var list: List? = null - - class ListBean { - /** - * deviceType : 1 - * alarmType : 1 - * name : 井盖开盖报警 - * value : 1 - */ - var deviceType: String? = null - var alarmType: String? = null - var name: String? = null - var value: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java new file mode 100644 index 0000000..800e272 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.java @@ -0,0 +1,44 @@ +package com.casic.app.smartwell.model; + +/** + * 普通实体类，失败/成功数据结构一致 + */ +public class CommonResultModel { + + private int code; + private String data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt deleted file mode 100644 index b5fc159..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/CommonResultModel.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * 普通实体类，失败/成功数据结构一致 - */ -class CommonResultModel { - var code = 0 - var data: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java new file mode 100644 index 0000000..d8b18ef --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.java @@ -0,0 +1,50 @@ +package com.casic.app.smartwell.model; + +public class ErrorMessageModel { + + private int code; + private String data; + private String exceptionClazz; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getExceptionClazz() { + return exceptionClazz; + } + + public void setExceptionClazz(String exceptionClazz) { + this.exceptionClazz = exceptionClazz; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt deleted file mode 100644 index 0b56128..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ErrorMessageModel.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.app.smartwell.model - -class ErrorMessageModel { - var code = 0 - var data: String? = null - var exceptionClazz: String? = null - var message: String? = null - var isSuccess = false -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java new file mode 100644 index 0000000..b014078 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.java @@ -0,0 +1,20 @@ +package com.casic.app.smartwell.model; + +public class ExpandableDataModel { + + private final String orderStateTime; + private final String operationPerson; + + public ExpandableDataModel(String orderStateTime, String operationPerson) { + this.orderStateTime = orderStateTime; + this.operationPerson = operationPerson; + } + + public String getOrderStateTime() { + return orderStateTime; + } + + public String getOperationPerson() { + return operationPerson; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt b/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt deleted file mode 100644 index 618e273..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/ExpandableDataModel.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.casic.app.smartwell.model - -class ExpandableDataModel(var orderStateTime: String?, var operationPerson: String?) \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java new file mode 100644 index 0000000..602138b --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.java @@ -0,0 +1,62 @@ +package com.casic.app.smartwell.model; + +public class LoginResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String kaptcha; + private String token; + + public String getKaptcha() { + return kaptcha; + } + + public void setKaptcha(String kaptcha) { + this.kaptcha = kaptcha; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt deleted file mode 100644 index 112f2bf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/LoginResultModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.app.smartwell.model - -class LoginResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var kaptcha: String? = null - var token: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java new file mode 100644 index 0000000..06e2168 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderDetailModel.java @@ -0,0 +1,445 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderDetailModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String firstState; + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String firstStatePhotos; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private List flow; + private int editable; + private String alarmTime; + private String handleMessage; + private String alarmMessage; + private String staff; + private String handlePhotos; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public String getFirstState() { + return firstState; + } + + public void setFirstState(String firstState) { + this.firstState = firstState; + } + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getFirstStatePhotos() { + return firstStatePhotos; + } + + public void setFirstStatePhotos(String firstStatePhotos) { + this.firstStatePhotos = firstStatePhotos; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public List getFlow() { + return flow; + } + + public void setFlow(List flow) { + this.flow = flow; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getHandleMessage() { + return handleMessage; + } + + public void setHandleMessage(String handleMessage) { + this.handleMessage = handleMessage; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getHandlePhotos() { + return handlePhotos; + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public static class FlowBean { + private String from; + private String to; + private String time; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java new file mode 100644 index 0000000..54dd73d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderListModel.java @@ -0,0 +1,382 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private String alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public String getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(String alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java new file mode 100644 index 0000000..6b9891f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.java @@ -0,0 +1,73 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class OrderStatusModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String name; + private String id; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt b/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt deleted file mode 100644 index 1fefd20..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/OrderStatusModel.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.app.smartwell.model - -class OrderStatusModel { - /** - * code : 200 - * data : [{"name":"待处理","id":"84","value":"0"},{"name":"待确认","id":"85","value":"1"},{"name":"处理中","id":"86","value":"2"},{"name":"已完成","id":"87","value":"3"},{"name":"已取消","id":"93","value":"4"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var success = false - var data: List? = null - - class DataBean { - /** - * name : 待处理 - * id : 84 - * value : 0 - */ - var name: String? = null - var id: String? = null - var value: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java new file mode 100644 index 0000000..bdf19f8 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.java @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.model; + +/** + * PublicKey 登录校验Key + */ +public class PublicKeyModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private boolean appKaptcha; + private boolean kaptcha; + private String publicKey; + private String sid; + + public boolean isAppKaptcha() { + return appKaptcha; + } + + public void setAppKaptcha(boolean appKaptcha) { + this.appKaptcha = appKaptcha; + } + + public boolean isKaptcha() { + return kaptcha; + } + + public void setKaptcha(boolean kaptcha) { + this.kaptcha = kaptcha; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt b/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt deleted file mode 100644 index abeeedf..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/PublicKeyModel.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.app.smartwell.model - -/** - * PublicKey 登录校验Key - */ -class PublicKeyModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var isAppKaptcha = false - var isKaptcha = false - var publicKey: String? = null - var sid: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java new file mode 100644 index 0000000..86ac901 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.java @@ -0,0 +1,391 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class SearchResultModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private int alarmContent; + private String deptName; + private String jobStatus; + private String handleJobPerson; + private String alarmContentName; + private String shouldGetTime; + private String wellCode; + private String deptid; + private String alarmTypeName; + private String jobCode; + private String jobBelongTo; + private String jobFlag; + private String confirmJobPerson; + private String confirmJobTime; + private String jobStatusName; + private String alarmValue; + private String alarmId; + private int alarmLevel; + private String handleJobTime; + private String tel; + private String id; + private String wellId; + private String jobType; + private int editable; + private String alarmTime; + private String alarmMessage; + private String staff; + private String getJobTime; + private String getJobPerson; + private String shouldHandleTime; + private String jobId; + private String alarmType; + private String alarmStatus; + private String devcode; + private String createTime; + private String position; + + public int getAlarmContent() { + return alarmContent; + } + + public void setAlarmContent(int alarmContent) { + this.alarmContent = alarmContent; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getJobStatus() { + return jobStatus; + } + + public void setJobStatus(String jobStatus) { + this.jobStatus = jobStatus; + } + + public String getHandleJobPerson() { + return handleJobPerson; + } + + public void setHandleJobPerson(String handleJobPerson) { + this.handleJobPerson = handleJobPerson; + } + + public String getAlarmContentName() { + return alarmContentName; + } + + public void setAlarmContentName(String alarmContentName) { + this.alarmContentName = alarmContentName; + } + + public String getShouldGetTime() { + return shouldGetTime; + } + + public void setShouldGetTime(String shouldGetTime) { + this.shouldGetTime = shouldGetTime; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getAlarmTypeName() { + return alarmTypeName; + } + + public void setAlarmTypeName(String alarmTypeName) { + this.alarmTypeName = alarmTypeName; + } + + public String getJobCode() { + return jobCode; + } + + public void setJobCode(String jobCode) { + this.jobCode = jobCode; + } + + public String getJobBelongTo() { + return jobBelongTo; + } + + public void setJobBelongTo(String jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } + + public String getJobFlag() { + return jobFlag; + } + + public void setJobFlag(String jobFlag) { + this.jobFlag = jobFlag; + } + + public String getConfirmJobPerson() { + return confirmJobPerson; + } + + public void setConfirmJobPerson(String confirmJobPerson) { + this.confirmJobPerson = confirmJobPerson; + } + + public String getConfirmJobTime() { + return confirmJobTime; + } + + public void setConfirmJobTime(String confirmJobTime) { + this.confirmJobTime = confirmJobTime; + } + + public String getJobStatusName() { + return jobStatusName; + } + + public void setJobStatusName(String jobStatusName) { + this.jobStatusName = jobStatusName; + } + + public String getAlarmValue() { + return alarmValue; + } + + public void setAlarmValue(String alarmValue) { + this.alarmValue = alarmValue; + } + + public String getAlarmId() { + return alarmId; + } + + public void setAlarmId(String alarmId) { + this.alarmId = alarmId; + } + + public int getAlarmLevel() { + return alarmLevel; + } + + public void setAlarmLevel(int alarmLevel) { + this.alarmLevel = alarmLevel; + } + + public String getHandleJobTime() { + return handleJobTime; + } + + public void setHandleJobTime(String handleJobTime) { + this.handleJobTime = handleJobTime; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWellId() { + return wellId; + } + + public void setWellId(String wellId) { + this.wellId = wellId; + } + + public String getJobType() { + return jobType; + } + + public void setJobType(String jobType) { + this.jobType = jobType; + } + + public int getEditable() { + return editable; + } + + public void setEditable(int editable) { + this.editable = editable; + } + + public String getAlarmTime() { + return alarmTime; + } + + public void setAlarmTime(String alarmTime) { + this.alarmTime = alarmTime; + } + + public String getAlarmMessage() { + return alarmMessage; + } + + public void setAlarmMessage(String alarmMessage) { + this.alarmMessage = alarmMessage; + } + + public String getStaff() { + return staff; + } + + public void setStaff(String staff) { + this.staff = staff; + } + + public String getGetJobTime() { + return getJobTime; + } + + public void setGetJobTime(String getJobTime) { + this.getJobTime = getJobTime; + } + + public String getGetJobPerson() { + return getJobPerson; + } + + public void setGetJobPerson(String getJobPerson) { + this.getJobPerson = getJobPerson; + } + + public String getShouldHandleTime() { + return shouldHandleTime; + } + + public void setShouldHandleTime(String shouldHandleTime) { + this.shouldHandleTime = shouldHandleTime; + } + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(String alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt b/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt deleted file mode 100644 index af7fd13..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/SearchResultModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class SearchResultModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java new file mode 100644 index 0000000..02970c3 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.java @@ -0,0 +1,226 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class UserDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String account; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private String name; + private String phone; + private List roleList; + private List roleNames; + private List roleTips; + private String scopeType; + private String sysData; + private String targetId; + private String targetName; + private String tenantId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getRoleList() { + return roleList; + } + + public void setRoleList(List roleList) { + this.roleList = roleList; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt deleted file mode 100644 index d1c01c0..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/UserDetailModel.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.casic.app.smartwell.model - -class UserDetailModel { - /** - * code : 200 - * data : {"account":"wxy","attr1":"","avatar":"","bizData":"","dataScope":["25","1138317710804635650","1138317982620700674"],"deptId":"1138317710804635650","deptName":"A小组","devices":[],"id":"46","ipAddr":"124.127.1.144","name":"王晓颖","phone":"15652360420","roleList":["1138356647455494145"],"roleNames":["组长"],"roleTips":["leader"],"scopeType":"4","sysData":"","targetId":"","targetName":"","tenantId":""} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * account : wxy - * attr1 : - * avatar : - * bizData : - * dataScope : ["25","1138317710804635650","1138317982620700674"] - * deptId : 1138317710804635650 - * deptName : A小组 - * devices : [] - * id : 46 - * ipAddr : 124.127.1.144 - * name : 王晓颖 - * phone : 15652360420 - * roleList : ["1138356647455494145"] - * roleNames : ["组长"] - * roleTips : ["leader"] - * scopeType : 4 - * sysData : - * targetId : - * targetName : - * tenantId : - */ - var account: String? = null - var attr1: String? = null - var avatar: String? = null - var bizData: String? = null - var deptId: String? = null - var deptName: String? = null - var id: String? = null - var ipAddr: String? = null - var name: String? = null - var phone: String? = null - var scopeType: String? = null - var sysData: String? = null - var targetId: String? = null - var targetName: String? = null - var tenantId: String? = null - var dataScope: List? = null - var devices: List? = null - var roleList: List? = null - var roleNames: List? = null - var roleTips: List? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java new file mode 100644 index 0000000..b17c464 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.java @@ -0,0 +1,314 @@ +package com.casic.app.smartwell.model; + +public class WellDetailModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String area; + private String areaFullName; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private int deep; + private String deptName; + private String deptid; + private String deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getAreaFullName() { + return areaFullName; + } + + public void setAreaFullName(String areaFullName) { + this.areaFullName = areaFullName; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public int getDeep() { + return deep; + } + + public void setDeep(int deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public String getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(String deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt deleted file mode 100644 index 2369fe9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellDetailModel.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.app.smartwell.model - -class WellDetailModel { - /** - * code : 200 - * data : {"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":"","id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount: String? = null - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java new file mode 100644 index 0000000..ac15f68 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.java @@ -0,0 +1,328 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellListModel { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String area; + private String bfzt; + private String bfztName; + private String coordinateX; + private String coordinateY; + private String deep; + private String deptName; + private String deptid; + private int deviceCount; + private String id; + private String latBaidu; + private String latGaode; + private String lngBaidu; + private String lngGaode; + private String notes; + private String photos; + private String position; + private String qu; + private String responsibleDept; + private String responsibleDeptName; + private String ts; + private String valid; + private String wellCode; + private String wellFlag1; + private String wellFlag2; + private String wellFlag3; + private String wellName; + private String wellType; + private String wellTypeName; + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getBfzt() { + return bfzt; + } + + public void setBfzt(String bfzt) { + this.bfzt = bfzt; + } + + public String getBfztName() { + return bfztName; + } + + public void setBfztName(String bfztName) { + this.bfztName = bfztName; + } + + public String getCoordinateX() { + return coordinateX; + } + + public void setCoordinateX(String coordinateX) { + this.coordinateX = coordinateX; + } + + public String getCoordinateY() { + return coordinateY; + } + + public void setCoordinateY(String coordinateY) { + this.coordinateY = coordinateY; + } + + public String getDeep() { + return deep; + } + + public void setDeep(String deep) { + this.deep = deep; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptid() { + return deptid; + } + + public void setDeptid(String deptid) { + this.deptid = deptid; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLatBaidu() { + return latBaidu; + } + + public void setLatBaidu(String latBaidu) { + this.latBaidu = latBaidu; + } + + public String getLatGaode() { + return latGaode; + } + + public void setLatGaode(String latGaode) { + this.latGaode = latGaode; + } + + public String getLngBaidu() { + return lngBaidu; + } + + public void setLngBaidu(String lngBaidu) { + this.lngBaidu = lngBaidu; + } + + public String getLngGaode() { + return lngGaode; + } + + public void setLngGaode(String lngGaode) { + this.lngGaode = lngGaode; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + + public String getPhotos() { + return photos; + } + + public void setPhotos(String photos) { + this.photos = photos; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public String getQu() { + return qu; + } + + public void setQu(String qu) { + this.qu = qu; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getResponsibleDeptName() { + return responsibleDeptName; + } + + public void setResponsibleDeptName(String responsibleDeptName) { + this.responsibleDeptName = responsibleDeptName; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + + public String getWellCode() { + return wellCode; + } + + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } + + public String getWellFlag1() { + return wellFlag1; + } + + public void setWellFlag1(String wellFlag1) { + this.wellFlag1 = wellFlag1; + } + + public String getWellFlag2() { + return wellFlag2; + } + + public void setWellFlag2(String wellFlag2) { + this.wellFlag2 = wellFlag2; + } + + public String getWellFlag3() { + return wellFlag3; + } + + public void setWellFlag3(String wellFlag3) { + this.wellFlag3 = wellFlag3; + } + + public String getWellName() { + return wellName; + } + + public void setWellName(String wellName) { + this.wellName = wellName; + } + + public String getWellType() { + return wellType; + } + + public void setWellType(String wellType) { + this.wellType = wellType; + } + + public String getWellTypeName() { + return wellTypeName; + } + + public void setWellTypeName(String wellTypeName) { + this.wellTypeName = wellTypeName; + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt deleted file mode 100644 index efecac5..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellListModel.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.casic.app.smartwell.model - -class WellListModel { - /** - * code : 200 - * data : {"rows":[{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}],"total":10} - * message : 请求成功 - * success : true - */ - var code = 0 - var data: DataBean? = null - var message: String? = null - var isSuccess = false - - class DataBean { - /** - * rows : [{"area":"110107006","bfzt":"1","bfztName":"布防","coordinateX":"116.224311","coordinateY":"38.113531","deep":4,"deptName":"燃气集团总公司","deptid":"24","deviceCount":13,"id":"4453","latBaidu":"38.11992780253818","latGaode":"38.114227973091","lngBaidu":"116.23674002174215","lngGaode":"116.230148925782","notes":"","photos":"2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg;","position":"test001位置","qu":"110107","responsibleDept":"1138317710804635650","responsibleDeptName":"A小组","ts":"","valid":"1","wellCode":"test001","wellFlag1":"","wellFlag2":"","wellFlag3":"","wellName":"测试井1","wellType":"4","wellTypeName":"热力井"}] - * total : 10 - */ - val total = 0 - val rows: MutableList? = null - - class RowsBean { - /** - * area : 110107006 - * bfzt : 1 - * bfztName : 布防 - * coordinateX : 116.224311 - * coordinateY : 38.113531 - * deep : 4 - * deptName : 燃气集团总公司 - * deptid : 24 - * deviceCount : 13 - * id : 4453 - * latBaidu : 38.11992780253818 - * latGaode : 38.114227973091 - * lngBaidu : 116.23674002174215 - * lngGaode : 116.230148925782 - * notes : - * photos : 2020-07/49a84681b3ba4d589750b051e3a884c6.png;2020-07/0b2739cff482488fb0bb479f1b8d8dae.jpeg; - * position : test001位置 - * qu : 110107 - * responsibleDept : 1138317710804635650 - * responsibleDeptName : A小组 - * ts : - * valid : 1 - * wellCode : test001 - * wellFlag1 : - * wellFlag2 : - * wellFlag3 : - * wellName : 测试井1 - * wellType : 4 - * wellTypeName : 热力井 - */ - var area: String? = null - var bfzt: String? = null - var bfztName: String? = null - var coordinateX: String? = null - var coordinateY: String? = null - var deep: Any? = null - var deptName: String? = null - var deptid: String? = null - var deviceCount = 0 - var id: String? = null - var latBaidu: String? = null - var latGaode: String? = null - var lngBaidu: String? = null - var lngGaode: String? = null - var notes: String? = null - var photos: String? = null - var position: String? = null - var qu: String? = null - var responsibleDept: String? = null - var responsibleDeptName: String? = null - var ts: String? = null - var valid: String? = null - var wellCode: String? = null - var wellFlag1: String? = null - var wellFlag2: String? = null - var wellFlag3: String? = null - var wellName: String? = null - var wellType: String? = null - var wellTypeName: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java new file mode 100644 index 0000000..812d37d --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.java @@ -0,0 +1,136 @@ +package com.casic.app.smartwell.model; + +import java.util.List; + +public class WellMonitorModel { + + private int code; + private List data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + private String data; + private String devcode; + private String deviceId; + private String installDate; + private String logtime; + private String onlineState; + private String onlineStateName; + private String type; + private String value; + private String watchType; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDevcode() { + return devcode; + } + + public void setDevcode(String devcode) { + this.devcode = devcode; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getInstallDate() { + return installDate; + } + + public void setInstallDate(String installDate) { + this.installDate = installDate; + } + + public String getLogtime() { + return logtime; + } + + public void setLogtime(String logtime) { + this.logtime = logtime; + } + + public String getOnlineState() { + return onlineState; + } + + public void setOnlineState(String onlineState) { + this.onlineState = onlineState; + } + + public String getOnlineStateName() { + return onlineStateName; + } + + public void setOnlineStateName(String onlineStateName) { + this.onlineStateName = onlineStateName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getWatchType() { + return watchType; + } + + public void setWatchType(String watchType) { + this.watchType = watchType; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt deleted file mode 100644 index 8f3343b..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WellMonitorModel.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.app.smartwell.model - -class WellMonitorModel { - /** - * code : 200 - * data : [{"data":"无数据","devcode":"412021160186","deviceId":"1503929575557599233","installDate":"2022-03-01","logtime":"","onlineState":"0","onlineStateName":"离线","type":"1","value":"无数据","watchType":"井盖状态"}] - * message : 请求成功 - * success : true - */ - var code = 0 - var message: String? = null - var isSuccess = false - var data: MutableList? = null - - class DataBean { - /** - * data : 无数据 - * devcode : 412021160186 - * deviceId : 1503929575557599233 - * installDate : 2022-03-01 - * logtime : - * onlineState : 0 - * onlineStateName : 离线 - * type : 1 - * value : 无数据 - * watchType : 井盖状态 - */ - var data: String? = null - var devcode: String? = null - var deviceId: String? = null - var installDate: String? = null - var logtime: String? = null - var onlineState: String? = null - var onlineStateName: String? = null - var type: String? = null - var value: String? = null - var watchType: String? = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt deleted file mode 100644 index 09af7b1..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderDetailModel.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderDetailModel { - var code = 0 - var data: List? = null - var message: String? = null - var isSuccess = false - - class DataBean { - var firstState: String? = null - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var firstStatePhotos: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var flow: MutableList? = null - var editable = 0 - var alarmTime: String? = null - var handleMessage: String? = null - var alarmMessage: String? = null - var staff: String? = null - var handlePhotos: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - - class FlowBean { - var from: String? = null - var to: String? = null - var time: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt b/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt deleted file mode 100644 index ed2695d..0000000 --- a/app/src/main/java/com/casic/app/smartwell/model/WorkOrderListModel.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.casic.app.smartwell.model - -class WorkOrderListModel { - var code = 0 - var data: DataBean? = null - var message: String? = null - var success = false - - class DataBean { - var rows: MutableList? = null - var total = 0 - - class RowsBean { - var alarmContent = 0 - var deptName: String? = null - var jobStatus: String? = null - var handleJobPerson: String? = null - var alarmContentName: String? = null - var shouldGetTime: String? = null - var wellCode: String? = null - var deptid: String? = null - var alarmTypeName: String? = null - var jobCode: String? = null - var jobBelongTo: String? = null - var jobFlag: String? = null - var confirmJobPerson: String? = null - var confirmJobTime: String? = null - var jobStatusName: String? = null - var alarmValue: String? = null - var alarmId: String? = null - var alarmLevel: String? = null - var handleJobTime: String? = null - var tel: String? = null - var id: String? = null - var wellId: String? = null - var jobType: String? = null - var editable = 0 - var alarmTime: String? = null - var alarmMessage: String? = null - var staff: String? = null - var getJobTime: String? = null - var getJobPerson: String? = null - var shouldHandleTime: String? = null - var jobId: String? = null - var alarmType: String? = null - var alarmStatus: String? = null - var devcode: String? = null - var createTime: String? = null - var position: String? = null - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 956592f..ead5ede 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.model.AlarmContentTypeModel +import com.casic.app.smartwell.model.AlarmContentModel import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant -import com.casic.app.smartwell.vm.AlarmContentTypeViewModel +import com.casic.app.smartwell.vm.AlarmViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,13 +28,13 @@ class SearchOrderActivity : KotlinBaseActivity() { - private lateinit var contentTypeViewModel: AlarmContentTypeViewModel + private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater - private lateinit var contentTypeAdapter: TagAdapter + private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter private val context: Context = this@SearchOrderActivity - private var contentModels: MutableList = ArrayList() + private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" @@ -54,17 +54,17 @@ override fun initData() { inflater = LayoutInflater.from(this) //告警内容 - contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) + alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) //工单状态 workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType("1") - contentTypeViewModel.listModel.observe(this, { + alarmViewModel.obtainAlarmContentType("1") + alarmViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 - val bean = AlarmContentTypeModel.DataBean.ListBean() + val bean = AlarmContentModel.DataBean.ListBean() bean.value = "" bean.name = "全部" bean.alarmType = "" @@ -74,10 +74,10 @@ contentModels.add(contentTypeBean) } contentTypeAdapter = - object : TagAdapter(contentModels) { + object : TagAdapter(contentModels) { override fun getView( parent: FlowLayout?, - position: Int, bean: AlarmContentTypeModel.DataBean.ListBean? + position: Int, bean: AlarmContentModel.DataBean.ListBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 787117b..779f59b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -59,6 +59,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() + obtainWellList() } override fun initEvent() { @@ -80,7 +81,6 @@ } }) - obtainWellList() wellListViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -141,13 +141,7 @@ } private fun obtainWellList() { - wellListViewModel.obtainWellList( - keywords = keywords, - wellType = wellType, - deptid = "", - isAlarm = "", - page = pageIndex - ) + wellListViewModel.obtainWellList(keywords, wellType, "", "", pageIndex) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt deleted file mode 100644 index c1dc2d8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication -import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.AlarmContentTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel - -class AlarmContentTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainAlarmContentType(alarmType: String) = launch({ - val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt new file mode 100644 index 0000000..df653f6 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -0,0 +1,33 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.app.smartwell.base.BaseApplication +import com.casic.app.smartwell.extensions.separateResponseCode +import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.AlarmContentModel +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +class AlarmViewModel : BaseViewModel() { + + private val gson = Gson() + val listModel = MutableLiveData() + + fun obtainAlarmContentType(alarmType: String) = launch({ + val response = RetrofitServiceManager.obtainAlarmContentType(alarmType) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + listModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.obtainInstance()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 11b58ab..d025446 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -34,9 +34,9 @@ val jsonObject = JSONObject(response) val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") + map["bfWell"] = convertString(data.getString("bfWell")) + map["cfWell"] = convertString(data.getString("cfWell")) + map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -45,6 +45,14 @@ it.printStackTrace() }) + private fun convertString(value: String): String { + return if (value == "") { + "0" + } else { + value + } + } + fun obtainWellType() = launch({ val response = RetrofitServiceManager.obtainWellType() val responseCode = response.separateResponseCode() diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index b0ac455..573eaeb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -4,7 +4,7 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderListModel +import com.casic.app.smartwell.model.OrderListModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -15,14 +15,14 @@ class WorkOrderListViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun obtainWorkOrderListByState(jobStatus: String, page: Int) = launch({ val response = RetrofitServiceManager.obtainWorkOrderList(jobStatus, page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -35,8 +35,8 @@ val response = RetrofitServiceManager.obtainNotAcceptOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) @@ -49,8 +49,8 @@ val response = RetrofitServiceManager.obtainNotHandleOderList(page) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index e98b693..cd79bab 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -4,8 +4,8 @@ import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderDetailModel import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.model.WorkOrderDetailModel import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +20,7 @@ private val gson = Gson() val resultModel = MutableLiveData>() val orderStatusModel = MutableLiveData() - val detailModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -62,8 +62,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index bfdd91f..1f375df 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -13,7 +13,7 @@ import com.amap.api.maps.model.LatLngBounds import com.amap.api.maps.model.MarkerOptions import com.casic.app.smartwell.R -import com.casic.app.smartwell.extensions.toBitmap +import com.pengxh.kt.lite.extensions.toBitmap import java.util.* class GaoDeClusterMarkerView( diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt index 5bea86a..22b9e42 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/TimeLineBottomSheet.kt @@ -12,25 +12,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.app.smartwell.R -import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.model.OrderDetailModel import com.pengxh.kt.lite.extensions.resetParams class TimeLineBottomSheet private constructor(builder: Builder) : Dialog( builder.context!!, R.style.BottomSheetStyle ) { private val ctx: Context = builder.context!! - private val items: MutableList = builder.items!! + private val items: MutableList = builder.items!! class Builder { var context: Context? = null - var items: MutableList? = null + var items: MutableList? = null fun setContext(context: Context?): Builder { this.context = context return this } - fun setFlowItems(flowItems: MutableList?): Builder { + fun setFlowItems(flowItems: MutableList?): Builder { this.items = flowItems return this } @@ -63,12 +63,11 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(ctx) override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int + parent: ViewGroup, viewType: Int ): OrderFlowAdapter.ItemViewHolder { - val view: View = + return ItemViewHolder( layoutInflater.inflate(R.layout.item_order_flow_rv, parent, false) - return ItemViewHolder(view) + ) } override fun getItemCount(): Int = items.size diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml new file mode 100644 index 0000000..30f4f28 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml new file mode 100644 index 0000000..4e06301 --- /dev/null +++ b/app/src/main/res/drawable/select_switch_circle.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml new file mode 100644 index 0000000..e82f94c --- /dev/null +++ b/app/src/main/res/drawable/switch_background_off.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml new file mode 100644 index 0000000..91213fc --- /dev/null +++ b/app/src/main/res/drawable/switch_background_on.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml new file mode 100644 index 0000000..c049f3d --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_off.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml new file mode 100644 index 0000000..0b4f0d5 --- /dev/null +++ b/app/src/main/res/drawable/switch_circle_on.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index e672c7e..34ee6cc 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -1,5 +1,6 @@ - + android:layout_marginEnd="@dimen/dp_10" + android:thumb="@drawable/select_switch_circle" + android:track="@drawable/select_switch_background" + tools:ignore="UseSwitchCompatOrMaterialXml" /> diff --git a/app/src/main/res/layout/item_sensor_list_rv.xml b/app/src/main/res/layout/item_sensor_list_rv.xml index 1fb8eed..a6419e0 100644 --- a/app/src/main/res/layout/item_sensor_list_rv.xml +++ b/app/src/main/res/layout/item_sensor_list_rv.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="离线" - android:textColor="@color/subTextColor" /> + android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b8abc50..1301c40 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,6 +4,7 @@ #333333 #626262 #F7F7FA + #D3D3D3 #CCCCCC #37D4AE #FF0000