capacitor-dex-editor 0.0.14 → 0.0.15

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

@@ -1672,12 +1672,39 @@ public class DexManager {
                 MethodImplementation impl = method.getImplementation();
                 if (impl != null) {
                     smali.append("    .registers ").append(impl.getRegisterCount()).append("\n");
+                    smali.append("\n");
                     
-                    // 输出指令
+                    // 输出指令，跟踪标签位置
+                    java.util.Map<Integer, String> labelMap = new java.util.HashMap<>();
+                    int codeOffset = 0;
+                    
+                    // 第一遍：收集所有标签位置
                     for (Instruction instruction : impl.getInstructions()) {
-                        smali.append("    ").append(instruction.getOpcode().name.toLowerCase());
-                        smali.append(" ").append(formatInstruction(instruction));
+                        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();
+                    }
+                    
+                    // 第二遍：输出指令
+                    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");
+                        
+                        codeOffset += instruction.getCodeUnits();
                     }
                 }
                 

package/package.json

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