app/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/okgoincar/base/MoneyBroadCastReceiver.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/okgoincar/netUtls/Api.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/okgoincar/slab/SlabOrderListAdapter.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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'] } } } 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)) } 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; /** 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){ } } } 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 "线下)" } }