添加红手指sdk

sdk/jm_hongshouzhi/libs/config.json

@@ -1,5 +1,13 @@
 {
 	"default":[
+		"xUtils-2.5.5.jar",
+		"wftsdk2.0.jar",
+		"universal-image-loader-1.9.5.jar",
+		"commons-lang.jar",
+		"alipaySdk-20160809.jar",
+		"UPPayPluginExPro.jar",
+		"UPPayAssistEx.jar",
+		"huosdk_2.9.jar",
 		"android-support-v4.jar",
 		"commons-httpclient-3.1.jar",
 		"org.apache.http.legacy.jar",

sdk/jm_hongshouzhi/manifest.xml

@@ -7,6 +7,22 @@
 		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 		<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.BLUETOOTH"/>
+         <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!-- 在SDCard中创建与删除文件权限 -->
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	</permissions>
 
     <application>
@@ -54,5 +70,116 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
 
         <service android:name="com.jmhy.sdk.push.PushService" />
-    </application>
+
+        <activity
+            android:name="com.game.sdk.ui.ChargeActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Light.NoTitleBar" />
+        <activity
+            android:name="com.game.sdk.ui.LoginActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+        <!-- 浮点 -->
+        <activity
+            android:name="com.game.sdk.floatwindow.FloatWebActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:screenOrientation="behind"/>
+        <activity
+            android:name="com.game.sdk.floatwindow.NewFloatWebActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:screenOrientation="behind"/>
+        <activity
+            android:name="com.game.sdk.ui.AuthWebActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:screenOrientation="behind"/>
+        <activity
+            android:name="com.game.sdk.pay.nowpay.NowPayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:screenOrientation="behind"/>
+        <activity
+            android:name="com.game.sdk.pay.nowpay.PayWebActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:screenOrientation="behind"/>
+
+        <activity
+            android:name="com.alipay.sdk.auth.AuthActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:exported="false"
+            android:screenOrientation="behind" >
+        </activity>
+        <activity
+            android:name="com.game.sdk.pay.wftpay.WFTPayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+
+        <!-- alipay sdk begin -->
+        <activity
+            android:name="com.alipay.sdk.app.H5PayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:exported="false"
+            android:screenOrientation="behind"
+            android:windowSoftInputMode="adjustResize|stateHidden" >
+        </activity>
+        <activity
+            android:name="com.game.sdk.pay.alipay.AlipayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+
+        <!-- alipay sdk end -->
+        <activity
+            android:name="com.game.sdk.pay.ptbpay.PtbActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+        <activity
+            android:name="com.game.sdk.pay.yxbpay.GameCurrencyActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+
+        <!-- 微付通支付activity -->
+        <activity
+            android:name="com.switfpass.pay.activity.QQWapPayWebView"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <activity
+            android:name="com.game.sdk.pay.unionpay.UnionPayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+        <uses-library
+            android:name="org.simalliance.openmobileapi"
+            android:required="false" />
+
+        <activity
+            android:name="com.unionpay.uppay.PayActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="com.unionpay.UPPayWapActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+
+
+        <service android:name="com.game.sdk.YTAppService" />
+	</application>
 </manifest>

sdk/jm_hongshouzhi/res/values-sw600dp/dimens.xml

@@ -1,8 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here.
-    -->
-
-</resources>

sdk/jm_hongshouzhi/script/sdk_script.py

@@ -1,4 +1,5 @@
 import file_utils
+import xml_utils
 import os.path
 
 def execute(game, sdk, config):
@@ -8,8 +9,8 @@ def execute(game, sdk, config):
     subChannel = config['subChannel']
 
     createJmhyProperties(game, sdk, subChannel, config)
-    
-    return copyWechatCode(game, sdk, subChannel, config)
+
+    changeApplicationAttr(game, sdk, subChannel, config)
 
 def checkConfig(config):
     '''
@@ -46,24 +47,9 @@ def createJmhyProperties(game, sdk, subChannel, config):
     file_utils.createFile(properties, content)
     return 0
 
-def copyWechatCode(game, sdk, subChannel, config):
-    '''
-    拷贝微信sdk的代码
-    '''
-    print('copy WXPayEntryActivity.smali')
-    sdkPath = file_utils.getFullSDKPath(sdk)
-
-    WXPayEntryActivity = 'WXPayEntryActivity.smali'
 
-    wxFile = os.path.join(sdkPath, 'smali', WXPayEntryActivity)
+def changeApplicationAttr(game, sdk, subChannel, config):
     decompliePath = file_utils.getDecompliePath(game, sdk, subChannel, config['cache'])
-    smaliPath = os.path.join(decompliePath, 'smali')
-    targetPath = file_utils.getPackagePath(smaliPath, config['packageName'])
-    targetFile = os.path.join(targetPath, 'wxapi', WXPayEntryActivity)
-    ret = file_utils.copyFile(wxFile, targetFile)
-    if ret:
-        return ret
-
-    file_utils.replaceContent(targetFile, '${packageName}', config['packageName'].replace('.', '/'))
+    manifest = os.path.join(decompliePath, 'AndroidManifest.xml')
+    xml_utils.addApplicationAttr(manifest, "networkSecurityConfig", "@xml/huosdk_network_security_config")
 
-    return 0

sdk/jm_hongshouzhi/smali/WXPayEntryActivity.smali

@@ -1,223 +0,0 @@
-.class public L${packageName}/wxapi/WXPayEntryActivity;
-.super Landroid/app/Activity;
-.source "WXPayEntryActivity.java"
-
-# interfaces
-.implements Lcom/tencent/mm/opensdk/openapi/IWXAPIEventHandler;
-
-
-# static fields
-.field private static final TAG:Ljava/lang/String;
-
-
-# instance fields
-.field private api:Lcom/tencent/mm/opensdk/openapi/IWXAPI;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    .line 20
-    const-class v0, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;
-
-    invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->TAG:Ljava/lang/String;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 0
-
-    .line 19
-    invoke-direct {p0}, Landroid/app/Activity;-><init>()V
-
-    return-void
-.end method
-
-.method private sendPayResult(I)V
-    .locals 3
-    .param p1, "code"    # I
-
-    .line 52
-    invoke-static {}, Lcom/jmhy/sdk/utils/thirdPlatform/WechatPlatform;->getPayListener()Lcom/jmhy/sdk/utils/thirdPlatform/PayListener;
-
-    move-result-object v0
-
-    .line 53
-    .local v0, "listener":Lcom/jmhy/sdk/utils/thirdPlatform/PayListener;
-    if-nez v0, :cond_0
-
-    .line 54
-    sget-object v1, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->TAG:Ljava/lang/String;
-
-    const-string v2, "onReq PayListener is null"
-
-    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
-
-    .line 55
-    return-void
-
-    .line 58
-    :cond_0
-    const/4 v1, -0x2
-
-    if-eq p1, v1, :cond_2
-
-    if-eqz p1, :cond_1
-
-    .line 66
-    invoke-interface {v0}, Lcom/jmhy/sdk/utils/thirdPlatform/PayListener;->onFailure()V
-
-    goto :goto_0
-
-    .line 60
-    :cond_1
-    invoke-interface {v0}, Lcom/jmhy/sdk/utils/thirdPlatform/PayListener;->onSuccess()V
-
-    .line 61
-    goto :goto_0
-
-    .line 63
-    :cond_2
-    invoke-interface {v0}, Lcom/jmhy/sdk/utils/thirdPlatform/PayListener;->onCancel()V
-
-    .line 64
-    nop
-
-    .line 68
-    :goto_0
-    return-void
-.end method
-
-
-# virtual methods
-.method public onCreate(Landroid/os/Bundle;)V
-    .locals 2
-    .param p1, "savedInstanceState"    # Landroid/os/Bundle;
-
-    .line 26
-    invoke-super {p0, p1}, Landroid/app/Activity;->onCreate(Landroid/os/Bundle;)V
-
-    .line 28
-    sget-object v0, Lcom/jmhy/sdk/utils/thirdPlatform/WechatPlatform;->WECHAT_APP_ID:Ljava/lang/String;
-
-    invoke-static {p0, v0}, Lcom/tencent/mm/opensdk/openapi/WXAPIFactory;->createWXAPI(Landroid/content/Context;Ljava/lang/String;)Lcom/tencent/mm/opensdk/openapi/IWXAPI;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->api:Lcom/tencent/mm/opensdk/openapi/IWXAPI;
-
-    .line 29
-    iget-object v0, p0, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->api:Lcom/tencent/mm/opensdk/openapi/IWXAPI;
-
-    invoke-virtual {p0}, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->getIntent()Landroid/content/Intent;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1, p0}, Lcom/tencent/mm/opensdk/openapi/IWXAPI;->handleIntent(Landroid/content/Intent;Lcom/tencent/mm/opensdk/openapi/IWXAPIEventHandler;)Z
-
-    .line 30
-    return-void
-.end method
-
-.method protected onNewIntent(Landroid/content/Intent;)V
-    .locals 1
-    .param p1, "intent"    # Landroid/content/Intent;
-
-    .line 34
-    invoke-super {p0, p1}, Landroid/app/Activity;->onNewIntent(Landroid/content/Intent;)V
-
-    .line 35
-    invoke-virtual {p0, p1}, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->setIntent(Landroid/content/Intent;)V
-
-    .line 36
-    iget-object v0, p0, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->api:Lcom/tencent/mm/opensdk/openapi/IWXAPI;
-
-    invoke-interface {v0, p1, p0}, Lcom/tencent/mm/opensdk/openapi/IWXAPI;->handleIntent(Landroid/content/Intent;Lcom/tencent/mm/opensdk/openapi/IWXAPIEventHandler;)Z
-
-    .line 37
-    return-void
-.end method
-
-.method public onReq(Lcom/tencent/mm/opensdk/modelbase/BaseReq;)V
-    .locals 3
-    .param p1, "req"    # Lcom/tencent/mm/opensdk/modelbase/BaseReq;
-
-    .line 41
-    sget-object v0, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->TAG:Ljava/lang/String;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "onReq req="
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
-
-    .line 42
-    return-void
-.end method
-
-.method public onResp(Lcom/tencent/mm/opensdk/modelbase/BaseResp;)V
-    .locals 3
-    .param p1, "resp"    # Lcom/tencent/mm/opensdk/modelbase/BaseResp;
-
-    .line 46
-    sget-object v0, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->TAG:Ljava/lang/String;
-
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "onResp errCode = "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v2, p1, Lcom/tencent/mm/opensdk/modelbase/BaseResp;->errCode:I
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v2, ",resp.getType()="
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p1}, Lcom/tencent/mm/opensdk/modelbase/BaseResp;->getType()I
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
-
-    .line 47
-    iget v0, p1, Lcom/tencent/mm/opensdk/modelbase/BaseResp;->errCode:I
-
-    invoke-direct {p0, v0}, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->sendPayResult(I)V
-
-    .line 48
-    invoke-virtual {p0}, Lcom/jmhy/sdk/template/wxapi/WXPayEntryActivity;->finish()V
-
-    .line 49
-    return-void
-.end method

sdk_script/jm_hongshouzhi.py

@@ -0,0 +1,25 @@
+def getSdkConfig(jsonConfig, config):
+    print('getSdkConfig hongshouzhi...')
+    
+    if 'hongshouzhi' in config:
+        hongshouzhi = config['hongshouzhi']
+        if 'metaData' in jsonConfig:
+            meta = jsonConfig['metaData']
+        else:
+            meta = {}
+        meta['HS_APPID'] = hongshouzhi['app_id']
+        meta['HS_CLIENTID'] = hongshouzhi['client_id']
+        meta['HS_CLIENTKEY'] = hongshouzhi['client_key']
+        meta['HS_AGENT'] = 'default'
+
+
+
+        jsonConfig['metaData'] = meta
+
+        if 'includeOtherPay' in hongshouzhi:
+            if hongshouzhi['includeOtherPay'] == 0:
+                jsonConfig['libConfig'] = 'nopay'
+            else:
+                jsonConfig['libConfig'] = 'default'
+        else:
+            jsonConfig['libConfig'] = 'default'

xml_utils.py

@@ -315,6 +315,23 @@ def changeApplicationAttr(manifest, attrType, attrValue):
     tree.write(manifest, encoding)
     return 0
 
+
+def addApplicationAttr(manifest, attrType, attrValue):
+    '''
+    更改Application的某个属性
+    '''
+    for key in namespaces:
+        ET.register_namespace(key, namespaces[key])
+
+    tree = ET.parse(manifest)
+    root = tree.getroot()
+    application = root.find('application')
+    # Namespaces
+    attrName = getNamespacesFormat('android:%s' % attrType, namespaces)
+    application.set(attrName,attrValue)
+    tree.write(manifest, encoding)
+    return 0
+
 def getApplicationAttr(manifest, attrType):
     '''
     获取Application的某个属性