From c2877e03172d68af0a0eacd56ac0f5d4c67c6f26 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 02 十一月 2020 15:57:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 8e8053f..0fc1f28 100644
--- a/app/src/main/java/com/okgoincar/netUtls/Api.java
+++ b/app/src/main/java/com/okgoincar/netUtls/Api.java
@@ -11,10 +11,15 @@
// 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 = "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 = 9999;
public static final int SUCCESS = 200;
/**
@@ -35,8 +40,7 @@
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/taxi/completeOrder"; // /api/taxi/completeOrder 手动确认订单完成
-
+ public static String completeOrder = "api/order/completeOrder"; // /api/order/completeOrder 手动确认订单完成
/***
* 首页
--
Gitblit v1.7.1