Merge remote-tracking branch 'origin/master'

liugl

2020-11-02 c2877e03172d68af0a0eacd56ac0f5d4c67c6f26

 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 手动确认订单完成

    /***
     * 首页