From 59a89da95e7627c87dd01f00226d49104d1a93f3 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 10 十一月 2020 16:03:03 +0800
Subject: [PATCH] 11.10 添加线上线下标记 ， 修改结束流程
---
app/src/main/java/com/okgoincar/netUtls/Api.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/netUtls/Api.java b/app/src/main/java/com/okgoincar/netUtls/Api.java
index 496ff49..0fc1f28 100644
--- a/app/src/main/java/com/okgoincar/netUtls/Api.java
+++ b/app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -9,13 +9,18 @@
//内网
// public static final String BASE_URL = "http://192.168.0.80:80/driver/";
// public static final String SOCKET_SERVER = "192.168.0.80";
-// public static final int SOCKET_PORT = 8888;
+// 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 int SUCCESS = 200;
+
+ //外网
+// 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 int SUCCESS = 200;
/**
* 手机登录
@@ -33,7 +38,9 @@
public static String queryHomeNum = "api/driver/queryHomeNum"; //api/driver/queryHomeNum 获取首页统计数据
public static String work2 = "api/driver/work2"; //api/driver/work2 司机上下班操作
public static String loginByIdentification = "base/driver/loginByIdentification"; //api/driver/work2 司机身份证登录
-
+ public static String loginOut = "api/driver/loginOut"; ///api/driver/loginOut 司机退出登录
+ public static String loginByTaxiAptitudeCard = "base/driver/loginByTaxiAptitudeCard";
+ public static String completeOrder = "api/order/completeOrder"; // /api/order/completeOrder 手动确认订单完成
/***
* 首页
@@ -62,6 +69,9 @@
public static String confirmFees = "api/order/confirmFees"; //api/order/confirmFees 司机确认费用
public static String orderStateSocket = "api/netty/orderStateSocket"; ///api/netty/orderStateSocket 主动调用获取订单状态
public static String confirmFees_ = "api/order/confirmFees_"; ///api/order/confirmFees_ 司机确认费用（车载端）
+ public static String confirmFees$ = "api/order/confirmFees$"; ///api/order/confirmFees$ 司机确认费用（车载端）不管之前数据状态直接修改到待支付（流程断网情况的处理流程）
+ public static String queryVoiceBroadcast = "api/order/queryVoiceBroadcast"; ///api/order/queryVoiceBroadcast 接单后获取语音播报内容
+
/***
* 消息
--
Gitblit v1.7.1