Browse Source

fix auth token

dev
MTing 2 days ago
parent
commit
3f41b5f474
  1. 4
      app/src/main/java/com/ouxuan/oxface/device/GateABController.java
  2. 22
      app/src/main/java/com/ouxuan/oxface/network/LeaveVerificationManager.java

4
app/src/main/java/com/ouxuan/oxface/device/GateABController.java

@ -863,6 +863,4 @@ public class GateABController {
public OxUDP getUdpController() { public OxUDP getUdpController() {
return udpController; return udpController;
} }
void onError(String errorMessage);
}
}
}

22
app/src/main/java/com/ouxuan/oxface/network/LeaveVerificationManager.java

@ -4,6 +4,7 @@ import android.content.Context;
import android.util.Log; import android.util.Log;
import com.ouxuan.oxface.data.DeviceSelectDataManager; import com.ouxuan.oxface.data.DeviceSelectDataManager;
import com.ouxuan.oxface.data.LoginDataManager;
import com.ouxuan.oxface.network.api.PadApiService; import com.ouxuan.oxface.network.api.PadApiService;
import com.ouxuan.oxface.network.callback.NetworkCallback; import com.ouxuan.oxface.network.callback.NetworkCallback;
import com.ouxuan.oxface.network.utils.NetworkUtils; import com.ouxuan.oxface.network.utils.NetworkUtils;
@ -70,9 +71,10 @@ public class LeaveVerificationManager {
try { try {
// 获取设备信息 // 获取设备信息
DeviceSelectDataManager dataManager = DeviceSelectDataManager.getInstance(context);
String token = dataManager.getSessionToken();
int hardwareId = dataManager.getSelectedHardwareId();
DeviceSelectDataManager deviceDataManager = DeviceSelectDataManager.getInstance(context);
LoginDataManager loginDataManager = LoginDataManager.getInstance(context); // 使用LoginDataManager获取token
String token = loginDataManager.getAuthToken(); // 从LoginDataManager获取token
int hardwareId = deviceDataManager.getSelectedHardwareId();
if (token.isEmpty()) { if (token.isEmpty()) {
LogManager.logError(TAG, "离场校验失败:token为空"); LogManager.logError(TAG, "离场校验失败:token为空");
@ -179,9 +181,10 @@ public class LeaveVerificationManager {
try { try {
// 获取设备信息 // 获取设备信息
DeviceSelectDataManager dataManager = DeviceSelectDataManager.getInstance(context);
String token = dataManager.getSessionToken();
int hardwareId = dataManager.getSelectedHardwareId();
DeviceSelectDataManager deviceDataManager = DeviceSelectDataManager.getInstance(context);
LoginDataManager loginDataManager = LoginDataManager.getInstance(context); // 使用LoginDataManager获取token
String token = loginDataManager.getAuthToken(); // 从LoginDataManager获取token
int hardwareId = deviceDataManager.getSelectedHardwareId();
if (token.isEmpty()) { if (token.isEmpty()) {
LogManager.logError(TAG, "离场校验失败:token为空"); LogManager.logError(TAG, "离场校验失败:token为空");
@ -288,9 +291,10 @@ public class LeaveVerificationManager {
try { try {
// 获取设备信息 // 获取设备信息
DeviceSelectDataManager dataManager = DeviceSelectDataManager.getInstance(context);
String token = dataManager.getSessionToken();
int hardwareId = dataManager.getSelectedHardwareId();
DeviceSelectDataManager deviceDataManager = DeviceSelectDataManager.getInstance(context);
LoginDataManager loginDataManager = LoginDataManager.getInstance(context); // 使用LoginDataManager获取token
String token = loginDataManager.getAuthToken(); // 从LoginDataManager获取token
int hardwareId = deviceDataManager.getSelectedHardwareId();
if (token.isEmpty()) { if (token.isEmpty()) {
LogManager.logError(TAG, "离场校验失败:token为空"); LogManager.logError(TAG, "离场校验失败:token为空");

Loading…
Cancel
Save