细节调整

dqzg12300 · Jan 10, 2024 · cb0cfbe · cb0cfbe
1 parent 75a3a63
commit cb0cfbe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/com/android/dx/merge/DexMerger.java b/src/com/android/dx/merge/DexMerger.java
@@ -889,7 +889,12 @@ private void transformMethods(Dex in, IndexMap indexMap, ClassData.Method[] meth
                 } else {
                     codeOut.alignToFourBytesWithZeroFill();
                     classDataOut.writeUleb128(codeOut.getPosition());
-                    transformCode(in, in.readCode(method), indexMap);
+                    try{
+                        transformCode(in, in.readCode(method), indexMap);
+                    }catch (Exception ex){
+                        System.out.println("tracesformCode Exception "+ex.getMessage());
+                    }
+
                 }
             }
             else {

diff --git a/src/com/android/dx/unpacker/MethodCodeItemFile.java b/src/com/android/dx/unpacker/MethodCodeItemFile.java
@@ -30,6 +30,9 @@ public MethodCodeItemFile(File file)
             this.map = new HashMap<>();
             Gson gson=new Gson();
             String[] items=this.jsondata.split(";");
+            if(items.length<=2){
+                items=this.jsondata.split("\n");
+            }
             for(int i=0;i<items.length;i++){
                 String codeJson=items[i];
 //                System.out.println("codeJson:"+codeJson);