From 16d807930e47fcab5a7e773046daad78e04849e2 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期三, 18 十一月 2020 14:52:43 +0800
Subject: [PATCH] 11.11 修改bug2个
---
app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt | 1 +
app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt | 2 +-
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | 7 ++++++-
app/src/main/java/com/okgoincar/netUtls/Api.java | 12 ++++++------
app/build.gradle | 5 ++---
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index d0717a0..6eac92a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@
applicationId "com.okgoincar"
minSdkVersion 19
targetSdkVersion 29
- versionCode 22
- versionName "22"
+ versionCode 3
+ versionName "3"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
@@ -64,7 +64,6 @@
jniLibs.srcDirs = ['libs']
}
}
-
}
diff --git a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
index 0f78f5f..b2fab44 100644
--- a/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
+++ b/app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt
@@ -203,6 +203,7 @@
mapOrder["orderType"] = MyApplication.currentOrderType
callNet(contexts, Api.queryOrderInfo, mapOrder) {
var orderBean = Gson().fromJson(it, OrderBean::class.java)
+ EventBus.getDefault().post(BaseEvent(BaseEvent.UPDATA_MAIN_CAR))
if (orderBean.data.orderState == 7){
EventBus.getDefault().post(BaseEvent(BaseEvent.SURE_MONEY))
}
diff --git a/app/src/main/java/com/okgoincar/netUtls/Api.java b/app/src/main/java/com/okgoincar/netUtls/Api.java
index 0fc1f28..913a00f 100644
--- a/app/src/main/java/com/okgoincar/netUtls/Api.java
+++ b/app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -12,14 +12,14 @@
// public static final int SOCKET_PORT = 9999;
//39.108.148.228 测试服务器
- public static final String BASE_URL = "http://39.108.148.228:80/driver/";
- public static final String SOCKET_SERVER = "39.108.148.228";
- public static final int SOCKET_PORT = 8888;
+// public static final String BASE_URL = "http://39.108.148.228:80/driver/";
+// public static final String SOCKET_SERVER = "39.108.148.228";
+// public static final int SOCKET_PORT = 8888;
//外网
-// public static final String BASE_URL = "https://okyueche.com:443/driver/";
-// public static final String SOCKET_SERVER = "39.108.122.38";
-// public static final int SOCKET_PORT = 9999;
+ public static final String BASE_URL = "https://okyueche.com:443/driver/";
+ public static final String SOCKET_SERVER = "39.108.122.38";
+ public static final int SOCKET_PORT = 8888;
public static final int SUCCESS = 200;
/**
diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
index 3cc44bc..bb0d39a 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt
@@ -345,11 +345,16 @@
toast("收到显示屏信息")
}
}
+ BaseEvent.UPDATA_MAIN_CAR->{
+ try {
+ mainFragment.refresh()
+ }catch (e:Exception){
+ }
+ }
BaseEvent.ERROR_INFO -> {
try {
mainFragment.refresh()
}catch (e:Exception){
-
}
}
}
diff --git a/app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt b/app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt
index f119e50..6e3ffe5 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt
@@ -20,7 +20,7 @@
holder?.let {
setblack(getNowTimeBlack(),it.itemView)
it.itemView.tv_time.text = item!!.time
- it.itemView.tv_money.text = "订单金额：¥"+item!!.orderMoney
+ it.itemView.tv_money.text = "订单金额：¥"+item!!.orderMoney+"("+if (item.payManner == 1)"线上)" else "线下)"
}
}
--
Gitblit v1.7.1