bug fix

python/tools/garble/java_garble.py

@@ -135,6 +135,8 @@ class JavaGarble:
         ignore = False
         # 花括号
         curly_braces = 0
+        # 忽略混淆的代码块
+        ignore_parts = {}
         with open(file, "w+", encoding="utf-8") as fout:
             for line in lines:
                 # interface 不混淆
@@ -157,12 +159,19 @@ class JavaGarble:
 
                 # 定位1个缩进开头的类方法
                 if line.startswith("    ") and not line.startswith("     ") \
-                    and ("){\n" in line or ") {\n" in line) \
-                        and "enum" not in line and "interface" not in line and "class" not in line:
+                    and ("){\n" in line or ") {\n" in line):
                     curly_braces = line.count("{")
                     curly_braces -= line.count("}")
+                    
+                keys = ignore_parts.keys()
+                for brace in keys:
+                    if ignore_parts < brace:
+                        ignore_parts.pop(brace)
 
-                if curly_braces >= 1:
+                if "new" in line and "{\n" in line:
+                    ignore_parts[curly_braces] = curly_braces
+
+                if curly_braces >= 1 and curly_braces not in ignore_parts.keys():
                     if "return" in line:
                         curly_braces = -10000
                     elif ";\n" in line and len(line.replace(" ","")) > 10 and "//" not in line: