From 664834b83a4c50cac039bbfa49f5164ca9bf8e3c Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 07 八月 2020 17:05:17 +0800
Subject: [PATCH] 8.7
---
app/src/main/java/com/okgoincar/netUtls/Api.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/netUtls/Api.java b/app/src/main/java/com/okgoincar/netUtls/Api.java
index 8a8655b..fc20e97 100644
--- a/app/src/main/java/com/okgoincar/netUtls/Api.java
+++ b/app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -9,13 +9,13 @@
//内网
// 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;
//外网
- public static final String BASE_URL = "http://139.9.249.67:80/driver/";
- public static final String SOCKET_SERVER = "139.9.249.67";
+ 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 int SUCCESS = 200;
/**
* 手机登录
@@ -32,7 +32,7 @@
public static String loginByJobNumber = "base/driver/loginByJobNumber"; //base/driver/loginByJobNumber 工号登录
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 司机身份证登录
/***
@@ -44,6 +44,7 @@
public static String queryMyAllOrder = "api/order/queryMyAllOrder"; ///api/order/queryMyAllOrder 获取我的订单列表
public static String queryOrderList = "api/order/queryOrderList"; ////api/order/queryOrderList 获取首页订单列表
public static String grabOrder = "api/order/grabOrder"; /////api/order/grabOrder 司机抢单操作
+ public static String grabOrder_ = "api/order/grabOrder_"; /////api/order/grabOrder 司机抢单操作(车载)
public static String queryPushOrder = "api/order/queryPushOrder"; ////api/order/queryPushOrder 获取抢单界面的订单详情
public static String queryMyActivity = "api/driver/queryMyActivity"; //api/driver/queryMyActivity 获取当前有效的活动列表
public static String queryHistoryActivity = "api/driver/queryHistoryActivity"; //api/driver/queryHistoryActivity 获取历史活动列表
@@ -60,6 +61,8 @@
public static String queryToBePaidPage = "api/order/queryToBePaidPage"; //api/order/queryToBePaidPage 获取待支付页详情
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$ 司机确认费用（车载端）不管之前数据状态直接修改到待支付（流程断网情况的处理流程）
/***
* 消息
@@ -94,6 +97,7 @@
public static String queryTotalRevenue = "api/driver/queryTotalRevenue"; //api/driver/queryTotalRevenue 获取收入明细
public static String queryPenalties = "api/driver/queryPenalties"; //api/driver/queryPenalties 获取扣款明细
+ public static String queryNewData_ = "api/version/queryNewData_"; ///api/version/queryNewData_ 获取最新版本数据
}
--
Gitblit v1.7.1