diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 5b43305..b48bdb0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -44,14 +44,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = rowsBean.wellCode - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } - holder.wellLocationView.text = rowsBean.position + holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 5b43305..b48bdb0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -44,14 +44,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = rowsBean.wellCode - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } - holder.wellLocationView.text = rowsBean.position + holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt index f53e831..910af17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt @@ -47,7 +47,7 @@ if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 5b43305..b48bdb0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -44,14 +44,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = rowsBean.wellCode - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } - holder.wellLocationView.text = rowsBean.position + holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt index f53e831..910af17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt @@ -47,7 +47,7 @@ if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index 18f54d5..c72ab2f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -2,6 +2,7 @@ import com.casic.qd.smartwell.model.PublicKeyModel import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* @@ -274,17 +275,10 @@ /** * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 5b43305..b48bdb0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -44,14 +44,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = rowsBean.wellCode - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } - holder.wellLocationView.text = rowsBean.position + holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt index f53e831..910af17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt @@ -47,7 +47,7 @@ if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index 18f54d5..c72ab2f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -2,6 +2,7 @@ import com.casic.qd.smartwell.model.PublicKeyModel import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* @@ -274,17 +275,10 @@ /** * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 786bc4e..703356a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -256,26 +256,8 @@ /** * 查询工单 */ - suspend fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ): String { - return api.obtainSearchResult( - AuthenticationHelper.token!!, - keywords, - alarmContent, - alarmLevel, - jobStatus, - beginTime, - endTime, - Constant.PAGE_LIMIT, - page - ) + suspend fun obtainSearchResult(requestBody: RequestBody): String { + return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 5b43305..b48bdb0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -44,14 +44,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = rowsBean.wellCode - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } - holder.wellLocationView.text = rowsBean.position + holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt index f53e831..910af17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt @@ -47,7 +47,7 @@ if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index 18f54d5..c72ab2f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -2,6 +2,7 @@ import com.casic.qd.smartwell.model.PublicKeyModel import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* @@ -274,17 +275,10 @@ /** * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 786bc4e..703356a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -256,26 +256,8 @@ /** * 查询工单 */ - suspend fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ): String { - return api.obtainSearchResult( - AuthenticationHelper.token!!, - keywords, - alarmContent, - alarmLevel, - jobStatus, - beginTime, - endTime, - Constant.PAGE_LIMIT, - page - ) + suspend fun obtainSearchResult(requestBody: RequestBody): String { + return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 085ff5a..de33d75 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -7,6 +7,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.base.BaseActivity +import com.casic.qd.smartwell.extensions.navigatePageTo import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.extensions.showEmptyPage import com.casic.qd.smartwell.model.SearchResultModel @@ -21,6 +22,9 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.RequestBody +import org.json.JSONObject class OrderSearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -47,7 +51,7 @@ operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - obtainSearchResult(args) + obtainSearchResult() } override fun initEvent() { @@ -55,12 +59,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args) + obtainSearchResult() } workOrderViewModel.searchResultModel.observe(this, { @@ -121,8 +125,11 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build() + .show() } else { "抱歉，无法查到该工单的流转记录".show() } @@ -130,16 +137,19 @@ }) } - private fun obtainSearchResult(args: ArrayList) { - workOrderViewModel.obtainSearchResult( - keywords = args[0], - alarmContent = args[1], - alarmLevel = args[2], - jobStatus = args[3], - beginTime = args[4], - endTime = args[5], - page = pageIndex - ) + private fun obtainSearchResult() { + val paramObject = JSONObject() + paramObject.put("keywords", args[0]) + paramObject.put("alarmContent", args[1]) + paramObject.put("alarmLevel", args[2]) + paramObject.put("jobStatus", args[3]) + paramObject.put("beginTime", args[4]) + paramObject.put("endTime", args[5]) + paramObject.put("limit", Constant.PAGE_LIMIT) + paramObject.put("offset", pageIndex) + val requestBody = + RequestBody.create("application/json".toMediaTypeOrNull(), paramObject.toString()) + workOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { @@ -147,7 +157,7 @@ 2022040102 -> { isRefresh = true pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } 2022040101 -> { if (isRefresh || isLoadMore) { @@ -156,7 +166,7 @@ if (dataBeans.size == 0) { emptyView!!.showEmptyPage { pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } } else { emptyView!!.hide() @@ -172,9 +182,9 @@ return } if (dataBeans[position].jobStatus == "0") { -// navigatePageTo(jobId) + navigatePageTo(jobId) } else { -// navigatePageTo(jobId) + navigatePageTo(jobId) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 5b43305..b48bdb0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -44,14 +44,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = rowsBean.wellCode - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } - holder.wellLocationView.text = rowsBean.position + holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt index f53e831..910af17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt @@ -47,7 +47,7 @@ if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index 18f54d5..c72ab2f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -2,6 +2,7 @@ import com.casic.qd.smartwell.model.PublicKeyModel import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* @@ -274,17 +275,10 @@ /** * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 786bc4e..703356a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -256,26 +256,8 @@ /** * 查询工单 */ - suspend fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ): String { - return api.obtainSearchResult( - AuthenticationHelper.token!!, - keywords, - alarmContent, - alarmLevel, - jobStatus, - beginTime, - endTime, - Constant.PAGE_LIMIT, - page - ) + suspend fun obtainSearchResult(requestBody: RequestBody): String { + return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 085ff5a..de33d75 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -7,6 +7,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.base.BaseActivity +import com.casic.qd.smartwell.extensions.navigatePageTo import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.extensions.showEmptyPage import com.casic.qd.smartwell.model.SearchResultModel @@ -21,6 +22,9 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.RequestBody +import org.json.JSONObject class OrderSearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -47,7 +51,7 @@ operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - obtainSearchResult(args) + obtainSearchResult() } override fun initEvent() { @@ -55,12 +59,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args) + obtainSearchResult() } workOrderViewModel.searchResultModel.observe(this, { @@ -121,8 +125,11 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build() + .show() } else { "抱歉，无法查到该工单的流转记录".show() } @@ -130,16 +137,19 @@ }) } - private fun obtainSearchResult(args: ArrayList) { - workOrderViewModel.obtainSearchResult( - keywords = args[0], - alarmContent = args[1], - alarmLevel = args[2], - jobStatus = args[3], - beginTime = args[4], - endTime = args[5], - page = pageIndex - ) + private fun obtainSearchResult() { + val paramObject = JSONObject() + paramObject.put("keywords", args[0]) + paramObject.put("alarmContent", args[1]) + paramObject.put("alarmLevel", args[2]) + paramObject.put("jobStatus", args[3]) + paramObject.put("beginTime", args[4]) + paramObject.put("endTime", args[5]) + paramObject.put("limit", Constant.PAGE_LIMIT) + paramObject.put("offset", pageIndex) + val requestBody = + RequestBody.create("application/json".toMediaTypeOrNull(), paramObject.toString()) + workOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { @@ -147,7 +157,7 @@ 2022040102 -> { isRefresh = true pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } 2022040101 -> { if (isRefresh || isLoadMore) { @@ -156,7 +166,7 @@ if (dataBeans.size == 0) { emptyView!!.showEmptyPage { pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } } else { emptyView!!.hide() @@ -172,9 +182,9 @@ return } if (dataBeans[position].jobStatus == "0") { -// navigatePageTo(jobId) + navigatePageTo(jobId) } else { -// navigatePageTo(jobId) + navigatePageTo(jobId) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt index c3f7b0b..d3edde6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt @@ -14,6 +14,7 @@ import com.casic.qd.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import okhttp3.RequestBody class WorkOrderViewModel : BaseViewModel() { @@ -39,19 +40,9 @@ it.printStackTrace() }) - fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ) = launch({ + fun obtainSearchResult(requestBody: RequestBody) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult( - keywords, alarmContent, alarmLevel, jobStatus, beginTime, endTime, page - ) + val response = RetrofitServiceManager.obtainSearchResult(requestBody) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 5b43305..b48bdb0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -44,14 +44,14 @@ val rowsBean = dataRows[position] holder.alarmContentView.text = rowsBean.alarmContentName holder.createTimeView.text = rowsBean.createTime - holder.wellCodeView.text = rowsBean.wellCode - val alarmValue = rowsBean.alarmValue.toString() - if (alarmValue.isBlank()) { - holder.alarmValueView.text = "报警值未知" + holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") + val alarmValue = if (rowsBean.alarmValue.toString().isBlank()) { + "未知" } else { - holder.alarmValueView.text = alarmValue + rowsBean.alarmValue } - holder.wellLocationView.text = rowsBean.position + holder.alarmValueView.text = String.format("告警值：$alarmValue") + holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { diff --git a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt index f53e831..910af17 100644 --- a/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt +++ b/app/src/main/java/com/casic/qd/smartwell/extensions/Long.kt @@ -47,7 +47,7 @@ if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index 18f54d5..c72ab2f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -2,6 +2,7 @@ import com.casic.qd.smartwell.model.PublicKeyModel import okhttp3.MultipartBody +import okhttp3.RequestBody import retrofit2.http.* @@ -274,17 +275,10 @@ /** * 查询工单 * */ - @GET("/job/searchList") + @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Query("keywords") keywords: String?, - @Query("alarmContent") alarmContent: String?, - @Query("alarmLevel") alarmLevel: String?, - @Query("jobStatus") jobStatus: String?, - @Query("beginTime") beginTime: String?, - @Query("endTime") endTime: String?, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Body requestBody: RequestBody ): String /** diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 786bc4e..703356a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -256,26 +256,8 @@ /** * 查询工单 */ - suspend fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ): String { - return api.obtainSearchResult( - AuthenticationHelper.token!!, - keywords, - alarmContent, - alarmLevel, - jobStatus, - beginTime, - endTime, - Constant.PAGE_LIMIT, - page - ) + suspend fun obtainSearchResult(requestBody: RequestBody): String { + return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) } /** diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index 085ff5a..de33d75 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -7,6 +7,7 @@ import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.base.BaseActivity +import com.casic.qd.smartwell.extensions.navigatePageTo import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.extensions.showEmptyPage import com.casic.qd.smartwell.model.SearchResultModel @@ -21,6 +22,9 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.RequestBody +import org.json.JSONObject class OrderSearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -47,7 +51,7 @@ operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - obtainSearchResult(args) + obtainSearchResult() } override fun initEvent() { @@ -55,12 +59,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args) + obtainSearchResult() } workOrderViewModel.searchResultModel.observe(this, { @@ -121,8 +125,11 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build() + .show() } else { "抱歉，无法查到该工单的流转记录".show() } @@ -130,16 +137,19 @@ }) } - private fun obtainSearchResult(args: ArrayList) { - workOrderViewModel.obtainSearchResult( - keywords = args[0], - alarmContent = args[1], - alarmLevel = args[2], - jobStatus = args[3], - beginTime = args[4], - endTime = args[5], - page = pageIndex - ) + private fun obtainSearchResult() { + val paramObject = JSONObject() + paramObject.put("keywords", args[0]) + paramObject.put("alarmContent", args[1]) + paramObject.put("alarmLevel", args[2]) + paramObject.put("jobStatus", args[3]) + paramObject.put("beginTime", args[4]) + paramObject.put("endTime", args[5]) + paramObject.put("limit", Constant.PAGE_LIMIT) + paramObject.put("offset", pageIndex) + val requestBody = + RequestBody.create("application/json".toMediaTypeOrNull(), paramObject.toString()) + workOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { @@ -147,7 +157,7 @@ 2022040102 -> { isRefresh = true pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } 2022040101 -> { if (isRefresh || isLoadMore) { @@ -156,7 +166,7 @@ if (dataBeans.size == 0) { emptyView!!.showEmptyPage { pageIndex = 1 - obtainSearchResult(args) + obtainSearchResult() } } else { emptyView!!.hide() @@ -172,9 +182,9 @@ return } if (dataBeans[position].jobStatus == "0") { -// navigatePageTo(jobId) + navigatePageTo(jobId) } else { -// navigatePageTo(jobId) + navigatePageTo(jobId) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt index c3f7b0b..d3edde6 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/WorkOrderViewModel.kt @@ -14,6 +14,7 @@ import com.casic.qd.smartwell.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import okhttp3.RequestBody class WorkOrderViewModel : BaseViewModel() { @@ -39,19 +40,9 @@ it.printStackTrace() }) - fun obtainSearchResult( - keywords: String?, - alarmContent: String?, - alarmLevel: String?, - jobStatus: String?, - beginTime: String?, - endTime: String?, - page: Int - ) = launch({ + fun obtainSearchResult(requestBody: RequestBody) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult( - keywords, alarmContent, alarmLevel, jobStatus, beginTime, endTime, page - ) + val response = RetrofitServiceManager.obtainSearchResult(requestBody) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml index ad799db..01c649e 100644 --- a/app/src/main/res/layout/item_search_result_recycleview.xml +++ b/app/src/main/res/layout/item_search_result_recycleview.xml @@ -26,10 +26,9 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_5" android:layout_weight="1" - android:fontFamily="sans-serif-black" android:text="@string/app_name" android:textColor="@color/redTextColor" - android:textSize="@dimen/titleFontSize" /> + android:textSize="@dimen/textFontSize" /> + android:textColor="@color/subTextColor" /> + android:textColor="@color/redTextColor" /> + android:textColor="@color/subTextColor" /> + android:textColor="@color/mainThemeColor" + app:qmui_borderColor="@color/mainThemeColor" + app:qmui_borderWidth="1px" />