|
@@ -548,14 +548,14 @@ def addConfig(game, sdk, subChannel, config):
|
|
|
'''
|
|
|
添加config.json
|
|
|
'''
|
|
|
- if 'configData' not in config:
|
|
|
- print('configData is null')
|
|
|
+ if 'recordConfig' not in config:
|
|
|
+ print('recordConfig is null')
|
|
|
return 0
|
|
|
|
|
|
print('add config.json...')
|
|
|
decompliePath = file_utils.getDecompliePath(game, sdk, subChannel, config['cache'])
|
|
|
configJson = os.path.join(decompliePath, 'assets', 'tool_config.json')
|
|
|
- jsonText = json.dumps(config['configData'], ensure_ascii=False)
|
|
|
+ jsonText = json.dumps(config['recordConfig'], ensure_ascii=False)
|
|
|
file_utils.createFile(configJson, jsonText)
|
|
|
return 0
|
|
|
|
|
@@ -1166,6 +1166,7 @@ def writeActivityToManifest(targetManifest, config):
|
|
|
appNode = targetRoot.find('application')
|
|
|
activitys = appNode.findall('activity')
|
|
|
keyName = "{0}{1}{2}name".format("{",androidNS,"}")
|
|
|
+ theme = "{0}{1}{2}theme".format("{",androidNS,"}")
|
|
|
for activity in activitys:
|
|
|
activityName = activity.get(keyName)
|
|
|
if activityName.find('.EntryActivity')>=0:
|
|
@@ -1173,6 +1174,15 @@ def writeActivityToManifest(targetManifest, config):
|
|
|
newName = config['packageName'] + ".EntryActivity"
|
|
|
activity.set(keyName,newName)
|
|
|
print("EntryActivity change '{}' to '{}' ...".format(oldName, newName))
|
|
|
+ if activityName.find('com.tool.floatsdk.ui.WebActivity')>=0:
|
|
|
+ if activity.get(theme) is not None or activity.get(theme) != "":
|
|
|
+ del activity.attrib[theme]
|
|
|
+
|
|
|
+ perNode = targetRoot.find('permissions')
|
|
|
+ #permissions = perNode.findall('uses-permission')
|
|
|
+ print(perNode)
|
|
|
+ print("------------")
|
|
|
+
|
|
|
targetTree.write(targetManifest, 'UTF-8')
|
|
|
|
|
|
|