修复打包工具悟空游打包问题

 # Built application files
 
-# Files for the Dalvik VM
-*.dex
-
 # Java class files
 *.class
 
@@ -72,11 +69,5 @@ games/
 # python打包缓存目录不需要提交
 /__pycache__/
 
-/tool/Python36/Lib/__pycache__/
-/tool/Python36/Lib/collections/__pycache__/
-/tool/Python36/Lib/encodings/__pycache__/
-/tool/Python36/Lib/importlib/__pycache__/
-/tool/Python36/Lib/json/__pycache__/
-/tool/Python36/Lib/xml/dom/__pycache__/
-/tool/Python36/Lib/xml/__pycache__/
-/tool/Python36/Lib/xml/etree/__pycache__/
\ No newline at end of file
+
+**/__pycache__/
\ No newline at end of file

@@ -22,62 +22,9 @@ androidNS = 'http://schemas.android.com/apk/res/android'
 
 
 def execute(channel, decompileDir, packageName):
-    replace_applicationId_to_AndroidManifest(decompileDir, packageName)
-
-    # write_params_to_config(channel, decompileDir)
-
-    # modify_main_activity_smali(decompileDir)
-
-    # addWXEntryActivity(channel, decompileDir, packageName)
-
-    return 0
-
-def replace_applicationId_to_AndroidManifest(decompileDir, packageName):
-    manifestPath = decompileDir + '/AndroidManifest.xml'
-    manifest_file = open(manifestPath, 'r+', encoding='Utf-8')
-    manifestContent = str(manifest_file.read())
-    manifest_file.close()
-
-    # 4、replace "${applicationId}" "${JPUSH_PKGNAME}" with packname in AndroidManifest.xml
-    manifestContent = manifestContent.replace('${applicationId}', packageName)
-
-    manifest_new_file = open(manifestPath, 'w', encoding='Utf-8')
-    manifest_new_file.write(manifestContent)
-    manifest_new_file.close()
-
+    modify_main_activity_smali(decompileDir)
     return 0
 
-def write_params_to_config(channel, decompileDir):
-    Pid = '104136'
-    PKey = 'ISw/GOMBIDOSCzcXLy/XA5/DgXGKsA8Syzikka0V/41T2EPWCYAV0d5lcz1enF62'
-    AppVersion = '1.0'
-    ScreenType = '1'
-    if channel['params'] != None and len(channel['params']) > 0:
-        for param in channel['params']:
-            if param['name'] == 'Pid':
-                Pid = param['value']
-            elif param['name'] == 'PKey':
-                PKey = param['value']
-            elif param['name'] == 'AppVersion':
-                AppVersion = param['value']
-            elif param['name'] == 'ScreenType':
-                ScreenType = param['value']
-
-    developer_config_path = decompileDir + '/assets/ouni_config.info'
-    euConfigFile = open(developer_config_path, 'r+', encoding='Utf-8')
-    configContent = str(euConfigFile.read())
-    euConfigFile.close()
-
-    configContent = configContent.replace('youlong_Pid_104136', Pid)
-    configContent = configContent.replace('youlong_PKey_ISw/GOMBIDOSCzcXLy/XA5/DgXGKsA8Syzikka0V/41T2EPWCYAV0d5lcz1enF62', PKey)
-    configContent = configContent.replace('youlong_AppVersion_1.0', AppVersion)
-    configContent = configContent.replace('youlong_ScreenType_1', ScreenType)
-
-    developer_config_file = open(developer_config_path, 'w', encoding='Utf-8')
-    developer_config_file.write(configContent)
-    developer_config_file.close()
-
-    return 0
 
 def modify_main_activity_smali(decompileDir):
     
@@ -167,30 +114,3 @@ def modify_main_activity_smali(decompileDir):
     f2.close()
 
     return 0
\ No newline at end of file
-
-def addWXEntryActivity(channel, decompileDir, packageName):
-    sdkDir = decompileDir + '/../sdk/' + channel['sdk']
-    if not os.path.exists(sdkDir):
-        file_utils.printF("The sdk temp folder is not exists. path:" + sdkDir)
-        return 1
-
-    sourcefile = sdkDir + '/WXEntryActivity/WXEntryActivity.smali'
-    if not os.path.exists(sourcefile):
-        return 1
-
-    packageDir = packageName.replace('.', '/')
-    destfile = decompileDir + '/smali/' + packageDir + '/wxapi/WXEntryActivity.smali'
-
-    destdir = os.path.dirname(destfile)
-    if not os.path.exists(destdir):
-        os.makedirs(destdir)
-
-    euConfigFile = open(sourcefile, 'r+', encoding='Utf-8')
-    configContent = str(euConfigFile.read())
-    euConfigFile.close()
-
-    configContent = configContent.replace('Lcom/stss/sdk/WXEntryActivity', 'L' + packageDir + '/wxapi/WXEntryActivity')
-
-    developer_config_file = open(destfile, 'w', encoding='Utf-8')
-    developer_config_file.write(configContent)
-    developer_config_file.close()
\ No newline at end of file

@@ -26,7 +26,6 @@
     <dimen name="umcsdk_smscode_margin">30dp</dimen>
     <dimen name="umcsdk_title_height">50dp</dimen>
     <dimen name="umcsdk_version_margin">20dp</dimen>
-    <string name="app_name">CtApiSdk</string>
     <string name="umcsdk_account_login">使用历史帐号快速登录</string>
     <string name="umcsdk_account_name">中国移动互联网通行证</string>
     <string name="umcsdk_auto_login">本机号码登录</string>

@@ -70,7 +70,7 @@
 .method public onBackPressed()V
     .locals 3
 
-    .line 108
+    .line 107
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -85,10 +85,10 @@
 
     const-string v2, "WuKongYou sdk onBackPressed"
 
-    .line 110
+    .line 109
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 111
+    .line 110
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -102,7 +102,7 @@
 .method public onConfigurationChanged(Landroid/content/res/Configuration;)V
     .locals 3
 
-    .line 117
+    .line 116
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -117,10 +117,10 @@
 
     const-string v2, "WuKongYou sdk onConfigurationChanged"
 
-    .line 119
+    .line 118
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 120
+    .line 119
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -166,7 +166,7 @@
 .method public onDestroy()V
     .locals 3
 
-    .line 90
+    .line 89
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -181,10 +181,10 @@
 
     const-string v2, "WuKongYou sdk onDestroy"
 
-    .line 92
+    .line 91
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 93
+    .line 92
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -198,7 +198,7 @@
 .method public onNewIntent(Landroid/content/Intent;)V
     .locals 3
 
-    .line 72
+    .line 71
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -213,10 +213,10 @@
 
     const-string v2, "WuKongYou sdk onNewIntent"
 
-    .line 74
+    .line 73
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 75
+    .line 74
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -249,17 +249,6 @@
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
     .line 56
