优化异常处理
This commit is contained in:
parent
87b70e2197
commit
e650ec29c6
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -28,9 +28,11 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||
|
||||
import androidx.work.PeriodicWorkRequest;
|
||||
import androidx.work.WorkManager;
|
||||
|
||||
import com.example.studyapp.autoJS.AutoJsUtil;
|
||||
import com.example.studyapp.device.ChangeDeviceInfoUtil;
|
||||
|
||||
import com.example.studyapp.device.LoadDeviceCallback;
|
||||
import com.example.studyapp.proxy.ClashUtil;
|
||||
import com.example.studyapp.service.MyAccessibilityService;
|
||||
import com.example.studyapp.task.TaskUtil;
|
||||
|
@ -38,6 +40,8 @@ import com.example.studyapp.utils.LogFileUtil;
|
|||
import com.example.studyapp.utils.ShellUtils;
|
||||
import com.example.studyapp.worker.CheckAccessibilityWorker;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.ref.WeakReference;
|
||||
|
@ -122,7 +126,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
setContentView(R.layout.activity_main);
|
||||
instance = new WeakReference<>(this);
|
||||
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Initializing application",null);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Initializing application", null);
|
||||
initializeExecutorService();
|
||||
System.setProperty("java.library.path", this.getApplicationInfo().nativeLibraryDir);
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
|
||||
|
@ -143,16 +147,16 @@ public class MainActivity extends AppCompatActivity {
|
|||
}
|
||||
if (!isNetworkAvailable(this)) {
|
||||
Toast.makeText(this, "Network is not available", Toast.LENGTH_SHORT).show();
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "Network not available, closing app.",null);
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "Network not available, closing app.", null);
|
||||
finish();
|
||||
}
|
||||
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Setting up work manager",null);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Setting up work manager", null);
|
||||
PeriodicWorkRequest workRequest = new PeriodicWorkRequest.Builder(CheckAccessibilityWorker.class, 15, TimeUnit.MINUTES)
|
||||
.build();
|
||||
WorkManager.getInstance(this).enqueue(workRequest);
|
||||
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Setting up UI components",null);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Setting up UI components", null);
|
||||
Button runScriptButton = findViewById(R.id.run_script_button);
|
||||
if (runScriptButton != null) {
|
||||
runScriptButton.setOnClickListener(v -> {
|
||||
|
@ -168,7 +172,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
});
|
||||
// runScriptButton.setOnClickListener(v -> AutoJsUtil.runAutojsScript(this));
|
||||
} else {
|
||||
LogFileUtil.logAndWrite(Log.WARN, "MainActivity", "Run Script Button not found",null);
|
||||
LogFileUtil.logAndWrite(Log.WARN, "MainActivity", "Run Script Button not found", null);
|
||||
Toast.makeText(this, "Button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
|
@ -193,12 +197,12 @@ public class MainActivity extends AppCompatActivity {
|
|||
Toast.makeText(this, "Disconnect button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
Button modifyDeviceInfoButton = findViewById(R.id.modifyDeviceInfoButton);
|
||||
if (modifyDeviceInfoButton != null) {
|
||||
modifyDeviceInfoButton.setOnClickListener(v -> ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), this));
|
||||
} else {
|
||||
Toast.makeText(this, "modifyDeviceInfo button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
// Button modifyDeviceInfoButton = findViewById(R.id.modifyDeviceInfoButton);
|
||||
// if (modifyDeviceInfoButton != null) {
|
||||
// modifyDeviceInfoButton.setOnClickListener(v -> ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), this));
|
||||
// } else {
|
||||
// Toast.makeText(this, "modifyDeviceInfo button not found", Toast.LENGTH_SHORT).show();
|
||||
// }
|
||||
|
||||
Button resetDeviceInfoButton = findViewById(R.id.resetDeviceInfoButton);
|
||||
if (resetDeviceInfoButton != null) {
|
||||
|
@ -220,7 +224,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
executeButton.setOnClickListener(v -> {
|
||||
executeButton.setEnabled(false);
|
||||
Toast.makeText(this, "任务正在执行", Toast.LENGTH_SHORT).show();
|
||||
executeLogic(androidId,taskId);
|
||||
executeLogic(androidId, taskId);
|
||||
});
|
||||
}
|
||||
if (stopExecuteButton != null) {
|
||||
|
@ -238,48 +242,55 @@ public class MainActivity extends AppCompatActivity {
|
|||
}
|
||||
|
||||
private void executeLogic(String androidId, String taskId) {
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeLogic: Start execution",null);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeLogic: Start execution", null);
|
||||
|
||||
if (!isNetworkAvailable(this)) {
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "executeLogic: Network is not available!",null);
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "executeLogic: Network is not available!", null);
|
||||
Toast.makeText(this, "网络不可用,请检查网络连接", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeLogic: Submitting job to executor",null);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeLogic: Submitting job to executor", null);
|
||||
initializeExecutorService();
|
||||
|
||||
executorService.submit(() -> {
|
||||
try {
|
||||
ChangeDeviceInfoUtil.getAddDeviceInfo("US", 2);
|
||||
executeSingleLogic();
|
||||
ChangeDeviceInfoUtil.getAddDeviceInfo("US", 2, (bigoDevice, afDevice) -> {
|
||||
startProxyVpn(MainActivity.this);
|
||||
ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), MainActivity.this, bigoDevice, afDevice);
|
||||
AutoJsUtil.runAutojsScript(this);
|
||||
});
|
||||
AutoJsUtil.registerScriptResultReceiver(this);
|
||||
AutoJsUtil.flag = true;
|
||||
|
||||
while (isRunning) {
|
||||
if (!isRunning) break;
|
||||
|
||||
// 从队列中获取最新的 scriptResult
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script",null);
|
||||
try {
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script", null);
|
||||
String currentScriptResult = scriptResultQueue.take();
|
||||
ChangeDeviceInfoUtil.getAddDeviceInfo("US", 2);
|
||||
executeSingleLogic();
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, "MainActivity", "----发送result------;" + currentScriptResult, null);
|
||||
ChangeDeviceInfoUtil.getAddDeviceInfo("US", 2, (bigoDevice, afDevice) -> {
|
||||
try {
|
||||
startProxyVpn(MainActivity.this);
|
||||
ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), MainActivity.this, bigoDevice, afDevice);
|
||||
AutoJsUtil.runAutojsScript(this);
|
||||
if (currentScriptResult != null && !TextUtils.isEmpty(currentScriptResult)) {
|
||||
TaskUtil.execSaveTask(this, androidId, taskId, currentScriptResult);
|
||||
try {
|
||||
infoUpload(this, androidId, currentScriptResult);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "changeDeviceInfo erro", e);
|
||||
}
|
||||
Thread.sleep(5000);
|
||||
}
|
||||
});
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, "MainActivity", "----发送result------;" + currentScriptResult, null);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "executeLogic: Thread interrupted while waiting", e);
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "loop: Thread interrupted while waiting", e);
|
||||
} catch(Exception e) {
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "loop erro", e);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "executeLogic: Unexpected task error.", e);
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "start executeLogic: Unexpected task error.", e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -288,26 +299,25 @@ public class MainActivity extends AppCompatActivity {
|
|||
private volatile boolean isRunning = true; // 主线程运行状态
|
||||
public static final Object taskLock = new Object(); // 任务逻辑锁
|
||||
|
||||
public void executeSingleLogic() {
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Proxy not active, starting VPN",null);
|
||||
startProxyVpn(this);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Changing device info",null);
|
||||
ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), this);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script",null);
|
||||
AutoJsUtil.runAutojsScript(this);
|
||||
}
|
||||
|
||||
// public void executeSingleLogic() {
|
||||
//// LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Proxy not active, starting VPN",null);
|
||||
// startProxyVpn(this);
|
||||
// LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Changing device info",null);
|
||||
// ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), this);
|
||||
|
||||
/// / LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script",null);
|
||||
// AutoJsUtil.runAutojsScript(this);
|
||||
// }
|
||||
private void startProxyVpn(Context context) {
|
||||
if (!isNetworkAvailable(context)) {
|
||||
Toast.makeText(context, "Network is not available", Toast.LENGTH_SHORT).show();
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Network is not available.",null);
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Network is not available.", null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(context instanceof Activity)) {
|
||||
Toast.makeText(context, "Context must be an Activity", Toast.LENGTH_SHORT).show();
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Context is not an Activity.",null);
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Context is not an Activity.", null);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -315,7 +325,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
ClashUtil.startProxy(context); // 在主线程中调用
|
||||
ClashUtil.switchProxyGroup("GLOBAL", "us", "http://127.0.0.1:6170");
|
||||
} catch (Exception e) {
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Failed to start VPN",e);
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Failed to start VPN", e);
|
||||
Toast.makeText(context, "Failed to start VPN: " + (e.getMessage() != null ? e.getMessage() : "Unknown error"), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
@ -393,7 +403,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onDestroy: Cleaning up resources",null);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onDestroy: Cleaning up resources", null);
|
||||
super.onDestroy();
|
||||
instance.clear();
|
||||
if (AutoJsUtil.scriptResultReceiver != null) {
|
||||
|
|
|
@ -75,15 +75,16 @@ public class ChangeDeviceInfoUtil {
|
|||
});
|
||||
}
|
||||
|
||||
public static void getAddDeviceInfo(String country, int tag){
|
||||
public static void getAddDeviceInfo(String country, int tag, LoadDeviceCallback callback){
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, LOG_TAG, "Initializing device info...", null);
|
||||
executorService.submit(() -> {
|
||||
try {
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, LOG_TAG, "Starting network requests...", null);
|
||||
String bigoJson = fetchJsonSafely(buildBigoUrl(country, tag), "bigoJson");
|
||||
String afJson = fetchJsonSafely(buildAfUrl(country, tag), "afJson");
|
||||
fallBackToNetworkData(bigoJson, afJson);
|
||||
|
||||
JSONObject bigoDeviceObject = new JSONObject(bigoJson).optJSONObject("device");
|
||||
JSONObject afDeviceObject = new JSONObject(afJson).optJSONObject("device");
|
||||
callback.onLoadDeviceInfo(bigoDeviceObject, afDeviceObject);
|
||||
} catch (IOException | JSONException e) {
|
||||
LogFileUtil.logAndWrite(android.util.Log.ERROR, LOG_TAG, "Error occurred during initialization", e);
|
||||
} catch (Exception e) {
|
||||
|
@ -126,26 +127,33 @@ public class ChangeDeviceInfoUtil {
|
|||
|
||||
private static String fetchJsonSafely(String url, String logKey) throws IOException {
|
||||
String json = null;
|
||||
int attemptCount = 0;
|
||||
|
||||
while (true) {
|
||||
attemptCount++;
|
||||
try {
|
||||
json = HttpUtil.requestGet(url);
|
||||
if (json != null && !json.isEmpty()) {
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, LOG_TAG, "Received " + logKey + ": " + json, null);
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, LOG_TAG,
|
||||
"Received " + logKey + " after " + attemptCount + " attempt(s): " + json, null);
|
||||
return json;
|
||||
} else {
|
||||
LogFileUtil.logAndWrite(android.util.Log.WARN, LOG_TAG, "Empty or null response for: " + logKey + ", retrying...", null);
|
||||
LogFileUtil.logAndWrite(android.util.Log.WARN, LOG_TAG,
|
||||
"Empty or null response for: " + logKey + ", retrying in 3 seconds...", null);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
LogFileUtil.logAndWrite(android.util.Log.WARN, LOG_TAG, "Error fetching " + logKey + ": " + e.getMessage() + ", retrying...", e);
|
||||
LogFileUtil.logAndWrite(android.util.Log.WARN, LOG_TAG,
|
||||
"Error fetching " + logKey + " (attempt " + attemptCount + "): " + e.getMessage() + ", retrying in 3 seconds...", e);
|
||||
}
|
||||
|
||||
// Retry once if the initial attempt failed
|
||||
json = HttpUtil.requestGet(url);
|
||||
if (json != null && !json.isEmpty()) {
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, LOG_TAG, "Retry success for " + logKey + ": " + json, null);
|
||||
return json;
|
||||
} else {
|
||||
LogFileUtil.logAndWrite(android.util.Log.ERROR, LOG_TAG, "Retry failed for " + logKey + ", response is still null or empty.", null);
|
||||
throw new IOException("Failed to fetch valid JSON for " + logKey);
|
||||
try {
|
||||
Thread.sleep(3000);
|
||||
} catch (InterruptedException ie) {
|
||||
Thread.currentThread().interrupt();
|
||||
LogFileUtil.logAndWrite(android.util.Log.ERROR, LOG_TAG,
|
||||
"Retry interrupted for " + logKey, ie);
|
||||
throw new IOException("Retry interrupted for " + logKey, ie);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -260,8 +268,8 @@ public class ChangeDeviceInfoUtil {
|
|||
}
|
||||
|
||||
|
||||
public static void changeDeviceInfo(String current_pkg_name, Context context) {
|
||||
|
||||
public static void changeDeviceInfo(String current_pkg_name, Context context, JSONObject bigoDeviceObject, JSONObject afDeviceObject) {
|
||||
try{
|
||||
BigoInfo bigoDevice;
|
||||
if (bigoDeviceObject != null) {
|
||||
// BIGO
|
||||
|
@ -331,6 +339,7 @@ public class ChangeDeviceInfoUtil {
|
|||
logAndWrite(android.util.Log.ERROR, "ChangeDeviceInfoUtil", "Error occurred while changing device info", e);
|
||||
throw new RuntimeException("Error occurred in changeDeviceInfo", e);
|
||||
}
|
||||
bigoDeviceObject = null;
|
||||
}
|
||||
|
||||
DeviceInfo deviceInfo;
|
||||
|
@ -490,6 +499,10 @@ public class ChangeDeviceInfoUtil {
|
|||
logAndWrite(Log.ERROR, "ChangeDeviceInfoUtil", "Error occurred in changeDeviceInfo", e);
|
||||
throw new RuntimeException("Error occurred in changeDeviceInfo", e);
|
||||
}
|
||||
afDeviceObject = null;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
package com.example.studyapp.device;
|
||||
|
||||
import org.json.JSONObject;
|
||||
|
||||
public interface LoadDeviceCallback{
|
||||
void onLoadDeviceInfo(JSONObject bigoDevice, JSONObject afDevice);
|
||||
}
|
Loading…
Reference in New Issue