From 86dab54700e5813367e58263fd04c3e9424cf95d Mon Sep 17 00:00:00 2001
From: 唐浩 <15928265276@163.com>
Date: 星期一, 28 九月 2020 10:48:45 +0800
Subject: [PATCH] commit 9.28
---
app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..c7c7130 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
@@ -9,7 +9,7 @@
import com.okgoincar.netUtls.Api
import java.util.HashMap
-class SlabMainFragment:BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) {
+class SlabMainFragment : BaseRecyclerFragment<OrderListBean.DataBean>(SlabMainAdapter()) {
var state = 1
@@ -28,10 +28,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.currentOrderId = data.data[0].type.toString()
+ }
}
return data.data
}
--
Gitblit v1.7.1