refactor(device): 重构设备信息修改和ARM云API客户端逻辑
- `ArmCloudApiClient`：移除构造函数中的 `baseUrl`、`accessKey` 和 `secretKey` 参数，将这些值硬编码到类中。
- `ChangeDeviceInfoUtil`:
- `changeDeviceInfo` 方法：移除 `padCodes` 参数，改为在方法内部通过 `armClient.getDeviceCodes` 获取。
- `LoadDeviceWorker`:
- `executeSingleLogic` 方法：在调用 `ChangeDeviceInfoUtil.changeDeviceInfo` 时传递 `MainActivity.armClient`。
- `MainActivity`:
- 新增 `armClient` 静态成员变量，并在 `onCreate` 中初始化 `ArmCloudApiClient` 实例。
- 修改 `modifyDeviceInfoButton` 的点击事件，在调用 `ChangeDeviceInfoUtil.changeDeviceInfo` 时传递 `armClient`。
- `executeSingleLogic` 方法：在调用 `ChangeDeviceInfoUtil.changeDeviceInfo` 时传递 `armClient`。
- 移除了 `getAndroidId(Context context)` 方法中未使用的代码。
- 简化了 `onCreate` 方法中的按钮初始化逻辑，引入了 `setupButton` 辅助方法。
- 引入了 `logInfo`, `logError`, `logWarn`, `showToast` 等辅助方法以简化日志记录和UI提示。
- 移除了未使用的 `instance` 静态成员变量和 `getInstance()` 方法。
- 移除了 `executeLogic` 方法和相关的 `isRunning`、`taskLock` 成员变量，相关逻辑已移至 `LoadDeviceWorker`。
- 调整了 `onDestroy` 方法的逻辑。
This commit is contained in:
yjj38
parent
f0339e7251
commit
c1cdbfeffc
|
|
@ -13,6 +13,7 @@ import android.os.Bundle;
|
|||
import android.provider.Settings;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.Toast;
|
||||
import android.Manifest;
|
||||
|
|
@ -29,6 +30,7 @@ import androidx.work.WorkManager;
|
|||
|
||||
import com.example.retention.R;
|
||||
import com.example.retention.autoJS.AutoJsUtil;
|
||||
import com.example.retention.device.ArmCloudApiClient;
|
||||
import com.example.retention.device.ChangeDeviceInfoUtil;
|
||||
|
||||
import com.example.retention.proxy.ClashUtil;
|
||||
|
|
@ -47,14 +49,14 @@ import java.util.concurrent.TimeUnit;
|
|||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
private static WeakReference<MainActivity> instance;
|
||||
|
||||
private static final int REQUEST_CODE_STORAGE_PERMISSION = 1;
|
||||
|
||||
private static final int ALLOW_ALL_FILES_ACCESS_PERMISSION_CODE = 1001;
|
||||
|
||||
public static ExecutorService executorService;
|
||||
|
||||
public static ArmCloudApiClient armClient;
|
||||
|
||||
// 假设我们从配置文件中提取出了以下 name 项数据（仅为部分示例数据）
|
||||
private final String[] proxyNames = {
|
||||
"mr", "sr", "bq", "ml", "ht", "ga", "mk", "by", "pr", "hr", "hu",
|
||||
|
|
@ -72,8 +74,6 @@ public class MainActivity extends AppCompatActivity {
|
|||
"ge", "ps"
|
||||
};
|
||||
|
||||
public static volatile String scriptResult;
|
||||
|
||||
// 初始化 ExecutorService
|
||||
private void initializeExecutorService() {
|
||||
if (executorService == null || executorService.isShutdown()) {
|
||||
|
|
@ -87,26 +87,7 @@ public class MainActivity extends AppCompatActivity {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 Android 设备的 ANDROID_ID
|
||||
*
|
||||
* @param context 应用上下文
|
||||
* @return 设备的 ANDROID_ID，若无法获取，则返回 null
|
||||
*/
|
||||
private String getAndroidId(Context context) {
|
||||
// if (context == null) {
|
||||
// LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "getAndroidId: Context cannot be null",null);
|
||||
// throw new IllegalArgumentException("Context cannot be null");
|
||||
// }
|
||||
// try {
|
||||
// return Settings.Secure.getString(
|
||||
// context.getContentResolver(),
|
||||
// Settings.Secure.ANDROID_ID
|
||||
// );
|
||||
// } catch (Exception e) {
|
||||
// LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "getAndroidId: Failed to get ANDROID_ID",e);
|
||||
// return null;
|
||||
// }
|
||||
private String getAndroidId() {
|
||||
return "FyZqWrStUvOpKlMn";
|
||||
}
|
||||
|
||||
|
|
@ -118,11 +99,13 @@ public class MainActivity extends AppCompatActivity {
|
|||
super.onCreate(savedInstanceState);
|
||||
LogFileUtil.initialize(this);
|
||||
setContentView(R.layout.activity_main);
|
||||
instance = new WeakReference<>(this);
|
||||
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Initializing application", null);
|
||||
logInfo("onCreate: Initializing application");
|
||||
|
||||
initializeExecutorService();
|
||||
System.setProperty("java.library.path", this.getApplicationInfo().nativeLibraryDir);
|
||||
|
||||
System.setProperty("java.library.path", getApplicationInfo().nativeLibraryDir);
|
||||
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
|
||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
|
||||
!= PackageManager.PERMISSION_GRANTED) {
|
||||
|
|
@ -139,91 +122,60 @@ public class MainActivity extends AppCompatActivity {
|
|||
startActivityForResult(intent, ALLOW_ALL_FILES_ACCESS_PERMISSION_CODE);
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
showToast("网络不可用");
|
||||
logError("Network not available, closing app.");
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onCreate: Setting up work manager", null);
|
||||
logInfo("onCreate: Setting up work manager");
|
||||
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);
|
||||
Button runScriptButton = findViewById(R.id.run_script_button);
|
||||
if (runScriptButton != null) {
|
||||
runScriptButton.setOnClickListener(v -> AutoJsUtil.runAutojsScript(this));
|
||||
} else {
|
||||
LogFileUtil.logAndWrite(Log.WARN, "MainActivity", "Run Script Button not found", null);
|
||||
Toast.makeText(this, "Button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
logInfo("onCreate: Setting up UI components");
|
||||
|
||||
Button connectButton = findViewById(R.id.connectVpnButton);
|
||||
if (connectButton != null) {
|
||||
connectButton.setOnClickListener(v -> startProxyVpn(this));
|
||||
} else {
|
||||
Toast.makeText(this, "Connect button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
setupButton(R.id.run_script_button, v -> AutoJsUtil.runAutojsScript(this));
|
||||
setupButton(R.id.connectVpnButton, v -> startProxyVpn(this));
|
||||
setupButton(R.id.disconnectVpnButton, v -> ClashUtil.stopProxy(this));
|
||||
setupButton(R.id.switchVpnButton, v -> ClashUtil.switchProxyGroup("GLOBAL", "us", "http://127.0.0.1:6170"));
|
||||
|
||||
Button disconnectButton = findViewById(R.id.disconnectVpnButton);
|
||||
if (disconnectButton != null) {
|
||||
disconnectButton.setOnClickListener(v -> ClashUtil.stopProxy(this));
|
||||
} else {
|
||||
Toast.makeText(this, "Disconnect button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
armClient = new ArmCloudApiClient();
|
||||
|
||||
Button switchVpnButton = findViewById(R.id.switchVpnButton);
|
||||
if (switchVpnButton != null) {
|
||||
switchVpnButton.setOnClickListener(v -> ClashUtil.switchProxyGroup("GLOBAL", "us", "http://127.0.0.1:6170"));
|
||||
} else {
|
||||
Toast.makeText(this, "Disconnect button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
setupButton(R.id.modifyDeviceInfoButton, v -> ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), this, armClient));
|
||||
setupButton(R.id.resetDeviceInfoButton, v -> ChangeDeviceInfoUtil.resetChangedDeviceInfo(getPackageName(), this));
|
||||
|
||||
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) {
|
||||
resetDeviceInfoButton.setOnClickListener(v -> ChangeDeviceInfoUtil.resetChangedDeviceInfo(getPackageName(), this));
|
||||
} else {
|
||||
Toast.makeText(this, "resetDeviceInfo button not found", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
// 初始化 ChangeDeviceInfoUtil
|
||||
String androidId = getAndroidId(this);
|
||||
String taskId = UUID.randomUUID().toString();
|
||||
// ChangeDeviceInfoUtil.initialize("US", 2, this, androidId);
|
||||
// 获取输入框和按钮
|
||||
Button executeButton = findViewById(R.id.execute_button);
|
||||
Button stopExecuteButton = findViewById(R.id.stop_execute_button);
|
||||
|
||||
// 设置按钮的点击事件
|
||||
if (executeButton != null) {
|
||||
executeButton.setOnClickListener(v -> {
|
||||
executeButton.setEnabled(false);
|
||||
// Toast.makeText(this, "任务正在执行", Toast.LENGTH_SHORT).show();
|
||||
// executeLogic(androidId,taskId);
|
||||
startLoadWork();
|
||||
});
|
||||
}
|
||||
|
||||
if (stopExecuteButton != null) {
|
||||
stopExecuteButton.setOnClickListener(v -> {
|
||||
// if (executorService != null && !executorService.isShutdown()) {
|
||||
// executorService.shutdownNow();
|
||||
// ClashUtil.stopProxy(this);
|
||||
// AutoJsUtil.stopAutojsScript(this);
|
||||
// executeButton.setEnabled(true);
|
||||
// }
|
||||
WorkManager.getInstance(this).cancelAllWorkByTag(WORK_TAG);
|
||||
executeButton.setEnabled(true);
|
||||
});
|
||||
} else {
|
||||
Toast.makeText(this, "Stop button not found", Toast.LENGTH_SHORT).show();
|
||||
showToast("Stop button not found");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void setupButton(int resId, View.OnClickListener listener) {
|
||||
Button button = findViewById(resId);
|
||||
if (button != null) {
|
||||
button.setOnClickListener(listener);
|
||||
} else {
|
||||
String msg = getResources().getResourceEntryName(resId) + " not found";
|
||||
logWarn(msg);
|
||||
showToast(msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -238,56 +190,14 @@ public class MainActivity extends AppCompatActivity {
|
|||
WorkManager.getInstance(this).enqueue(workRequest);
|
||||
}
|
||||
|
||||
private void executeLogic(String androidId, String taskId) {
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeLogic: Start execution", null);
|
||||
|
||||
if (!isNetworkAvailable(this)) {
|
||||
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);
|
||||
initializeExecutorService();
|
||||
executorService.submit(() -> {
|
||||
try {
|
||||
AutoJsUtil.registerScriptResultReceiver(this);
|
||||
AutoJsUtil.flag = true;
|
||||
ChangeDeviceInfoUtil.getDeviceInfo(taskId, androidId);
|
||||
executeSingleLogic();
|
||||
while (isRunning) {
|
||||
if (!isRunning) break;
|
||||
|
||||
// 从队列中获取最新的 scriptResult
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script", null);
|
||||
String currentScriptResult = scriptResultQueue.take();
|
||||
ChangeDeviceInfoUtil.getDeviceInfo(taskId, androidId);
|
||||
ChangeDeviceInfoUtil.processPackageInfo(TaskUtil.getPackageInfo(androidId), this);
|
||||
executeSingleLogic();
|
||||
TaskUtil.execSaveTask(this, androidId, taskId, currentScriptResult);
|
||||
LogFileUtil.logAndWrite(android.util.Log.DEBUG, "MainActivity", "----发送result------;" + currentScriptResult, null);
|
||||
if (currentScriptResult != null && !TextUtils.isEmpty(currentScriptResult)) {
|
||||
infoUpload(this, androidId, currentScriptResult);
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "executeLogic: Thread interrupted while waiting", e);
|
||||
} catch (Exception e) {
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", "executeLogic: Unexpected task error.", e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static final LinkedBlockingQueue<String> scriptResultQueue = new LinkedBlockingQueue<>();
|
||||
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);
|
||||
ChangeDeviceInfoUtil.changeDeviceInfo(getPackageName(), this,armClient);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script", null);
|
||||
AutoJsUtil.runAutojsScript(this);
|
||||
}
|
||||
|
|
@ -390,7 +300,6 @@ public class MainActivity extends AppCompatActivity {
|
|||
protected void onDestroy() {
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "onDestroy: Cleaning up resources", null);
|
||||
super.onDestroy();
|
||||
instance.clear();
|
||||
if (AutoJsUtil.scriptResultReceiver != null) {
|
||||
unregisterReceiver(AutoJsUtil.scriptResultReceiver);
|
||||
AutoJsUtil.scriptResultReceiver = null;
|
||||
|
|
@ -398,10 +307,22 @@ public class MainActivity extends AppCompatActivity {
|
|||
if (executorService != null) {
|
||||
executorService.shutdown();
|
||||
}
|
||||
isRunning = false;
|
||||
}
|
||||
|
||||
public static MainActivity getInstance() {
|
||||
return instance.get(); // 返回实例
|
||||
|
||||
private void logInfo(String message) {
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", message, null);
|
||||
}
|
||||
|
||||
private void logError(String message) {
|
||||
LogFileUtil.logAndWrite(Log.ERROR, "MainActivity", message, null);
|
||||
}
|
||||
|
||||
private void logWarn(String message) {
|
||||
LogFileUtil.logAndWrite(Log.WARN, "MainActivity", message, null);
|
||||
}
|
||||
|
||||
private void showToast(String message) {
|
||||
Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,16 +34,14 @@ public class ArmCloudApiClient {
|
|||
|
||||
private final OkHttpClient client;
|
||||
private final String baseUrl = "https://openapi-hk.armcloud.net";
|
||||
private final String accessKey;
|
||||
private final String secretKey;
|
||||
private final String accessKey = "gz8f1u0t63byzdu6ozbx8r5qs3e5lipt";
|
||||
private final String secretKey = "3yc8c8bg1dym0zaiwjh867al";
|
||||
|
||||
public ArmCloudApiClient(String baseUrl, String accessKey, String secretKey) {
|
||||
public ArmCloudApiClient() {
|
||||
this.client = new Builder()
|
||||
.connectTimeout(10, TimeUnit.SECONDS)
|
||||
.readTimeout(10, TimeUnit.SECONDS)
|
||||
.build();
|
||||
this.accessKey = accessKey;
|
||||
this.secretKey = secretKey;
|
||||
}
|
||||
|
||||
private static final String ALGORITHM = "HmacSHA256";
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ public class ChangeDeviceInfoUtil {
|
|||
}
|
||||
|
||||
|
||||
public static void changeDeviceInfo(String current_pkg_name, Context context, ArmCloudApiClient client, String[] padCodes) {
|
||||
public static void changeDeviceInfo(String current_pkg_name, Context context, ArmCloudApiClient client) {
|
||||
|
||||
final String B_PREFIX = current_pkg_name + ".";
|
||||
final String U_PREFIX = current_pkg_name + "_";
|
||||
|
|
@ -438,6 +438,7 @@ public class ChangeDeviceInfoUtil {
|
|||
|
||||
// 调用接口更新实例属性
|
||||
try {
|
||||
String[] padCodes = client.getDeviceCodes(1, 1, null, null, null, null, null, null, null, null);
|
||||
String response = client.updateInstanceProperties(
|
||||
padCodes,
|
||||
null, // modemPersistProps
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
|
|||
import androidx.work.CoroutineWorker;
|
||||
import androidx.work.WorkerParameters;
|
||||
|
||||
import com.example.retention.MainActivity;
|
||||
import com.example.retention.autoJS.AutoJsUtil;
|
||||
import com.example.retention.device.ChangeDeviceInfoUtil;
|
||||
import com.example.retention.proxy.ClashUtil;
|
||||
|
|
@ -54,7 +55,7 @@ public class LoadDeviceWorker extends CoroutineWorker {
|
|||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Proxy not active, starting VPN",null);
|
||||
startProxyVpn(context);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Changing device info",null);
|
||||
ChangeDeviceInfoUtil.changeDeviceInfo(context.getPackageName(), context);
|
||||
ChangeDeviceInfoUtil.changeDeviceInfo(context.getPackageName(), context, MainActivity.armClient);
|
||||
LogFileUtil.logAndWrite(Log.INFO, "MainActivity", "executeSingleLogic: Running AutoJs script",null);
|
||||
Utils.writePackageName(ChangeDeviceInfoUtil.packageName);
|
||||
AutoJsUtil.runAutojsScript(context);
|
||||
|
|
|
|||
Loading…
Reference in New Issue