ls
/
agent-bigo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(proxy): 切换代理逻辑调整 

- 将 `ClashUtil.switchProxyGroup` 调用替换为 `ClashUtil.switchProxyWithPort(CountryCode.switchCountry())`
- 移除了 `MainActivity` 中的 `executeSingleLogic` 方法，相关逻辑已在 `LoadDeviceWorker` 中处理
- 在 `LoadDeviceWorker` 和 `MainActivity` 的 `startProxyVpn` 方法中，使用 `TAG` 记录日志，并更新了代理切换逻辑。
This commit is contained in:
yjj38 2025-07-09 21:04:28 +08:00
parent 20eaac8e12
commit 2b60f10351
2 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/example/retention/MainActivity.java
View File

@ -193,16 +193,6 @@ public class MainActivity extends AppCompatActivity {
public static final LinkedBlockingQueue<String> scriptResultQueue = new LinkedBlockingQueue<>(); public static final LinkedBlockingQueue<String> scriptResultQueue = new LinkedBlockingQueue<>();
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,armClient);
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script", null);
AutoJsUtil.runAutojsScript(this);
}
private void startProxyVpn(Context context) { private void startProxyVpn(Context context) {
if (!isNetworkAvailable(context)) { if (!isNetworkAvailable(context)) {
Toast.makeText(context, "Network is not available", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Network is not available", Toast.LENGTH_SHORT).show();
@ -217,11 +207,14 @@ public class MainActivity extends AppCompatActivity {
} }
try { try {
ClashUtil.startProxy(context); // 在主线程中调用 ClashUtil.startProxy(context);
ClashUtil.switchProxyGroup("GLOBAL", "us", "http://127.0.0.1:6170"); ClashUtil.switchProxyWithPort(CountryCode.switchCountry());
// ClashUtil.switchProxyGroup("PROXY", "my-socks5-proxy", "http://127.0.0.1:6170");
} catch (Exception e) { } catch (Exception e) {
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Failed to start VPN", e); LogFileUtil.logAndWrite(Log.ERROR, TAG, "startProxyVpn: Failed to start VPN", e);
Toast.makeText(context, "Failed to start VPN: " + (e.getMessage() != null ? e.getMessage() : "Unknown error"), Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Failed to start VPN: " +
(e.getMessage() != null ? e.getMessage() : "Unknown error"),
Toast.LENGTH_SHORT).show();
} }
} }

31
app/src/main/java/com/example/retention/worker/LoadDeviceWorker.java
View File

@ -26,8 +26,10 @@ import java.util.UUID;
import kotlin.coroutines.Continuation; import kotlin.coroutines.Continuation;
public class LoadDeviceWorker extends CoroutineWorker { public class LoadDeviceWorker extends CoroutineWorker {
private String androidId = "FyZqWrStUvOpKlMn"; private String androidId = "FyZqWrStUvOpKlMn";
private Context context; private Context context;
public LoadDeviceWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) { public LoadDeviceWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
super(context, workerParams); super(context, workerParams);
this.context = context; this.context = context;
@ -39,24 +41,24 @@ public class LoadDeviceWorker extends CoroutineWorker {
boolean result = ChangeDeviceInfoUtil.getDeviceInfoSync(taskId, androidId); boolean result = ChangeDeviceInfoUtil.getDeviceInfoSync(taskId, androidId);
String packageName = ChangeDeviceInfoUtil.packageName; String packageName = ChangeDeviceInfoUtil.packageName;
String zipName = ChangeDeviceInfoUtil.zipName; String zipName = ChangeDeviceInfoUtil.zipName;
Log.d("TAG", "doWork: "+result+" "+packageName+" "+zipName); Log.d("TAG", "doWork: " + result + " " + packageName + " " + zipName);
if (result && !TextUtils.isEmpty(packageName) && !TextUtils.isEmpty(zipName)){ if (result && !TextUtils.isEmpty(packageName) && !TextUtils.isEmpty(zipName)) {
boolean isSuccess = ChangeDeviceInfoUtil.processPackageInfoWithDeviceInfo(packageName,zipName, getApplicationContext(), androidId, taskId); boolean isSuccess = ChangeDeviceInfoUtil.processPackageInfoWithDeviceInfo(packageName, zipName, getApplicationContext(), androidId, taskId);
if (isSuccess){ if (isSuccess) {
executeSingleLogic(context); executeSingleLogic(context);
} }
}else { } else {
Log.d("TAG", "doWork: get Device info false"); Log.d("TAG", "doWork: get Device info false");
} }
return Result.success(); return Result.success();
} }
public void executeSingleLogic(Context context) { public void executeSingleLogic(Context context) {
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Proxy not active, starting VPN",null); LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Proxy not active, starting VPN", null);
startProxyVpn(context); startProxyVpn(context);
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Changing device info",null); LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Changing device info", null);
ChangeDeviceInfoUtil.changeDeviceInfo(context.getPackageName(), context, MainActivity.armClient); ChangeDeviceInfoUtil.changeDeviceInfo(context.getPackageName(), context, MainActivity.armClient);
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script",null); LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script", null);
Utils.writePackageName(ChangeDeviceInfoUtil.packageName); Utils.writePackageName(ChangeDeviceInfoUtil.packageName);
AutoJsUtil.runAutojsScript(context); AutoJsUtil.runAutojsScript(context);
} }
@ -64,7 +66,7 @@ public class LoadDeviceWorker extends CoroutineWorker {
private void startProxyVpn(Context context) { private void startProxyVpn(Context context) {
if (!isNetworkAvailable(context)) { if (!isNetworkAvailable(context)) {
Toast.makeText(context, "Network is not available", Toast.LENGTH_SHORT).show(); 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);
} }
// if (!(context instanceof Activity)) { // if (!(context instanceof Activity)) {
@ -73,11 +75,14 @@ public class LoadDeviceWorker extends CoroutineWorker {
// return; // return;
// } // }
try { try {
ClashUtil.startProxy(context); // 在主线程中调用 ClashUtil.startProxy(context);
ClashUtil.switchProxyGroup("GLOBAL", "us", "http://127.0.0.1:6170"); ClashUtil.switchProxyWithPort(CountryCode.switchCountry());
// ClashUtil.switchProxyGroup("PROXY", "my-socks5-proxy", "http://127.0.0.1:6170");
} catch (Exception e) { } catch (Exception e) {
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "startProxyVpn: Failed to start VPN",e); LogFileUtil.logAndWrite(Log.ERROR, TAG, "startProxyVpn: Failed to start VPN", e);
Toast.makeText(context, "Failed to start VPN: " + (e.getMessage() != null ? e.getMessage() : "Unknown error"), Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Failed to start VPN: " +
(e.getMessage() != null ? e.getMessage() : "Unknown error"),
Toast.LENGTH_SHORT).show();
} }
} }
} }