From af2ccf289942c8f8ae93a018b6a590dc61b397bf Mon Sep 17 00:00:00 2001 From: "X.Tech" <46757693+X-SCI-TECH@users.noreply.github.com> Date: Sat, 14 Nov 2026 12:37:45 +0800 Subject: [PATCH] fix(project): migrate legacy project.json fields and auto-upgrade on save - samples: displaySplash/hideLogs/splashText/stableMode -> splashVisible/logsVisible/slug - remove dead stable-mode checkbox and commented scriptConfigs/permissions blocks - always serialize canonical keys so legacy fields are upgraded on save - keep all compatibility aliases for deserialization --- .../project.json" | 8 +- .../Vue2 + Vant (SFC)/project.json" | 8 +- .../project.json" | 8 +- .../org/autojs/autojs/project/LaunchConfig.kt | 7 -- .../autojs/autojs/project/ProjectConfig.java | 118 +----------------- .../ui/project/ProjectConfigActivity.kt | 4 - .../res/layout/activity_project_config.xml | 6 - 7 files changed, 12 insertions(+), 147 deletions(-) diff --git "a/app/src/main/assets-app/sample/\345\270\203\345\261\200/Android \345\216\237\347\224\237\345\270\203\345\261\200/\344\270\223\346\263\250\346\227\266\345\205\211/project.json" "b/app/src/main/assets-app/sample/\345\270\203\345\261\200/Android \345\216\237\347\224\237\345\270\203\345\261\200/\344\270\223\346\263\250\346\227\266\345\205\211/project.json" index 6c085ab780..cd24a933f9 100644 --- "a/app/src/main/assets-app/sample/\345\270\203\345\261\200/Android \345\216\237\347\224\237\345\270\203\345\261\200/\344\270\223\346\263\250\346\227\266\345\205\211/project.json" +++ "b/app/src/main/assets-app/sample/\345\270\203\345\261\200/Android \345\216\237\347\224\237\345\270\203\345\261\200/\344\270\223\346\263\250\346\227\266\345\205\211/project.json" @@ -2,15 +2,13 @@ "assets": [], "useFeatures": [], "launchConfig": { - "displaySplash": true, - "hideLogs": true, - "splashText": "Powered by AutoJs6", - "stableMode": false + "logsVisible": false, + "splashVisible": true, + "slug": "Powered by AutoJs6" }, "main": "main.js", "name": "专注时光", "packageName": "org.example.android_native_focus", - "scripts": {}, "versionCode": 1, "versionName": "1.0.0" } diff --git "a/app/src/main/assets-app/sample/\345\270\203\345\261\200/Vue2 + Vant (SFC)/project.json" "b/app/src/main/assets-app/sample/\345\270\203\345\261\200/Vue2 + Vant (SFC)/project.json" index 6594fd4881..703d8b83b4 100644 --- "a/app/src/main/assets-app/sample/\345\270\203\345\261\200/Vue2 + Vant (SFC)/project.json" +++ "b/app/src/main/assets-app/sample/\345\270\203\345\261\200/Vue2 + Vant (SFC)/project.json" @@ -2,15 +2,13 @@ "assets": [], "useFeatures": [], "launchConfig": { - "displaySplash": true, - "hideLogs": true, - "splashText": "Powered by AutoJs6", - "stableMode": false + "logsVisible": false, + "splashVisible": true, + "slug": "Powered by AutoJs6" }, "main": "main.js", "name": "Vue2 + Vant (SFC)", "packageName": "org.example.vue2_vant", - "scripts": {}, "versionCode": 1, "versionName": "1.0.0" } \ No newline at end of file diff --git "a/app/src/main/assets-app/sample/\345\270\203\345\261\200/\345\217\257\344\272\244\344\272\222 HTML/project.json" "b/app/src/main/assets-app/sample/\345\270\203\345\261\200/\345\217\257\344\272\244\344\272\222 HTML/project.json" index 8a1dd34b87..054a107aea 100644 --- "a/app/src/main/assets-app/sample/\345\270\203\345\261\200/\345\217\257\344\272\244\344\272\222 HTML/project.json" +++ "b/app/src/main/assets-app/sample/\345\270\203\345\261\200/\345\217\257\344\272\244\344\272\222 HTML/project.json" @@ -2,15 +2,13 @@ "assets": [], "useFeatures": [], "launchConfig": { - "displaySplash": true, - "hideLogs": true, - "splashText": "Powered by AutoJs6", - "stableMode": false + "logsVisible": false, + "splashVisible": true, + "slug": "Powered by AutoJs6" }, "main": "main.js", "name": "可交互 HTML", "packageName": "org.example.interactive_html", - "scripts": {}, "versionCode": 1, "versionName": "1.0.0" } \ No newline at end of file diff --git a/app/src/main/java/org/autojs/autojs/project/LaunchConfig.kt b/app/src/main/java/org/autojs/autojs/project/LaunchConfig.kt index 33f82b569b..50961321e7 100644 --- a/app/src/main/java/org/autojs/autojs/project/LaunchConfig.kt +++ b/app/src/main/java/org/autojs/autojs/project/LaunchConfig.kt @@ -80,13 +80,6 @@ class LaunchConfig : FuzzyDeserializer.OriginalJsonKeyAware { ) var slug = mContext.getString(R.string.text_powered_by_autojs) - // @SerializedName("permissions") - // @field:SerializedNameCompatible( - // With(value = "permission"), - // With(value = "permissionList"), - // ) - // var permissions = emptyList() - override fun recordOriginalJsonKey(canonicalKey: String, originalKey: String) { mOriginalJsonKeys[canonicalKey] = originalKey } diff --git a/app/src/main/java/org/autojs/autojs/project/ProjectConfig.java b/app/src/main/java/org/autojs/autojs/project/ProjectConfig.java index b476300633..acc0fd3974 100644 --- a/app/src/main/java/org/autojs/autojs/project/ProjectConfig.java +++ b/app/src/main/java/org/autojs/autojs/project/ProjectConfig.java @@ -9,8 +9,6 @@ import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import com.google.gson.Strictness; import com.google.gson.annotations.SerializedName; import org.autojs.autojs.annotation.DeserializedMethodName; @@ -204,18 +202,6 @@ public class ProjectConfig implements FuzzyDeserializer.OriginalJsonKeyAware { @DeserializedMethodName(method = "normalizeSignatureScheme", parameterTypes = {String.class}) private String mSignatureScheme = "V1 + V2"; - // @Commented by SuperMonster003 on Jan 20, 2025. - // ! Unused config options: "scripts". - // ! zh-CN: 未使用的配置选项: "scripts". - // # @SerializedName("scriptConfigs") - // # @SerializedNameCompatible(with = { - // # @With(value = "scriptsConfigs"), - // # @With(value = "scriptsConfig"), - // # @With(value = "scriptConfig"), - // # @With(value = "scripts", target = {"AutoJs4", "AutoX"}), - // # }) - // # private final Map mScriptConfigs = new HashMap<>(); - @Nullable private transient KeyStore mKeyStore = null; @@ -709,13 +695,6 @@ public ProjectConfig setAgent(@Nullable AgentManifest agent) { return this; } - // @Commented by SuperMonster003 on Jan 20, 2025. - // ! Unused config options: "scripts". - // ! zh-CN: 未使用的配置选项: "scripts". - // # public Map getScriptConfigs() { - // # return mScriptConfigs; - // # } - public ProjectConfig setMainScriptFileName(String mainScriptFileName) { mMainScriptFileName = mainScriptFileName; return this; @@ -771,85 +750,9 @@ public void recordOriginalJsonKey(@NonNull String canonicalKey, @NonNull String } public String toJson(boolean detectConflicts) { - // Serialize first using canonical keys, then rename keys to preserve the original ones. - // zh-CN: 先按 canonical key 序列化, 再重命名 key 以保留原始 key. - JsonElement tree = sGson.toJsonTree(this); - if (!tree.isJsonObject()) { - return sGson.toJson(this); - } - - JsonObject obj = tree.getAsJsonObject(); - - // Rename canonical keys to original keys if needed. - // zh-CN: 如有需要, 将 canonical key 重命名为原始 key. - for (Map.Entry entry : mOriginalJsonKeys.entrySet()) { - String canonicalKey = entry.getKey(); - String originalKey = entry.getValue(); - - if (canonicalKey == null || originalKey == null) { - continue; - } - if (canonicalKey.equals(originalKey)) { - continue; - } - if (!obj.has(canonicalKey)) { - continue; - } - - if (obj.has(originalKey)) { - // Detect or resolve conflicts depending on the flag. - // zh-CN: 根据开关选择检测或静默解决冲突. - if (detectConflicts) { - throw new IllegalStateException("Conflicting keys when serializing: \"" + canonicalKey + "\" and \"" + originalKey + "\""); - } - // Keep the existing original key and drop canonical key silently. - // zh-CN: 静默保留原始 key, 丢弃 canonical key. - obj.remove(canonicalKey); - continue; - } - - JsonElement value = obj.remove(canonicalKey); - obj.add(originalKey, value); - } - - applyNestedOriginalKeys(obj, detectConflicts); - - return sGson.toJson(obj); - } - - private void applyNestedOriginalKeys(@NonNull JsonObject root, boolean detectConflicts) { - applyNestedOriginalKeysForLaunchConfig(root, detectConflicts); - applyNestedOriginalKeysForBuildInfo(root, detectConflicts); - } - - private void applyNestedOriginalKeysForLaunchConfig(@NonNull JsonObject root, boolean detectConflicts) { - if (mLaunchConfig == null) { - return; - } - String key = resolveTopLevelJsonKey("launchConfig"); - JsonElement launchElement = root.get(key); - if (launchElement == null || !launchElement.isJsonObject()) { - return; - } - mLaunchConfig.applyOriginalJsonKeys(launchElement.getAsJsonObject(), detectConflicts); - } - - private void applyNestedOriginalKeysForBuildInfo(@NonNull JsonObject root, boolean detectConflicts) { - if (mBuildInfo == null) { - return; - } - String key = resolveTopLevelJsonKey("build"); - JsonElement buildElement = root.get(key); - if (buildElement == null || !buildElement.isJsonObject()) { - return; - } - mBuildInfo.applyOriginalJsonKeys(buildElement.getAsJsonObject(), detectConflicts); - } - - @NonNull - private String resolveTopLevelJsonKey(@NonNull String canonicalKey) { - String original = mOriginalJsonKeys.get(canonicalKey); - return original == null || original.isBlank() ? canonicalKey : original; + // Always serialize with canonical keys: legacy keys are upgraded on save. + // zh-CN: 始终按 canonical key 序列化, 旧字段在保存时自动升级为规范字段. + return sGson.toJson(this); } public String getIconPath() { @@ -904,21 +807,6 @@ public List getFeatures() { return mFeatures; } - // @Commented by SuperMonster003 on Jan 20, 2025. - // ! Unused config options: "scripts". - // ! zh-CN: 未使用的配置选项: "scripts". - // # public ScriptConfig getScriptConfig(String scriptKeyName) { - // # ScriptConfig scriptConfig = Objects.requireNonNull(mScriptConfigs.getOrDefault(scriptKeyName, new ScriptConfig())); - // # List combinedFeatures = new ArrayList<>( - // # new HashSet<>() {{ - // # addAll(scriptConfig.getFeatures()); - // # addAll(mFeatures); - // # }} - // # ); - // # scriptConfig.setFeatures(combinedFeatures); - // # return scriptConfig; - // # } - public void setFeatures(@NonNull List features) { mFeatures = features; } diff --git a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt index eb1d6de279..201b016643 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.kt @@ -84,10 +84,6 @@ class ProjectConfigActivity : BaseActivity() { mVersionCode = binding.versionCode mMainFileName = binding.mainFileName - binding.defaultStableMode.apply { - ThemeColorHelper.setThemeColorPrimary(this, true) - } - mIcon = binding.appIcon.apply { setOnClickListener { selectIcon() } } diff --git a/app/src/main/res/layout/activity_project_config.xml b/app/src/main/res/layout/activity_project_config.xml index e3903ad658..87c66cfd08 100644 --- a/app/src/main/res/layout/activity_project_config.xml +++ b/app/src/main/res/layout/activity_project_config.xml @@ -210,12 +210,6 @@ - -