提高兼容性

package_utils.py

@@ -232,7 +232,9 @@ def mergeDrawableRes(game, sdk, subChannel, config):
     resPath = os.path.join(decompliePath, 'res')
 
     for path in os.listdir(resPath):
-        if path.startswith('drawable') and path.endswith('-v4'):
+        print('res path %s' % path)
+        if (path.startswith('drawable') or path.startswith('mipmap')) and path.endswith('-v4'):
+            print('merge path %s' % path)
             v4DrawablePath = os.path.join(resPath, path)
             drawablePath = os.path.join(resPath, path[:-3])
 
@@ -700,6 +702,7 @@ def generateNewRFile(game, sdk, subChannel, config):
         linkResCmd = '"%s" link -o "%s" -I "%s" --manifest "%s" --java "%s" --auto-add-overlay' % (aapt, outApk, androidPlatforms, manifest, compliePath)
         for filename in os.listdir(unzipResPath):
             linkResCmd += ' %s' % filename
+        print('link cmd len is %s' % len(linkResCmd))
         ret = file_utils.execFormatCmd(linkResCmd, unzipResPath)
         if ret:
             return ret

package_utils_record.py

@@ -246,7 +246,9 @@ def mergeDrawableRes(game, sdk, subChannel, config):
     resPath = os.path.join(decompliePath, 'res')
 
     for path in os.listdir(resPath):
-        if path.startswith('drawable') and path.endswith('-v4'):
+        print('res path %s' % path)
+        if (path.startswith('drawable') or path.startswith('mipmap')) and path.endswith('-v4'):
+            print('merge path %s' % path)
             v4DrawablePath = os.path.join(resPath, path)
             drawablePath = os.path.join(resPath, path[:-3])
 
@@ -755,6 +757,7 @@ def generateNewRFile(game, sdk, subChannel, config):
         linkResCmd = '"%s" link -o "%s" -I "%s" --manifest "%s" --java "%s" --auto-add-overlay' % (aapt, outApk, androidPlatforms, manifest, compliePath)
         for filename in os.listdir(unzipResPath):
             linkResCmd += ' %s' % filename
+        print('link cmd len is %s' % len(linkResCmd))
         ret = file_utils.execFormatCmd(linkResCmd, unzipResPath)
         if ret:
             return ret

package_utils_shanshen.py

@@ -218,7 +218,9 @@ def mergeDrawableRes(game, sdk, subChannel, config):
     resPath = os.path.join(decompliePath, 'res')
 
     for path in os.listdir(resPath):
-        if path.startswith('drawable') and path.endswith('-v4'):
+        print('res path %s' % path)
+        if (path.startswith('drawable') or path.startswith('mipmap')) and path.endswith('-v4'):
+            print('merge path %s' % path)
             v4DrawablePath = os.path.join(resPath, path)
             drawablePath = os.path.join(resPath, path[:-3])
 
@@ -643,6 +645,7 @@ def generateNewRFile(game, sdk, subChannel, config):
         linkResCmd = '"%s" link -o "%s" -I "%s" --manifest "%s" --java "%s" --auto-add-overlay' % (aapt, outApk, androidPlatforms, manifest, compliePath)
         for filename in os.listdir(unzipResPath):
             linkResCmd += ' %s' % filename
+        print('link cmd len is %s' % len(linkResCmd))
         ret = file_utils.execFormatCmd(linkResCmd, unzipResPath)
         if ret:
             return ret