From 7804ce8edeba51418b5fde2d306e5f476dfb5993 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期三, 18 三月 2026 10:03:22 +0800
Subject: [PATCH] 合并最新代码
---
app/src/main/java/com/driver/igotrip/netUtls/Api.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/netUtls/Api.java b/app/src/main/java/com/driver/igotrip/netUtls/Api.java
index 4b2fb06..764a6dc 100644
--- a/app/src/main/java/com/driver/igotrip/netUtls/Api.java
+++ b/app/src/main/java/com/driver/igotrip/netUtls/Api.java
@@ -53,6 +53,8 @@
public static String needToSettle = "api/settlementRecord/needToSettle"; //判断司机是否需要结算费用
public static String textToSpeech = "api/driver/textToSpeech";
public static String saveOrderPosition = "api/order/saveOrderPosition";
+ public static String positionSocket = "api/netty/positionSocket"; // 司机端主动调用该接口上传位置信息
+ public static String getDriverOrderMessage = "api/order/getDriverOrderMessage"; // 司机定时任务获取订单相关socket消息【1.0】
/***
* 订单中
@@ -101,6 +103,7 @@
public static String updatePhone1 = "api/driver/updatePhone1"; //api/driver/updatePhone1 修改手机号码
public static String updatePassword = "api/driver/updatePassword"; //api/driver/updatePassword 修改密码
public static String withdrawal = "api/withdrawal/withdrawal"; //api/withdrawal/withdrawal 账户余额提现
+ public static String withdrawal1 = "api/withdrawal/withdrawal1"; //账户余额提现【1.0】
public static String queryActivityIncome = "api/driver/queryActivityIncome"; //api/driver/queryActivityIncome 获取收益明细 (我的奖励)
public static String queryWithdrawal = "api/withdrawal/queryWithdrawal"; //api/withdrawal/queryWithdrawal 获取历史提现数据
public static String queryBalanceUsageRecord = "api/driver/queryBalanceUsageRecord"; // 获取使用记录
@@ -126,6 +129,10 @@
public static String queryBankCard = "api/bankCard/queryBankCard"; ///api/bankCard/queryBankCard 获取银行卡号列表
public static String delBankCard = "api/bankCard/delBankCard"; ///api/bankCard/delBankCard删除银行卡信心
public static String saveBankCard = "api/bankCard/saveBankCard"; //api/bankCard/saveBankCard 保存银行卡信息
+
+
+ public static String getWave = "api/driver/getWave"; //获取WAVE账户【1.0】
+ public static String saveWave = "api/driver/saveWave"; //保存WAVE账户【1.0】
public static String updateBankCard = "api/bankCard/updateBankCard"; ///api/bankCard/updateBankCard 保存银行卡信息
public static String verificationPassword = "api/driver/verificationPassword"; ///api/driver/verificationPassword 验证登录密码是否有效
@@ -155,7 +162,6 @@
public static String rechargeBalance = "api/driver/rechargeBalance"; //余额充值【1.0】
- public static String getDriverOrderMessage = "api/order/getDriverOrderMessage"; //司机定时任务获取订单相关socket消息【1.0】
public static String completeOrder ="api/order/completeOrder";//手动确认订单完成
public static String companyList ="base/driver/companyList";//获取运营公司列表
--
Gitblit v1.7.1