From d19fdba76572d8261c9b9013a1fc2798c436a1ba Mon Sep 17 00:00:00 2001 From: liugl <liugl@sinata.cn> Date: 星期一, 14 十二月 2020 19:18:16 +0800 Subject: [PATCH] 1:新增版本号 --- app/src/main/java/com/okgoincar/netUtls/Api.java | 19 +++++++++++++++---- 1 files changed, 15 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 fa7990a..1c95633 100644 --- a/app/src/main/java/com/okgoincar/netUtls/Api.java +++ b/app/src/main/java/com/okgoincar/netUtls/Api.java @@ -11,9 +11,14 @@ // public static final String SOCKET_SERVER = "192.168.0.80"; // 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 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; @@ -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 接单后获取语音播报内容 + /*** * 消息 @@ -97,6 +107,7 @@ public static String queryPenalties = "api/driver/queryPenalties"; //api/driver/queryPenalties 获取扣款明细 public static String queryNewData_ = "api/version/queryNewData_"; ///api/version/queryNewData_ 获取最新版本数据 - + public static String fillInPickUpCode = "api/order/fillInPickUpCode"; ///api/order/fillInPickUpCode 设置小件物流取件码 + public static String makeUpTheDifference = "api/order/makeUpTheDifference"; ///api/order/makeUpTheDifference 设置小件物流差价 } -- Gitblit v1.7.1