-    invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
-
-    .line 57
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -273,7 +262,7 @@
 .method public onRequestPermissionsResult(I[Ljava/lang/String;[I)V
     .locals 3
 
-    .line 126
+    .line 125
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -288,10 +277,10 @@
 
     const-string v2, "WuKongYou sdk onRequestPermissionsResult"
 
-    .line 128
+    .line 127
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 129
+    .line 128
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -305,7 +294,7 @@
 .method public onRestart()V
     .locals 3
 
-    .line 99
+    .line 98
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -320,10 +309,10 @@
 
     const-string v2, "WuKongYou sdk onRestart"
 
-    .line 101
+    .line 100
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 102
+    .line 101
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -337,7 +326,7 @@
 .method public onResume()V
     .locals 3
 
-    .line 63
+    .line 62
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -352,10 +341,10 @@
 
     const-string v2, "WuKongYou sdk onResume"
 
-    .line 65
+    .line 64
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 66
+    .line 65
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1
@@ -401,7 +390,7 @@
 .method public onStop()V
     .locals 3
 
-    .line 81
+    .line 80
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v0
@@ -416,10 +405,10 @@
 
     const-string v2, "WuKongYou sdk onStop"
 
-    .line 83
+    .line 82
     invoke-static {v1, v2}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 84
+    .line 83
     invoke-static {}, Lcom/wukongyou/sdk/core/WKYGame;->getInstance()Lcom/wukongyou/sdk/core/WKYGame;
 
     move-result-object v1

@@ -7,7 +7,7 @@
 .method public constructor <init>()V
     .locals 0
 
-    .line 21
+    .line 22
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -18,7 +18,7 @@
 
     const/4 p2, 0x0
 
-    .line 28
+    .line 29
     :try_start_0
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
@@ -34,7 +34,7 @@
 
     if-eqz v0, :cond_3
 
-    .line 29
+    .line 30
     :try_start_1
     invoke-virtual {v0}, Lcom/stss/sdk/verify/STSSUToken;->getToken()Ljava/lang/String;
 
@@ -47,7 +47,7 @@
     :cond_0
     if-eqz p1, :cond_2
 
-    .line 34
+    .line 35
     invoke-virtual {p1}, Lcom/stss/sdk/bean/STSSPayParams;->toMap()Ljava/util/Map;
 
     move-result-object v2
@@ -66,7 +66,7 @@
 
     goto/16 :goto_0
 
-    .line 38
+    .line 39
     :cond_1
     new-instance v2, Ljava/util/HashMap;
 
@@ -74,7 +74,7 @@
 
     const-string v3, "game_id"
 
-    .line 39
+    .line 40
     new-instance v4, Ljava/lang/StringBuilder;
 
     invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
@@ -99,7 +99,7 @@
 
     const-string v3, "channel_id"
 
-    .line 40
+    .line 41
     sget-object v4, Lcom/stss/sdk/constant/STSSConstants;->sdkParams:Lcom/stss/sdk/SDKParams;
 
     invoke-virtual {v4}, Lcom/stss/sdk/SDKParams;->getCurrChannel()Ljava/lang/String;
@@ -110,7 +110,7 @@
 
     const-string v3, "game_uid"
 
-    .line 41
+    .line 42
     invoke-virtual {v0}, Lcom/stss/sdk/verify/STSSUToken;->getGame_uid()Ljava/lang/String;
 
     move-result-object v4
@@ -119,7 +119,7 @@
 
     const-string v3, "channel_uid"
 
-    .line 42
+    .line 43
     invoke-virtual {v0}, Lcom/stss/sdk/verify/STSSUToken;->getChannel_uid()Ljava/lang/String;
 
     move-result-object v0
@@ -128,7 +128,7 @@
 
     const-string v0, "imei"
 
-    .line 43
+    .line 44
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v3
@@ -147,32 +147,32 @@
 
     const-string v3, "1"
 
-    .line 44
+    .line 45
     invoke-interface {v2, v0, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    .line 45
+    .line 46
     invoke-virtual {p1}, Lcom/stss/sdk/bean/STSSPayParams;->toMap()Ljava/util/Map;
 
     move-result-object v0
 
     invoke-interface {v2, v0}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
-    .line 47
+    .line 48
     invoke-static {v2}, Lcom/stss/sdk/utils/STSSAggJsonUtils;->sortMapByKey(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object v0
 
-    .line 48
+    .line 49
     invoke-static {v0}, Lcom/stss/sdk/utils/STSSAggJsonUtils;->reqDataMD5(Ljava/util/Map;)Ljava/lang/String;
 
     move-result-object v0
 
-    .line 50
+    .line 51
     invoke-static {}, Lcom/stss/sdk/utils/http/HttpParamsUtils;->getCommonParams()Ljava/util/HashMap;
 
     move-result-object v2
 
-    .line 51
+    .line 52
     invoke-virtual {p1}, Lcom/stss/sdk/bean/STSSPayParams;->toMap()Ljava/util/Map;
 
     move-result-object p1
@@ -181,10 +181,10 @@
 
     const-string p1, "sign"
 
-    .line 52
+    .line 53
     invoke-interface {v2, p1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    .line 54
+    .line 55
     new-instance p1, Ljava/lang/StringBuilder;
 
     invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
@@ -205,12 +205,12 @@
 
     invoke-static {v1, p1}, Lcom/stss/sdk/utils/STSSAggLog;->dLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 55
+    .line 56
     invoke-static {p0, v2}, Lcom/stss/sdk/utils/http/STSSAggHttpUtils;->httpPost(Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
 
     move-result-object p0
 
-    .line 56
+    .line 57
     new-instance p1, Ljava/lang/StringBuilder;
 
     invoke-direct {p1}, Ljava/lang/StringBuilder;-><init>()V
@@ -227,7 +227,7 @@
 
     invoke-static {v1, p1}, Lcom/stss/sdk/utils/STSSAggLog;->wLog(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 57
+    .line 58
     invoke-static {p0}, Lcom/stss/sdk/request/STSSCreateOrder;->parseOrderResult(Ljava/lang/String;)Lcom/stss/sdk/bean/STSSOrder;
 
     move-result-object p0
@@ -242,7 +242,7 @@
     :goto_1
     const-string p0, "The user now not logined. the token is null"
 
-    .line 30
+    .line 31
     invoke-static {v1, p0}, Lcom/stss/sdk/utils/STSSAggLog;->eLog(Ljava/lang/String;Ljava/lang/String;)V
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
@@ -252,7 +252,7 @@
     :catch_0
     move-exception p0
 
-    .line 59
+    .line 60
     invoke-virtual {p0}, Ljava/lang/Exception;->printStackTrace()V
 
     return-object p2
@@ -263,7 +263,7 @@
 
     const/4 v0, 0x0
 
-    .line 66
+    .line 67
     :try_start_0
     new-instance v1, Lorg/json/JSONObject;
 
@@ -271,7 +271,7 @@
 
     const-string p0, "code"
 
-    .line 67
+    .line 68
     invoke-virtual {v1, p0}, Lorg/json/JSONObject;->getInt(Ljava/lang/String;)I
 
     move-result p0
@@ -282,12 +282,15 @@
 
     const-string p0, "msg"
 
-    .line 69
+    .line 70
     invoke-virtual {v1, p0}, Lorg/json/JSONObject;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
 
-    .line 70
+    .line 71
+    invoke-static {}, Landroid/os/Looper;->prepare()V
+
+    .line 72
     invoke-static {}, Lcom/stss/sdk/STSSAggSdk;->getInstance()Lcom/stss/sdk/STSSAggSdk;
 
     move-result-object v1
@@ -323,12 +326,12 @@
     :cond_0
     const-string p0, "data"
 
-    .line 73
+    .line 75
     invoke-virtual {v1, p0}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
 
     move-result-object p0
 
-    .line 74
+    .line 76
     new-instance v1, Lcom/stss/sdk/bean/STSSOrder;
 
     const-string v3, "order_code"
@@ -345,7 +348,7 @@
 
     const-string v5, "extension"
 
-    .line 75
+    .line 77
     invoke-virtual {p0, v5}, Lorg/json/JSONObject;->getString(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p0
@@ -359,7 +362,7 @@
     :catch_0
     move-exception p0
 
-    .line 77
+    .line 79
     invoke-virtual {p0}, Ljava/lang/Exception;->printStackTrace()V
 
     return-object v0