今日头条jar添加订单过滤

ReplaceJar&Res.py

@@ -24,6 +24,8 @@ sdkpath = script_path + '/sdk'
 
 ignore_path_text = [".a", ".storyboard", ".py",".framework",".DS_Store",".xcuserstate",".jpg",".png"]
 
+ignore_sdk = ['yfsdk']
+
 keyFile = 'zooKeys.json'
 
 
@@ -71,6 +73,8 @@ def replaceJar():
     #修改config字段 及替换Jar包
     list = os.listdir(sdkpath)
     for l in list:
+        if l in ignore_sdk:
+            continue
         full_l_path = os.path.join(sdkpath,l)
         full_lib_path = os.path.join(full_l_path,'libs')
         if os.path.isdir(full_l_path):

file_utils.py

@@ -31,6 +31,13 @@ def getFullLogSDKPath(sdk):
     '''
     return getFullPath('log_sdk', sdk)
 
+
+def getFullOaidSDKPath(version):
+    '''
+    获取logsdk的目录
+    '''
+    return getFullPath('oaid_sdk', version)
+
 def getDecompliePath(game, sdk, subChannel, cache):
     '''
     获取解包的目录

oaid_sdk/1.0.10/assets/supplierconfig.json

@@ -0,0 +1,16 @@
+{
+  "supplier":{
+    "vivo":{
+    },
+    "xiaomi":{
+
+    },
+    "huawei":{
+
+    },
+    "oppo":{
+
+    }
+  }
+
+}

oaid_sdk/1.0.10/manifest.xml

@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<permissions>
+		    <uses-permission android:name="com.asus.msa.SupplementaryDID.ACCESS" />
+	</permissions>
+
+</manifest>

package_utils.py

@@ -127,12 +127,19 @@ def pack(game, sdk, config):
     if ret:
         return ret
 
+
     # log sdk
     if 'logSdk' in config:
         for log in config['logSdk']:
             ret = addLogSdk(game, sdk, subChannel, config, log)
             if ret:
                 return ret
+
+    # oaid sdk
+    ret = addOaidSdk(game, sdk, subChannel, config, "1.0.10")
+    if ret:
+        return ret
+
     # 生成R文件
     '''ret = generateNewRFile(game, sdk, subChannel, config)
     if ret:
@@ -744,6 +751,52 @@ def addLogSdk(game, sdk, subChannel, config, logSdk):
 
     return packLogJar(game, sdk, subChannel, config, logSdk)
 
+
+def addOaidSdk(game, sdk, subChannel, config, oaidVersion):
+
+    sdkPath = file_utils.getFullOaidSDKPath(oaidVersion)
+    decompliePath = file_utils.getDecompliePath(game, sdk, subChannel, config['cache'])
+
+    # 拷贝assets
+    print('copy oaid assets...')
+    assetsPath = file_utils.getFullPath(sdkPath, 'assets')
+    decomplieAssetsPath = file_utils.getFullPath(decompliePath, 'assets')
+    if os.path.exists(assetsPath):
+        ret = file_utils.copyFileAllDir(assetsPath, decomplieAssetsPath)
+        if ret:
+            return ret
+
+
+    # 拷贝jniLibs
+
+    print('copy oaid jniLibs...')
+    jniPath = file_utils.getFullPath(sdkPath, 'jniLibs')
+    decomplieJniPath = file_utils.getFullPath(decompliePath, 'lib')
+    abiFilters = []
+    if os.path.exists(decomplieJniPath):
+        for abi in os.listdir(decomplieJniPath):
+            if abi == 'armeabi-v7a' or abi == 'armeabi':
+                abiFilters.append(abi)
+    else:
+        abiFilters = ['armeabi-v7a']
+
+    if os.path.exists(jniPath):
+        ret = file_utils.copyFileAllDir(jniPath, decomplieJniPath, False, abiFilters)
+        if ret:
+            return ret
+
+    print('merge oaid AndroidManifest...')
+    libManifest = file_utils.getFullPath(sdkPath, 'manifest.xml')
+    if os.path.exists(libManifest):
+        manifest = os.path.join(decompliePath, 'AndroidManifest.xml')
+        ret = xml_utils.mergeManifestRes(manifest, libManifest)
+        if ret:
+            return ret
+
+    return packOaidJar(game, sdk, subChannel, config, oaidVersion)
+
+
+
 def generateNewRFile(game, sdk, subChannel, config):
     '''
     生成新的R文件
@@ -981,7 +1034,69 @@ def packLogJar(game, sdk, subChannel, config, logSdk):
     return 0
 
 
+def packOaidJar(game, sdk, subChannel, config, oaidVerion):
+    '''
+    打包oaid jar
+    '''
+    decompliePath = file_utils.getDecompliePath(game, sdk, subChannel, config['cache'])
+    outPath = file_utils.getFullPath(decompliePath, 'gen')
+
+    if not os.path.exists(outPath):
+        os.makedirs(outPath)
 
