适配乐变热更sdk

.gitignore

@@ -1,64 +1,3 @@
-<<<<<<< HEAD
-# ---> Python
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
 /game
 /gen
 /target
@@ -72,3 +11,4 @@ __pycache__
 /android_sdk
 /apks
 .svn
+/outPath

config_utils.py

@@ -1,17 +1,18 @@
 import time
 
 logSdkMapping = {
-    'jrtt':'com.jmhy.sdk.statistics.JrttStatistics',
-    'gdt':'com.jmhy.sdk.statistics.GdtStatistics',
-    'ks':'com.jmhy.sdk.statistics.KsStatistics',
-    'uc':'com.jmhy.sdk.statistics.UcStatistics',
-    'bd':'com.jmhy.sdk.statistics.BaiduStatistics'
+    'jrtt': 'com.jmhy.sdk.statistics.JrttStatistics',
+    'gdt': 'com.jmhy.sdk.statistics.GdtStatistics',
+    'ks': 'com.jmhy.sdk.statistics.KsStatistics',
+    'uc': 'com.jmhy.sdk.statistics.UcStatistics',
+    'bd': 'com.jmhy.sdk.statistics.BaiduStatistics'
 }
 
+
 def checkConfig(config):
-    '''
+    """
     检查配置
-    '''
+    """
     print('check config ...')
     if type(config) == dict:
         return checkChannelConfig(config)
@@ -21,6 +22,7 @@ def checkConfig(config):
                 return False
     return True
 
+
 def checkChannelConfig(config):
     if 'name' not in config or 'packageName' not in config:
         print('name or packageName not exists in config')
@@ -54,29 +56,29 @@ def checkChannelConfig(config):
         log = config['logSdk']
         setLog(config, log)
 
-
-
     return True
 
-def setLog(config, logSdk):
+
+def setLog(config, log_sdk):
     clazzList = []
-    for log in logSdk:
+    for log in log_sdk:
         if log in logSdkMapping:
             clazzList.append(logSdkMapping[log])
-        
+
     configData = None
     if 'configData' in config:
         configData = config['configData']
         configData['jm_log_sdk'] = clazzList
     else:
         config['configData'] = {
-            'jm_log_sdk':clazzList
+            'jm_log_sdk': clazzList
         }
 
+
 def replaceArgs(config):
-    '''
+    """
     替换占位符
-    '''
+    """
     if type(config) == dict:
         replaceItemArgs(config)
     elif type(config) == list:
@@ -84,10 +86,11 @@ def replaceArgs(config):
         for arg in config:
             replaceItemArgs(arg)
 
+
 def replaceItemArgs(config):
-    '''
+    """
     替换占位符
-    '''
+    """
     # 遍历字典
     for arg in config:
         if type(config[arg]) == dict:
@@ -95,28 +98,31 @@ def replaceItemArgs(config):
         elif type(config[arg]) == str:
             replaceString(config, arg)
 
+
 def replaceString(config, arg):
-    '''
+    """
     替换占位符
-    '''
+    """
     content = config[arg]
     if '${DATE}' in content:
         content = content.replace('${DATE}', getDate())
 
     config[arg] = content
 
+
 def getDate():
-    '''
+    """
     获取日期
-    '''
+    """
     return time.strftime("%Y%m%d", time.localtime())
 
+
 def getTime(seconds):
-    '''
+    """
     获取时间
-    '''
+    """
     time = int(seconds)
     if time < 60:
         return str(time) + '秒'
     else:
-        return str(round(time/60)) + '分' + str(time%60) + '秒'
+        return str(round(time / 60)) + '分' + str(time % 60) + '秒'

game_utils.py

@@ -8,27 +8,27 @@ namespaces = {'android': 'http://schemas.android.com/apk/res/android'}
 encoding = 'UTF-8'
 
 
-def sdkLebianChange(game, sdk, config):
-    '''
+def handle_lebian_sdk_manifest(game, sdk, config):
+    """
     乐变的处理，理论上只需要有接入的游戏需要处理
     考虑到技术人员不可控，所以每个游戏都处理
-    '''
+    """
     print('change Provider Authorities')
 
     subChannel = config['subChannel']
 
     decompliePath = file_utils.get_decompile_path(game, sdk, subChannel, config['cache'])
     manifest = os.path.join(decompliePath, 'AndroidManifest.xml')
-    changeProviderAuthorities(manifest, config['packageName'])
+    change_provider_authorities(manifest, config['packageName'])
     return 0
 
 
-def changeProviderAuthorities(manifest, packageName):
-    '''
+def change_provider_authorities(manifest, package_name):
+    """
     标识为com.excelliance
     更改provider的android:authorities
     更改activity的android:taskAffinity
