From 75ba68eb8d65a32251704c604b3e27f3121808ce Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 07 一月 2021 09:22:58 +0800
Subject: [PATCH] Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit/r/android/OkGoinCar into cargo_small
---
app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt b/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
index a1fb0c9..72bfc40 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
@@ -4,22 +4,27 @@
import com.example.emanagercar.ui.base.BaseRecyclerFragment
import com.okgoincar.base.MyApplication
import com.okgoincar.netUtls.getMapByAny
-import com.okgoincar.ui.adapter.SlabMainAdapter
+import com.okgoincar.slab.adapter.SlabMainAdapter
import com.okgoincar.bean.OrderListBean
import com.okgoincar.netUtls.Api
+import com.okgoincar.netUtls.callNet
import java.util.HashMap
-class SlabMainFragment:BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) {
+class SlabMainFragment : BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) {
var state = 1
+ var type = 1
+
+ var firstCallRecord = false //是否首次在进行中的列表中加入历史记录 （进行中的订单太少客户觉得太空）
override fun pathUrl(): String? {
- return Api.queryOrderList
+ return Api.queryOrderList1
}
override fun mapObject(): HashMap<String?, Any?>? {
var map = getMapByAny()
map["state"] = state
+ map["type"] = type
return map
}
@@ -28,10 +33,12 @@
}
override fun getDatas(t: String?): List<OrderListBean.DataBean> {
- var data = gson.fromJson<OrderListBean>(t,OrderListBean::class.java)
- if (state == 1 && data.data.size >= 1){
- MyApplication.currentOrderId = data.data[0].id.toString()
- MyApplication.currentOrderId = data.data[0].type.toString()
+ var data = gson.fromJson<OrderListBean>(t, OrderListBean::class.java)
+ if (!data.data.isNullOrEmpty()) {
+ if ((data.data[0].state == 2 || data.data[0].state == 3 || data.data[0].state == 4 || data.data[0].state == 5 || data.data[0].state == 6) && data.data.size >= 1) {
+ MyApplication.currentOrderId = data.data[0].id.toString()
+ MyApplication.currentOrderType = data.data[0].type.toString()
+ }
}
return data.data
}
@@ -48,4 +55,29 @@
nothingMessage = ""
}
+ override fun refresh() {
+ super.refresh()
+ firstCallRecord = false
+ }
+
+ override fun noShowNothing() {
+ super.noShowNothing()
+ if (!firstCallRecord && state == 1 && type == 1) {
+ callRecord()
+ }
+ }
+
+ private fun callRecord() {
+ var map = getMapByAny()
+ map["state"] = 4
+ map["size"] = 10
+ map["pageNum"] = 1
+ callNet(Api.queryMyAllOrder, map) {
+ var data = gson.fromJson<OrderListBean>(it, OrderListBean::class.java)
+ adapter.data.addAll(data.data)
+ adapter.notifyDataSetChanged()
+ }
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.7.1