+    if config['aapt2disable']:
+        dx = file_utils.getDxPath()
+        dexCmd = '--dex --multi-dex --no-warning --output="%s"' % outPath
+    else:
+        dx = file_utils.getD8Path()
+        androidPlatforms = file_utils.getAndroidCompileToolPath()
+        dexCmd = '--lib "%s" --output "%s"' % (androidPlatforms, outPath)
+
+    # 找到所有lib依赖
+    sdkPath = file_utils.getFullOaidSDKPath(oaidVerion)
+    libs = os.path.join(sdkPath, 'libs')
+    libConfig = os.path.join(libs, 'config.json')
+
+    # 存在配置文件
+    # if os.path.exists(libConfig):
+    #     jsonText = file_utils.readFile(libConfig)
+    #     libList = json.loads(jsonText)
+    #     for jar in libList:
+    #         if not jar.endswith('.jar'):
+    #             continue
+    #         dexCmd += ' ' + os.path.join(libs, jar)
+    # else:
+    #     for jar in os.listdir(libs):
+    #         if not jar.endswith('.jar'):
+    #             continue
+    #         dexCmd += ' ' + os.path.join(libs, jar)
+
+    # sdk实现类
+    print('packageing oaid jar ...')
+    dexCmd += ' ' + os.path.join(libs, 'miit_mdid_%s.jar' % oaidVerion)
+    ret = file_utils.execJarCmd(dx, dexCmd)
+    if ret:
+        return ret
+
+    # 反向dex生成smali
+    # 存放在out目录
+    print('baksmali classes.dex ...')
+    outDex = os.path.join(outPath, 'classes.dex')
+    baksmaliPath = file_utils.getBaksmaliPath()
+    outPath = file_utils.getFullPath(decompliePath, 'out')
+
+    ret = file_utils.execJarCmd(baksmaliPath, 'd "%s" -o "%s"' % (outDex, outPath))
+    if ret:
+        return ret
+
+    # 将生成的文件拷贝到目标目录
+    print('copy all log smali ...')
+    smaliPath = file_utils.getFullPath(decompliePath, 'smali')
+    ret = file_utils.copyFileAllDir(outPath, smaliPath, True)
+    if ret:
+        return ret
+
+    return 0
 
 
 def splitDex(game, sdk, subChannel, config):

sdk/jm/libs/config.json

@@ -5,6 +5,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_beiyu/libs/config.json

@@ -17,6 +17,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_cangyu/libs/config.json

@@ -6,6 +6,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_erjiuyouaz/libs/config.json

@@ -7,7 +7,7 @@
 		"29game-sdk-2.8.8.jar",
 		"gson-2.8.5.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar",
+		"jm_sdk_20200415.jar",
 		"android-support-v7-appcompat.jar"
 	]
 }

sdk/jm_jq/libs/config.json

@@ -7,6 +7,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_oppo/libs/config.json

@@ -6,7 +6,7 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	],
 	"nopay":[
 		"gamesdk-20180621.jar",
@@ -15,6 +15,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_nopay_20200221.jar"
+		"jm_sdk_nopay_20200415.jar"
 	]
 }

sdk/jm_quick/libs/config.json

@@ -6,7 +6,7 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	],
 	"nopay":[
 		"quicksdk_v2.3.6_20190507.jar",
@@ -15,6 +15,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_nopay_20200221.jar"
+		"jm_sdk_nopay_20200415.jar"
 	]
 }

sdk/jm_qytx/libs/config.json

@@ -6,7 +6,7 @@
 		"qytx_pro_3.4.1.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	],
 	"nopay":[
 		"android-support-v4.jar",
@@ -15,6 +15,6 @@
 		"qytx_pro_3.4.1.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_nopay_20200221.jar"
+		"jm_sdk_nopay_20200415.jar"
 	]
 }

sdk/jm_tianyu/libs/config.json

@@ -6,6 +6,6 @@
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
 		"ty_game_1.3.0.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_tianyuyou/libs/config.json

@@ -5,7 +5,7 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar",
+		"jm_sdk_20200415.jar",
 		"wftsdk_wap_2.1.jar",
 		"wftsdk3.0.jar",
 		"tyysdk.jar",

sdk/jm_xingmuyou/libs/config.json

@@ -14,6 +14,6 @@
 		"tracking1.4.2.jar",
 		"rxpermissions.jar",
 		"gson-2.8.5.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_xq/libs/config.json

@@ -9,6 +9,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_xq_jrtt/libs/config.json

@@ -12,6 +12,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_yaodian/libs/config.json

@@ -4,6 +4,6 @@
 		"android-support-v4.jar",
 		"commons-httpclient-3.1.jar",
 		"org.apache.http.legacy.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_yijie/libs/config.json

@@ -8,6 +8,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_ysdk/libs/config.json

@@ -7,6 +7,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20200221.jar"
+		"jm_sdk_20200415.jar"
 	]
 }

sdk/jm_zy_ysdk/libs/config.json

@@ -3,7 +3,7 @@
 		"android-support-v4.jar",
 		"commons-httpclient-3.1.jar",
 		"gson-2.5.jar",
-		"jm_sdk_20200221.jar",
+		"jm_sdk_20200415.jar",
 		"okhttp-2.4.0.jar",
 		"okio-1.8.0.jar",
 		"org.apache.http.legacy.jar",