Browse Source

修复bug

yhz 5 years ago
parent
commit
b04cf71ec4
4 changed files with 5 additions and 9 deletions
  1. 1 1
      package_utils.py
  2. 2 2
      package_utils_record.py
  3. 2 2
      package_utils_shanshen.py
  4. 0 4
      sdk/jm/res/values/jm_public.xml

+ 1 - 1
package_utils.py

@@ -699,7 +699,7 @@ def generateNewRFile(game, sdk, subChannel, config):
         outApk = os.path.join(compliePath, 'res.apk')
         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 += ' -R "%s"' % filename
+            linkResCmd += ' %s' % filename
         ret = file_utils.execFormatCmd(linkResCmd, unzipResPath)
         if ret:
             return ret

+ 2 - 2
package_utils_record.py

@@ -754,7 +754,7 @@ def generateNewRFile(game, sdk, subChannel, config):
         outApk = os.path.join(compliePath, 'res.apk')
         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 += ' -R "%s"' % filename
+            linkResCmd += ' %s' % filename
         ret = file_utils.execFormatCmd(linkResCmd, unzipResPath)
         if ret:
             return ret
@@ -764,7 +764,7 @@ def generateNewRFile(game, sdk, subChannel, config):
     packageName = xml_utils.getPackageName(manifest)
     packagePath = file_utils.getPackagePath(compliePath, packageName)
     RSourceFile = os.path.join(packagePath, 'R.java')
-    complieRCmd = 'javac -source 1.7 -target 1.7 -encoding UTF-8 "%s"' % RSourceFile
+    complieRCmd = 'javac -source 1.8 -target 1.8 -encoding UTF-8 "%s"' % RSourceFile
     ret = file_utils.execFormatCmd(complieRCmd)
     if ret:
         return ret

+ 2 - 2
package_utils_shanshen.py

@@ -642,7 +642,7 @@ def generateNewRFile(game, sdk, subChannel, config):
         outApk = os.path.join(compliePath, 'res.apk')
         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 += ' -R "%s"' % filename
+            linkResCmd += ' %s' % filename
         ret = file_utils.execFormatCmd(linkResCmd, unzipResPath)
         if ret:
             return ret
@@ -652,7 +652,7 @@ def generateNewRFile(game, sdk, subChannel, config):
     packageName = xml_utils.getPackageName(manifest)
     packagePath = file_utils.getPackagePath(compliePath, packageName)
     RSourceFile = os.path.join(packagePath, 'R.java')
-    complieRCmd = 'javac -source 1.7 -target 1.7 -encoding UTF-8 "%s"' % RSourceFile
+    complieRCmd = 'javac -source 1.8 -target 1.8 -encoding UTF-8 "%s"' % RSourceFile
     ret = file_utils.execFormatCmd(complieRCmd)
     if ret:
         return ret

+ 0 - 4
sdk/jm/res/values/jm_public.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <public name="jm_radius" type="attr" id="0x7f011000"/>
-</resources>