diff --git a/app/release/app-release.apk b/app/release/app-release.apk index d00931d..830e848 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index 91e7504..d4936ad 100644 Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index de6e882..8baa69b 100644 Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/src/main/java/com/example/studyapp/MainActivity.java b/app/src/main/java/com/example/studyapp/MainActivity.java index ba1bed2..91406d5 100644 --- a/app/src/main/java/com/example/studyapp/MainActivity.java +++ b/app/src/main/java/com/example/studyapp/MainActivity.java @@ -250,7 +250,6 @@ public class MainActivity extends AppCompatActivity { } executeSingleLogic(); TaskUtil.execSaveTask(this, androidId,taskId); - scriptResult = "bin.mt.plus"; if (scriptResult != null && !TextUtils.isEmpty(scriptResult)) { infoUpload(this, androidId, scriptResult); } diff --git a/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java b/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java index fd67d1b..35bc71a 100644 --- a/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java +++ b/app/src/main/java/com/example/studyapp/device/ChangeDeviceInfoUtil.java @@ -96,30 +96,32 @@ public class ChangeDeviceInfoUtil { Log.d("TaskUtil", "Package info retrieved: " + packageInfo); // 遍历包信息并执行逻辑 - for (String packAgeName : packageInfo.keySet()) { - Log.d("TaskUtil", "Processing package: " + packAgeName); - if (isAppInstalled(packAgeName)) { - Log.d("TaskUtil", "Package installed: " + packAgeName); + if (packageInfo != null) { + for (String packAgeName : packageInfo.keySet()) { + Log.d("TaskUtil", "Processing package: " + packAgeName); + if (isAppInstalled(packAgeName)) { + Log.d("TaskUtil", "Package installed: " + packAgeName); - File filesDir = new File(context.getExternalFilesDir(null).getAbsolutePath()); - Log.d("TaskUtil", "Files directory: " + filesDir.getAbsolutePath()); + File filesDir = new File(context.getExternalFilesDir(null).getAbsolutePath()); + Log.d("TaskUtil", "Files directory: " + filesDir.getAbsolutePath()); - File file = TaskUtil.downloadCodeFile(packageInfo.get(packAgeName), filesDir); - if (file != null && file.exists()) { - Log.d("TaskUtil", "File downloaded: " + file.getAbsolutePath()); - File destDir = new File("/storage/emulated/0/Android/data/" + packAgeName); - Log.d("TaskUtil", "Unzipping to destination: " + destDir.getAbsolutePath()); + File file = TaskUtil.downloadCodeFile(packageInfo.get(packAgeName), filesDir); + if (file != null && file.exists()) { + Log.d("TaskUtil", "File downloaded: " + file.getAbsolutePath()); + File destDir = new File("/storage/emulated/0/Android/data/" + packAgeName); + Log.d("TaskUtil", "Unzipping to destination: " + destDir.getAbsolutePath()); - TaskUtil.unZip(destDir, file); - Log.d("TaskUtil", "Unzip completed. Deleting file: " + file.getAbsolutePath()); + TaskUtil.unZip(destDir, file); + Log.d("TaskUtil", "Unzip completed. Deleting file: " + file.getAbsolutePath()); - TaskUtil.delFileSh(file.getAbsolutePath()); - Log.d("TaskUtil", "Temporary file deleted: " + file.getAbsolutePath()); + TaskUtil.delFileSh(file.getAbsolutePath()); + Log.d("TaskUtil", "Temporary file deleted: " + file.getAbsolutePath()); + } else { + Log.w("TaskUtil", "File download failed or file does not exist for package: " + packAgeName); + } } else { - Log.w("TaskUtil", "File download failed or file does not exist for package: " + packAgeName); + Log.w("TaskUtil", "Package not installed: " + packAgeName); } - } else { - Log.w("TaskUtil", "Package not installed: " + packAgeName); } } } catch (IOException | JSONException e) {