capacitor-dex-editor 0.0.14 → 0.0.16

package/android/src/main/java/com/aetherlink/dexeditor/DexManager.java

@@ -1621,67 +1621,84 @@ public class DexManager {
             
             smali.append("\n");
             
-            // 字段
-            smali.append("# ========== 字段 ==========\n");
+            // 分离静态字段和实例字段
+            java.util.List<Field> staticFields = new java.util.ArrayList<>();
+            java.util.List<Field> instanceFields = new java.util.ArrayList<>();
             for (Field field : targetClass.getFields()) {
-                smali.append(".field ");
-                int fFlags = field.getAccessFlags();
-                if ((fFlags & 0x0001) != 0) smali.append("public ");
-                if ((fFlags & 0x0002) != 0) smali.append("private ");
-                if ((fFlags & 0x0004) != 0) smali.append("protected ");
-                if ((fFlags & 0x0008) != 0) smali.append("static ");
-                if ((fFlags & 0x0010) != 0) smali.append("final ");
-                if ((fFlags & 0x0040) != 0) smali.append("volatile ");
-                if ((fFlags & 0x0080) != 0) smali.append("transient ");
-                if ((fFlags & 0x1000) != 0) smali.append("synthetic ");
-                if ((fFlags & 0x4000) != 0) smali.append("enum ");
-                smali.append(field.getName()).append(":").append(field.getType()).append("\n");
+                if ((field.getAccessFlags() & 0x0008) != 0) {
+                    staticFields.add(field);
+                } else {
+                    instanceFields.add(field);
+                }
             }
             
-            smali.append("\n");
+            // 静态字段
+            if (!staticFields.isEmpty()) {
+                smali.append("# static fields\n");
+                for (Field field : staticFields) {
+                    smali.append(".field ");
+                    int fFlags = field.getAccessFlags();
+                    if ((fFlags & 0x0001) != 0) smali.append("public ");
+                    if ((fFlags & 0x0002) != 0) smali.append("private ");
+                    if ((fFlags & 0x0004) != 0) smali.append("protected ");
+                    smali.append("static ");
+                    if ((fFlags & 0x0010) != 0) smali.append("final ");
+                    if ((fFlags & 0x0040) != 0) smali.append("volatile ");
+                    if ((fFlags & 0x0080) != 0) smali.append("transient ");
+                    if ((fFlags & 0x1000) != 0) smali.append("synthetic ");
+                    if ((fFlags & 0x4000) != 0) smali.append("enum ");
+                    smali.append(field.getName()).append(":").append(field.getType()).append("\n");
+                }
+                smali.append("\n");
+            }
             
-            // 方法
-            smali.append("# ========== 方法 ==========\n");
+            // 实例字段
+            if (!instanceFields.isEmpty()) {
+                smali.append("# instance fields\n");
+                for (Field field : instanceFields) {
+                    smali.append(".field ");
+                    int fFlags = field.getAccessFlags();
+                    if ((fFlags & 0x0001) != 0) smali.append("public ");
+                    if ((fFlags & 0x0002) != 0) smali.append("private ");
+                    if ((fFlags & 0x0004) != 0) smali.append("protected ");
+                    if ((fFlags & 0x0010) != 0) smali.append("final ");
+                    if ((fFlags & 0x0040) != 0) smali.append("volatile ");
+                    if ((fFlags & 0x0080) != 0) smali.append("transient ");
+                    if ((fFlags & 0x1000) != 0) smali.append("synthetic ");
+                    if ((fFlags & 0x4000) != 0) smali.append("enum ");
+                    smali.append(field.getName()).append(":").append(field.getType()).append("\n");
+                }
+                smali.append("\n");
+            }
+            
+            // 分离直接方法和虚拟方法
+            java.util.List<Method> directMethods = new java.util.ArrayList<>();
+            java.util.List<Method> virtualMethods = new java.util.ArrayList<>();
             for (Method method : targetClass.getMethods()) {
-                smali.append("\n.method ");
                 int mFlags = method.getAccessFlags();
-                if ((mFlags & 0x0001) != 0) smali.append("public ");
-                if ((mFlags & 0x0002) != 0) smali.append("private ");
-                if ((mFlags & 0x0004) != 0) smali.append("protected ");
-                if ((mFlags & 0x0008) != 0) smali.append("static ");
-                if ((mFlags & 0x0010) != 0) smali.append("final ");
-                if ((mFlags & 0x0020) != 0) smali.append("synchronized ");
-                if ((mFlags & 0x0040) != 0) smali.append("bridge ");
-                if ((mFlags & 0x0080) != 0) smali.append("varargs ");
-                if ((mFlags & 0x0100) != 0) smali.append("native ");
-                if ((mFlags & 0x0400) != 0) smali.append("abstract ");
-                if ((mFlags & 0x0800) != 0) smali.append("strictfp ");
-                if ((mFlags & 0x1000) != 0) smali.append("synthetic ");
-                if ((mFlags & 0x10000) != 0) smali.append("constructor ");
-                if ((mFlags & 0x20000) != 0) smali.append("declared-synchronized ");
-                
-                smali.append(method.getName());
-                smali.append("(");
-                for (CharSequence param : method.getParameterTypes()) {
-                    smali.append(param);
+                // direct methods: private, static, constructor
+                if ((mFlags & 0x0002) != 0 || (mFlags & 0x0008) != 0 || 
+                    method.getName().equals("<init>") || method.getName().equals("<clinit>")) {
+                    directMethods.add(method);
+                } else {
+                    virtualMethods.add(method);
                 }
-                smali.append(")");
-                smali.append(method.getReturnType());
-                smali.append("\n");
-                
-                MethodImplementation impl = method.getImplementation();
-                if (impl != null) {
-                    smali.append("    .registers ").append(impl.getRegisterCount()).append("\n");
-                    
-                    // 输出指令
-                    for (Instruction instruction : impl.getInstructions()) {
-                        smali.append("    ").append(instruction.getOpcode().name.toLowerCase());
-                        smali.append(" ").append(formatInstruction(instruction));
-                        smali.append("\n");
-                    }
+            }
+            
+            // 直接方法
+            if (!directMethods.isEmpty()) {
+                smali.append("\n# direct methods\n");
+                for (Method method : directMethods) {
+                    outputMethod(smali, method);
+                }
+            }
+            
+            // 虚拟方法
+            if (!virtualMethods.isEmpty()) {
+                smali.append("\n# virtual methods\n");
+                for (Method method : virtualMethods) {
+                    outputMethod(smali, method);
                 }
-                
-                smali.append(".end method\n");
             }
             
             result.put("smali", smali.toString());
@@ -1698,6 +1715,77 @@ public class DexManager {
         return result;
     }
 
+    /**
+     * 输出单个方法的 Smali 代码 (MT 风格)
+     */
+    private void outputMethod(StringBuilder smali, Method method) {
+        smali.append(".method ");
+        int mFlags = method.getAccessFlags();
+        if ((mFlags & 0x0001) != 0) smali.append("public ");
+        if ((mFlags & 0x0002) != 0) smali.append("private ");
+        if ((mFlags & 0x0004) != 0) smali.append("protected ");
+        if ((mFlags & 0x0008) != 0) smali.append("static ");
+        if ((mFlags & 0x0010) != 0) smali.append("final ");
+        if ((mFlags & 0x0020) != 0) smali.append("synchronized ");
+        if ((mFlags & 0x0040) != 0) smali.append("bridge ");
+        if ((mFlags & 0x0080) != 0) smali.append("varargs ");
+        if ((mFlags & 0x0100) != 0) smali.append("native ");
+        if ((mFlags & 0x0400) != 0) smali.append("abstract ");
+        if ((mFlags & 0x0800) != 0) smali.append("strictfp ");
+        if ((mFlags & 0x1000) != 0) smali.append("synthetic ");
+        if ((mFlags & 0x10000) != 0) smali.append("constructor ");
+        if ((mFlags & 0x20000) != 0) smali.append("declared-synchronized ");
+        
+        smali.append(method.getName());
+        smali.append("(");
+        for (CharSequence param : method.getParameterTypes()) {
+            smali.append(param);
+        }
+        smali.append(")");
+        smali.append(method.getReturnType());
+        smali.append("\n");
+        
+        MethodImplementation impl = method.getImplementation();
+        if (impl != null) {
+            smali.append("    .registers ").append(impl.getRegisterCount()).append("\n\n");
+            
+            // 输出指令，跟踪标签位置
+            java.util.Map<Integer, String> labelMap = new java.util.HashMap<>();
+            int codeOffset = 0;
+            
+            // 第一遍：收集所有标签位置
+            for (Instruction instruction : impl.getInstructions()) {
+                if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) {
+                    com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction offInstr = 
+                        (com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) instruction;
+                    int targetOffset = codeOffset + offInstr.getCodeOffset();
+                    labelMap.put(targetOffset, ":cond_" + Integer.toHexString(targetOffset));
+                }
+                codeOffset += instruction.getCodeUnits();
+            }
+            
+            // 第二遍：输出指令 (MT 风格：每条指令后有空行)
+            codeOffset = 0;
+            for (Instruction instruction : impl.getInstructions()) {
+                // 输出标签（如果有）
+                if (labelMap.containsKey(codeOffset)) {
+                    smali.append("\n    ").append(labelMap.get(codeOffset)).append("\n");
+                }
+                
+                smali.append("    ").append(instruction.getOpcode().name.toLowerCase().replace('_', '-'));
+                String params = formatInstruction(instruction);
+                if (!params.isEmpty()) {
+                    smali.append(" ").append(params);
+                }
+                smali.append("\n\n");  // MT 风格：每条指令后有空行
+                
+                codeOffset += instruction.getCodeUnits();
+            }
+        }
+        
+        smali.append(".end method\n");
+    }
+
     /**
      * 格式化指令参数 - 使用正确的 Smali 语法格式
      * invoke 指令格式: invoke-xxx {v0, v1}, Lclass;->method()V

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-dex-editor",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Capacitor-plugin-for-editing-DEX-files-in-APK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",