From 4264d859bb9f6cbc4c069a9350c917f1b23009dd Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 07 六月 2024 15:01:20 +0800
Subject: [PATCH] 修改bug
---
/dev/null | 0
app/.gitignore | 1 +
app/src/main/java/com/future/dispatch/ui/order/FilterStatueActivity.kt | 6 +++---
app/src/main/java/com/future/dispatch/netUtls/Api.java | 4 ++--
app/src/main/java/com/future/dispatch/ui/order/TaxiDetailActivity.kt | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/.gitignore b/app/.gitignore
index 796b96d..956c004 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
/build
+/release
\ No newline at end of file
diff --git a/app/release/kuaiyun_dispatch-1.0-2024-03-27.apk b/app/release/kuaiyun_dispatch-1.0-2024-03-27.apk
deleted file mode 100644
index eedc31c..0000000
--- a/app/release/kuaiyun_dispatch-1.0-2024-03-27.apk
+++ /dev/null
Binary files differ
diff --git a/app/release/kuaiyun_dispatch-1.0-2024-05-21.apk b/app/release/kuaiyun_dispatch-1.0-2024-05-21.apk
deleted file mode 100644
index 89f634e..0000000
--- a/app/release/kuaiyun_dispatch-1.0-2024-05-21.apk
+++ /dev/null
Binary files differ
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index 09c33be..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"kuaiyun_dispatch-1.0-2024-05-21.apk","fullName":"release","baseName":"release","dirName":""},"path":"kuaiyun_dispatch-1.0-2024-05-21.apk","properties":{}}]
\ No newline at end of file
diff --git "a/app/release/\350\260\203\345\272\246\347\253\2577.28-3.apk" "b/app/release/\350\260\203\345\272\246\347\253\2577.28-3.apk"
deleted file mode 100644
index 4636678..0000000
--- "a/app/release/\350\260\203\345\272\246\347\253\2577.28-3.apk"
+++ /dev/null
Binary files differ
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
deleted file mode 100644
index e42b347..0000000
--- a/app/src/main/ic_launcher-playstore.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/java/com/future/dispatch/netUtls/Api.java b/app/src/main/java/com/future/dispatch/netUtls/Api.java
index 7de7399..0e6e546 100644
--- a/app/src/main/java/com/future/dispatch/netUtls/Api.java
+++ b/app/src/main/java/com/future/dispatch/netUtls/Api.java
@@ -7,8 +7,8 @@
public class Api {
//内网
- public static final String BASE_URL = "http://192.168.110.111:81";
- public static final String SOCKET_SERVER = "192.168.0.80";
+ public static final String BASE_URL = "http://120.27.134.189:81";
+ public static final String SOCKET_SERVER = "120.27.134.189";
public static final int SOCKET_PORT = 9999;
//39.108.148.228 测试服务器
diff --git a/app/src/main/java/com/future/dispatch/ui/order/FilterStatueActivity.kt b/app/src/main/java/com/future/dispatch/ui/order/FilterStatueActivity.kt
index 34396ce..bd7a2cc 100644
--- a/app/src/main/java/com/future/dispatch/ui/order/FilterStatueActivity.kt
+++ b/app/src/main/java/com/future/dispatch/ui/order/FilterStatueActivity.kt
@@ -54,7 +54,7 @@
override fun initView() {
setTitleText("筛选")
- if (type == "1"){
+ if (type == "1"||type == "7"){
ll_city_to.gone()
}
typeAdapter.type = type
@@ -71,12 +71,12 @@
recycler_view_type.layoutManager = GridLayoutManager(this,4)
recycler_view_statue.layoutManager = GridLayoutManager(this,3)
recycler_view_line.layoutManager = GridLayoutManager(this,3)
- typeAdapter.data.addAll(if (type == "1") typeStringZc else typeString)
+ typeAdapter.data.addAll(if (type == "1"||type == "7") typeStringZc else typeString)
statueAdapter.data.addAll(statueString)
recycler_view_type.adapter = typeAdapter
recycler_view_statue.adapter = statueAdapter
recycler_view_line.adapter = lineAdapter
- if (type != "1"){
+ if (type == "2"){
callLine()
}
diff --git a/app/src/main/java/com/future/dispatch/ui/order/TaxiDetailActivity.kt b/app/src/main/java/com/future/dispatch/ui/order/TaxiDetailActivity.kt
index 8d5d750..88d969b 100644
--- a/app/src/main/java/com/future/dispatch/ui/order/TaxiDetailActivity.kt
+++ b/app/src/main/java/com/future/dispatch/ui/order/TaxiDetailActivity.kt
@@ -36,7 +36,7 @@
private fun callOrder() {
var map = getMapByAny()
map["orderId"] = orderId
- map["orderType"] = 1
+ map["orderType"] = orderType
callNet(Api.queryOrderInfo,map){
var bean = gson.fromJson<OrderDetailBean>(it,OrderDetailBean::class.java)
bean.data?.let { itBean ->
--
Gitblit v1.7.1