bug fix

python/tools/garble/activity_garble.py

@@ -21,13 +21,20 @@ class ActivityGarble:
     #替换文件内容
     def __process_file_content(self, path, file_name):
         # print("processing content: %s..."%path)
+        chars = "_1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".split("")
         with open(path, "rt") as fin:
             file_content = fin.read()
             # replace the file content based on mangle settings
             for (src, dst) in self.activity_mapping.items():
-                separator = [" ", ".", "\"", "{", "}", "(", ")", "[", "]","<",">", ":",  ";", ","]
-                for sep in separator:
-                    file_content = file_content.replace(src + sep, dst + sep).replace(sep+src, sep+dst)
+                #避免命名重复，确保要替换的部分前后没有合法的命名字符，如果有则还原
+                file_content = file_content.replace(src, dst)
+                for char in chars:    
+                    if char + dst in file_content:
+                        file_content = file_content.replace(char + dst, char + src)
+                    elif dst + char in file_content:
+                        file_content = file_content.replace(dst + char, src + char)
+
+                
 
             ext = os.path.splitext(file_name)[1]
             if ext == '.java':