From 386c12bc80d17252ea05b7bf1cb2e85db2e46767 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 07 八月 2020 13:13:41 +0800
Subject: [PATCH] 8.7

---
 app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
index b5b3b90..68d7048 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt
@@ -1,6 +1,7 @@
 package com.okgoincar.slab
 
 import android.os.CountDownTimer
+import android.os.Handler
 import android.os.Looper
 import cn.sinata.xldutils.utils.*
 import com.okgoincar.netUtls.callNet
@@ -96,17 +97,14 @@
         callNet(this, Api.queryOrderInfo, map) {
             orderBean = gson.fromJson(it, OrderBean::class.java)
             showUi(orderBean)
-            time = timeOver (5000){
-                tv_title_slab.text = "已完成($it)"
-                if (it == 0){
-                    onBackPressed()
-                }
-            }
+            addSocketLisener()
+
         }
     }
 
     private fun showUi(orderBean: OrderBean?) {
         orderBean?.let {
+            tv_title_slab.text = "待支付"
             tv_name.text = it.data.nickName
             tv_car_num.text = it.data.historyNum.toString() + "次乘车"
             tv_phone.clickDelay {
@@ -147,11 +145,21 @@
         MyApplication.addOrderView(object : MyApplication.OrderStatueView {
             override fun orderInfo(data: OrderSimpleData?) {
                 data?.let {
-                    if (it.status == 8) {
-                        android.os.Handler(Looper.getMainLooper()).post {
-                            orderBean.data.orderState = 8
-                            showUi(orderBean)
+                    if (it.status == 8||it.status == 7) {
+                        tv_pay_result_money.textColor(this@SlabOrderOverActivity,R.color.slab_green_over)
+                        Handler(Looper.getMainLooper()).post {
+                            time = timeOver (5000){
+                                tv_title_slab.text = "已完成($it)"
+                                if (it == 0){
+                                    onBackPressed()
+                                }
+                            }
                         }
+
+//                        android.os.Handler(Looper.getMainLooper()).post {
+//                            orderBean.data.orderState = 8
+//                            showUi(orderBean)
+//                        }
                     }
                 }
             }

--
Gitblit v1.7.1