-    '''
+    """
     for key in namespaces:
         ET.register_namespace(key, namespaces[key])
 
@@ -46,7 +46,7 @@ def changeProviderAuthorities(manifest, packageName):
         if packageTag not in authorities:
             continue
 
-        auth = packageName + authorities[authorities.index(':'):]
+        auth = package_name + authorities[authorities.index(':'):]
         provider.attrib[attrAuthorities] = auth
 
     attrName = xml_utils.get_namespaces_format('android:name', namespaces)
@@ -57,6 +57,6 @@ def changeProviderAuthorities(manifest, packageName):
             continue
 
         if attrTaskAffinity in activity.attrib:
-            activity.attrib[attrTaskAffinity] = packageName
+            activity.attrib[attrTaskAffinity] = package_name
 
     tree.write(manifest, encoding)

package_test.py

@@ -1,71 +1,4 @@
-import package_utils
-import file_utils
-import xml_utils
-import config_utils
-import os
-import os.path
-import json
+import package_web
 
-
-def packTest():
-    '''
-    测试代码
-    '''
-    game = 'qyj2'
-    sdk = 'jm'
-    subChannel = 'jm'
-
-    channelPath = file_utils.getChannelPath('', game, sdk)
-    print('channel_path :%s', channelPath)
-    configPath = os.path.join(channelPath, 'config.json')
-    jsonText = file_utils.read_file(configPath)
-    config = json.loads(jsonText)
-    config_utils.replaceArgs(config)
-
-    config = getItemConfig(config, subChannel)
-    if config is None:
-        return 1
-
-    package_utils.decomplie(game, sdk, subChannel, config)
-    package_utils.remove_no_support_attr(game, sdk, subChannel, config)
-    package_utils.merge_drawable_res(game, sdk, subChannel, config)
-    package_utils.remove_same_values_res(game, sdk, subChannel, config)
-    package_utils.copy_res(game, sdk, subChannel, config)
-    package_utils.merge_manifest_res(game, sdk, subChannel, config)
-    package_utils.change_placeholders(game, sdk, subChannel, config)
-    package_utils.add_meta_data(game, sdk, subChannel, config)
-    package_utils.copy_app_res(game, sdk, subChannel, config)
-    package_utils.change_package_name(game, sdk, subChannel, config)
-    package_utils.change_app_name(game, sdk, subChannel, config)
-    package_utils.change_app_icon(game, sdk, subChannel, config)
-    package_utils.add_launcher(game, sdk, subChannel, config)
-    package_utils.pack_jar(game, sdk, subChannel, config)
-    package_utils.do_sdk_post_script(game, sdk, config)
-    package_utils.do_game_post_script(game, sdk, config)
-    package_utils.generateNewRFile(game, sdk, subChannel, config)
-    package_utils.split_dex(game, sdk, subChannel, config)
-    package_utils.recomplie(game, sdk, subChannel, config)
-    package_utils.alignApk(game, sdk, subChannel, config)
-    package_utils.apk_signer_apk(game, sdk, subChannel, config)
-    package_utils.clearTemp(game, sdk, subChannel, config)
-
-
-def getCmd(cmd):
-    p = os.popen(cmd)
-    content = p.read()
-    # print(content)
-    return content
-
-
-def getItemConfig(config, subChannel):
-    if type(config) == dict:
-        if subChannel is None or config['subChannel'] == subChannel:
-            return config
-    elif type(config) == list:
-        for itemConfig in config:
-            if subChannel is None or itemConfig['subChannel'] == subChannel:
-                return subChannel
-    return None
-
-
-packTest()
+if __name__ == '__main__':
+    package_web.package_test('/Users/suyghur/Develop/yyxx/qs/test_config/test.json')

package_utils.py

@@ -135,7 +135,7 @@ def pack_v1(game, sdk, sub_channel, config):
     if ret:
         return ret
     # 乐变sdk的特殊处理
-    ret = game_utils.sdkLebianChange(game, sdk, config)
+    ret = game_utils.handle_lebian_sdk_manifest(game, sdk, config)
     if ret:
         return ret
     # 游戏脚本处理
@@ -285,9 +285,12 @@ def pack_v2(game, sdk, sub_channel, config):
     ret = pack_jar(game, sdk, sub_channel, config)
     if ret:
         return ret
-
     # sdk脚本处理
     ret = do_sdk_post_script(game, sdk, config)
+    if ret:
+        return ret
+        # 乐变sdk的特殊处理
+    ret = game_utils.handle_lebian_sdk_manifest(game, sdk, config)
     if ret:
         return ret
     # 游戏脚本处理
@@ -515,6 +518,11 @@ def remove_v2_old_res(game, sdk, sub_channel, config):
     print('remove v2 sdk old res...')
     decompile_path = file_utils.get_decompile_path(game, sdk, sub_channel, config['cache'])
     res_path = os.path.join(decompile_path, 'res')
+    public_xml = os.path.join(res_path, 'values', 'public.xml')
+    # 移除public.xml
+    if os.path.exists(public_xml):
+        print('remove public.xml')
+        os.remove(public_xml)
     sub_folders = os.listdir(res_path)
     for folder in sub_folders:
         sub_folder_path = os.path.join(res_path, folder)
@@ -536,6 +544,7 @@ def remove_same_values_res(game, sdk, sub_channel, config):
     """
     # 读取sdk的资源
     print('remove same res...')
+    decompile_path = file_utils.get_decompile_path(game, sdk, sub_channel, config['cache'])
     sdk_path = file_utils.get_full_sdk_path(sdk)
     sdk_res_path = os.path.join(sdk_path, 'res')
     print('sdk res path: %s' % sdk_res_path)
@@ -556,7 +565,6 @@ def remove_same_values_res(game, sdk, sub_channel, config):
         return 0
 
     # 移除相同的资源
-    decompile_path = file_utils.get_decompile_path(game, sdk, sub_channel, config['cache'])
     resPath = os.path.join(decompile_path, 'res')
     for path in os.listdir(resPath):
         if not path.startswith('values'):

package_web.py

@@ -372,6 +372,6 @@ def get_script_mapping(sdk):
     return sdk
 
 
-# packageWeb()
-if __name__ == '__main__':
-    package_test('/Users/suyghur/Develop/yyxx/qs/test_config/test.json')
+packageWeb()
+# if __name__ == '__main__':
+#     package_test('/Users/suyghur/Develop/yyxx/qs/test_config/test.json')

sdk/qingshi/assets/supplierconfig.json

@@ -0,0 +1,13 @@
+{
+  "supplier": {
+    "vivo": {
+      "appid": "100215079"
+    },
+    "xiaomi": {
+    },
+    "huawei": {
+    },
+    "oppo": {
+    }
+  }
+}

test_config/test.json

@@ -1,11 +1,11 @@
 {
   "sdk": "jmsdk",
-  "app": "qc",
-  "package": "/Users/suyghur/Develop/yyxx/qs/apks/demo-release.apk",
-  "packageName": "com.slhz.qs.cn",
-  "name": "\u5341\u91cc\u7ea2\u5986",
-  "subChannel": "slhz",
-  "outName": "50h26hlo",
+  "app": "y07",
+  "package": "/Users/suyghur/Develop/yyxx/qs/apks/Y07.apk",
+  "packageName": "com.y07.qs.cn",
+  "name": "Y07",
+  "subChannel": "y07",
+  "outName": "825z3sat",
   "outPath": "/Users/suyghur/Develop/yyxx/qs/outPath",
   "changeIcon": "false",
   "addLauncher": "false",
@@ -16,23 +16,17 @@
   "copyList": [
   ],
   "properties": {
-    "version": "20211118",
-    "agent": "50h26hlo",
-    "host": "https:\/\/test-aduc.qingshigame.com",
-    "appid": 363,
-    "appkey": "b208299b507448e5df17f88f419bd7ec"
+    "version": "20211119",
+    "agent": "825z3sat",
+    "host": "https://test-aduc.qingshigame.com",
+    "appid": 399,
+    "appkey": "f8f6a11422f3940d0a2583944701e760"
   },
   "refactorSdk": "true",
-  "testGcpCode": "test1231",
+  "testGcpCode": "123455",
   "ext": {
-    "file_name": "qc_tt_50h26hlo.apk",
-    "shorthand": "tt"
-  },
-  "tt_params": {
-    "app_id": "215557",
-    "app_name": "slhz",
-    "app_name_cn": "\u5341\u91cc\u7ea2\u5986",
-    "package_name": "com.slhz.qs.cn"
+    "file_name": "",
+    "shorthand": "zrl"
   },
   "targetSdkVersion": 26
 }