sdk add maven

v5/android/Android_Integration_Specification_CH.md

@@ -34,17 +34,16 @@ mode —— AllPay 后台环境标识，true表示从AllPay的正式环境发起
 
 ### 3.2 添加 SDK 包
 
-1.把allpaysdk.arr 拷贝到项目的libs下面
+1.在Application Module的build.gradle文件的dependencies下添加 api("io.github.goallpay:allpaysdk:5.2.+")
 
-2.在Application Module的build.gradle文件的dependencies下添加compile(name: 'allpaysdk', ext: 'aar')
-
-3.在Application Module的build.gradle文件中添加
+2.在根目录的build.gradle文件中添加
 
 ```java
 repositories {
-    flatDir {
-         dirs 'libs'
-    }
+        mavenCentral()
+        maven {
+            url 'https://s01.oss.sonatype.org/content/repositories/releases/'
+        }
 }
 ```
 
@@ -99,13 +98,7 @@ pay_result 为 json 字符串，格式如下：
 
 ### 4.1 WX渠道
 
- (1) 在Application Module的build.gradle文件的dependencies下添加
-
-  ```
-  compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
-  ```
-  
- (2)  在主项目的AndroidManifest.xml中添加下面配置
+  在主项目的AndroidManifest.xml中添加下面配置
  ```
    <!-- wpay sdk begin -->
 
@@ -125,19 +118,9 @@ pay_result 为 json 字符串，格式如下：
         <!-- wpay sdk end -->
  ```
 
-### 4.2 AP渠道
-
-1.把alipaySdk.arr 拷贝到项目的libs下面
-
-2.在Application Module的build.gradle文件的dependencies下添加
-
-```
-compile(name: 'alipaySdk', ext: 'aar')
-```
-
-## 5.SDK下载
+## 5.Demo下载
 
-[安卓SDK下载地址](android_sdk.zip)
+[安卓Demo下载地址](android_sdk.zip)
 
 ## 6.技术支持
 

v5/android/Android_Integration_Specification_EN.md

@@ -34,17 +34,16 @@ mode - AllPay background environment ID, true means to initiate a transaction fr
 
 ### 3.2 Add SDK
 
-1.Copy allpaysdk.arr to the project's libs.
+1.Add    api("io.github.goallpay:allpaysdk:5.2.+")     under the dependencies of the build.gradle file in the Application Module.
 
-2.Add compile(name: 'allpaysdk', ext: 'aar') under the dependencies of the build.gradle file in the Application Module.
-
-3.Add in the build.gradle file of the Application Module
+2.Add in the build.gradle file of the Application Module
 
 ```java
 repositories {
-    flatDir {
-         dirs 'libs'
-    }
+        mavenCentral()
+        maven {
+            url 'https://s01.oss.sonatype.org/content/repositories/releases/'
+        }
 }
 ```
 
@@ -99,23 +98,28 @@ Message description:
 
 ### 4.1 WX channel
 
-  Add in the dependencies of the build.gradle file in the Application Module
+  Add in the code in the Application AndroidManifest.xml
 
   ```
-  compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
-  ```
+   <!-- wpay sdk begin -->
 
-### 4.2 AP channel
 
-1.Copy alipaySdk.arr to the project's libs.
+        <activity
+            android:name="com.allpayx.sdk.wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop" />
 
-2.Add in the dependencies of the build.gradle file in the Application Module
 
-```
-compile(name: 'alipaySdk', ext: 'aar')
-```
+        <activity-alias
+            android:name=".wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:targetActivity="com.allpayx.sdk.wxapi.WXPayEntryActivity" />
+
+        <!-- wpay sdk end -->
+  ```
 
-## 5.SDK download
+## 5.Demo download
 
 [Download link](android_sdk.zip)
 

v5/android/android_sdk/Demo/.gitignore

@@ -1,10 +1,10 @@
-*.iml
-.gradle
-/local.properties
-/.idea
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.bugtags.log
-/PushSDK
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.bugtags.log
+/PushSDK

v5/android/android_sdk/Demo/app/.gitignore

@@ -1 +1 @@
-/build
+/build

v5/android/android_sdk/Demo/app/build.gradle

@@ -1,44 +1,48 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
-    defaultConfig {
-        applicationId "com.vtpayment.plugin"
-        minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-
-
-
-}
-
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-beta1'
-    testCompile 'junit:junit:4.12'
-    compile(name: 'allpaysdk', ext: 'aar')
-    compile(name: 'alipaySdk', ext: 'aar')
-    compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
-}
-
-
-repositories {
-    flatDir {
-        dirs 'libs'
-    }
-}
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.0"
+    defaultConfig {
+        applicationId "com.vtpayment.plugin"
+        minSdkVersion 19
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+
+
+
+}
+
+repositories {
+    google()
+    mavenCentral()
+    flatDir {
+        dirs 'libs'
+    }
+}
+
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api("io.github.goallpay:allpaysdk:5.2.+")
+
+
+}
+

v5/android/android_sdk/Demo/app/proguard-rules.pro

@@ -1,25 +1,25 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/bensonzhang/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/bensonzhang/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

v5/android/android_sdk/Demo/app/src/androidTest/java/com/vtpayment/plugin/ExampleInstrumentedTest.java

@@ -1,26 +1,26 @@
-package com.vtpayment.plugin;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.vtpayment.plugin", appContext.getPackageName());
-    }
-}
+package com.vtpayment.plugin;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.vtpayment.plugin", appContext.getPackageName());
+    }
+}

v5/android/android_sdk/Demo/app/src/main/AndroidManifest.xml

@@ -1,48 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vtpayment.plugin">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-
-
-        <activity android:name=".MainActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-
-
-
-        <!-- wpay sdk begin -->
-
-
-        <activity
-            android:name="com.allpayx.sdk.wxapi.WXPayEntryActivity"
-            android:exported="true"
-            android:launchMode="singleTop" />
-
-
-        <activity-alias
-            android:name=".wxapi.WXPayEntryActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:targetActivity="com.allpayx.sdk.wxapi.WXPayEntryActivity" />
-
-        <!-- wpay sdk end -->
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.vtpayment.plugin">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+
+        <activity android:name=".MainActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <!-- wpay sdk begin -->
+
+
+        <activity
+            android:name="com.allpayx.sdk.wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop" />
+
+
+        <activity-alias
+            android:name=".wxapi.WXPayEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:targetActivity="com.allpayx.sdk.wxapi.WXPayEntryActivity" />
+
+        <!-- wpay sdk end -->
+
+
+    </application>
+
 </manifest>

v5/android/android_sdk/Demo/app/src/main/java/com/vtpayment/plugin/MainActivity.java

@@ -1,210 +1,212 @@
-package com.vtpayment.plugin;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.Toast;
-
-import com.allpayx.sdk.AllPayEngine;
-import com.allpayx.sdk.constants.AllPayConst;
-import com.allpayx.sdk.util.HttpUtil;
-
-import com.vtpayment.plugin.util.Base64;
-import com.vtpayment.plugin.util.JsonUtil;
-import com.vtpayment.plugin.util.PayUtil;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class MainActivity extends AppCompatActivity {
-
-    private final String TAG = "MainActivity";
-
-    private static final String[] currency = {"CNY","USD","INR","JPY"};
-    private static String payType[];
-    private static final String[] paymentSchemas = {"AP","WX","UP"};
-
-    private ProgressDialog progressDialog;
-    Map<String, String> params = new HashMap<String, String>();
-    private EditText mAmoutEidt;
-    private EditText mOrderNumEidt;
-    private EditText mMerID;
-    private Spinner mPaymentSchemaSpinner;
-    private Spinner mCurrencySpinner;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        payType = new String[3];
-        payType[0] = getResources().getString(R.string.pay_type_apmp);
-        payType[1] = getResources().getString(R.string.pay_type_wx);
-        payType[2] = getResources().getString(R.string.pay_type_up);
-
-        // 通用参数
-
-        params.put("version", "VER000000005");
-        params.put("charSet", "UTF-8");
-        params.put("transType", "PURC");
-        params.put("orderNum", getOrderNum());
-        params.put("orderAmount", "0.1");
-        params.put("orderCurrency", "CNY");
-        params.put("frontURL", "nil");
-        params.put("merReserve", "一个又大又圆的苹果");
-        params.put("acqID", "99020344");
-        params.put("backURL", "https://testapi.allpayx.com/test");
-        params.put("merID", "600039253112226");
-        params.put("paymentSchema", "APMP");
-        params.put("goodsInfo", "一个又大又圆的苹果");
-        params.put("transTime", getTransTime());
-        params.put("signType", "MD5");
-        params.put("tradeFrom", "APP");
-
-        String detailInfo = "[{\"goods_name\":\"一个又大又圆的苹果\",\"quantity\":\"1\"},{\"goods_name\":\"华为P20 plus\",\"quantity\":\"4\"}]";
-        try {
-            detailInfo = Base64.encodeBytes(detailInfo.getBytes("utf-8"));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        params.put("detailInfo", detailInfo);
-
-
-        initLayout();
-        initListener();
-        update();
-
-    }
-
-    private void initLayout() {
-        mAmoutEidt = (EditText) findViewById(R.id.edit_amount);
-        mOrderNumEidt = (EditText) findViewById(R.id.edit_ordernum);
-        mMerID = (EditText) findViewById(R.id.edit_merid);
-        ArrayAdapter<String> currencyArrayAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_spinner_item, currency);
-        currencyArrayAdapter
-                .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
-        mCurrencySpinner = (Spinner) findViewById(R.id.spinner_currency);
-        mCurrencySpinner.setAdapter(currencyArrayAdapter);
-
-        ArrayAdapter<String> paymentSchemaArrayAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_spinner_item, payType);
-        paymentSchemaArrayAdapter
-                .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
-        mPaymentSchemaSpinner = (Spinner) findViewById(R.id.spinner_paymentschema);
-        mPaymentSchemaSpinner.setAdapter(paymentSchemaArrayAdapter);
-
-    }
-
-    private void initListener() {
-        findViewById(R.id.submit).setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                params.put("orderAmount", mAmoutEidt.getText().toString());
-                params.put("orderCurrency", mCurrencySpinner.getSelectedItem().toString());
-                String paymentSchema = paymentSchemas[mPaymentSchemaSpinner.getSelectedItemPosition()];
-                params.put("paymentSchema", paymentSchema);
-
-                switch (paymentSchema) {
-
-                }
-
-                pay(params);
-            }
-        });
-    }
-
-    private void update() {
-        params.put("orderNum", getOrderNum());
-        mMerID.setText(params.get("merID"));
-        mOrderNumEidt.setText(params.get("orderNum"));
-        mAmoutEidt.setText(params.get("orderAmount"));
-    }
-
-
-    private void pay(final Map<String, String> params) {
-        progressDialog = ProgressDialog.show(this, "", "模拟网关获取tn...");
-
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                params.remove("signature");
-                params.put("signature", PayUtil.getSign(params, "rfb301ir902rhyvtpd8ubjox1kh2kmon", "MD5"));
-                //String result = HttpUtil.reqStr("http://172.30.1.103:8080/app/pay", params, HttpUtil.METHOD_POST); //本地
-                // String result = HttpUtil.reqStr("https://api.allpayx.com/app/pay", params, HttpUtil.METHOD_POST); //生产
-                // final String result = HttpUtil.reqStr("http://172.30.1.112:8080/api/unifiedorder", params, HttpUtil.METHOD_POST);//测试
-
-                final String result = HttpUtil.reqStr("https://testapi.allpayx.com/api/unifiedorder", params, HttpUtil.METHOD_POST); //生产
-
-                progressDialog.dismiss();
-                Log.i(TAG, "result=" + result);
-                String tn = JsonUtil.getParam(result, "tn");
-                if (!TextUtils.isEmpty(tn)) {
-
-                    Log.i(TAG, "tn=" + tn);
-                    AllPayEngine.pay(MainActivity.this, tn, false);
-                } else {
-                    runOnUiThread(new Runnable() {
-                        public void run() {
-                            Toast toast = Toast.makeText(
-                                    getApplicationContext(), "获取tn失败:" + result,
-                                    Toast.LENGTH_SHORT);
-                            toast.show();
-
-                        }
-                    });
-                }
-            }
-        }).start();
-
-    }
-
-
-    private String getOrderNum() {
-        Date now = new Date();
-        SimpleDateFormat spf = new SimpleDateFormat("yyyyMMddHHmmss");
-        return "ap" + spf.format(now).substring(1);
-    }
-
-
-    private String getTransTime() {
-        Date now = new Date();
-        SimpleDateFormat spf = new SimpleDateFormat("yyyyMMddHHmmss");
-        return spf.format(now);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        if (data == null) {
-            return;
-        }
-
-        if (requestCode == AllPayConst.VTPAY_PAY_REQUESR_CODE
-                && resultCode == AllPayConst.VTPAY_PAY_RESULT_CODE) {
-
-            update();
-            String result = data.getExtras().getString("pay_result");
-            Toast toast = Toast.makeText(getApplicationContext(), result,
-                    Toast.LENGTH_SHORT);
-            toast.show();
-
-        }
-
-    }
-
-
+package com.vtpayment.plugin;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.allpayx.sdk.AllPayEngine;
+import com.allpayx.sdk.constants.AllPayConst;
+import com.allpayx.sdk.util.HttpUtil;
+import com.vtpayment.plugin.util.Base64;
+import com.vtpayment.plugin.util.JsonUtil;
+import com.vtpayment.plugin.util.PayUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class MainActivity extends AppCompatActivity {
+
+    private final String TAG = "MainActivity";
+
+    private static final String[] currency = {"CNY","USD","INR","JPY"};
+    private static String payType[];
+    private static final String[] paymentSchemas = {"AP","WX","UP","CA"};
+
+    private ProgressDialog progressDialog;
+    Map<String, String> params = new HashMap<String, String>();
+    private EditText mAmoutEidt;
+    private EditText mOrderNumEidt;
+    private EditText mMerID;
+    private Spinner mPaymentSchemaSpinner;
+    private Spinner mCurrencySpinner;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        payType = new String[3];
+        payType[0] = getResources().getString(R.string.pay_type_apmp);
+        payType[1] = getResources().getString(R.string.pay_type_wx);
+        payType[2] = getResources().getString(R.string.pay_type_up);
+
+        // 通用参数
+
+        params.put("version", "VER000000005");
+        params.put("charSet", "UTF-8");
+        params.put("transType", "PURC");
+        params.put("orderNum", getOrderNum());
+        params.put("orderAmount", "0.1");
+        params.put("orderCurrency", "CNY");
+        params.put("frontURL", "nil");
+        params.put("merReserve", "一个又大又圆的苹果");
+        params.put("acqID", "99020344");
+        params.put("backURL", "https://testapi.allpayx.com/test");
+        params.put("merID", "600039253112226");
+        params.put("paymentSchema", "AP");
+        params.put("goodsInfo", "一个又大又圆的苹果");
+        params.put("transTime", getTransTime());
+        params.put("signType", "MD5");
+        params.put("tradeFrom", "APP");
+
+        String detailInfo = "[{\"goods_name\":\"Jovan 祖梵 白麝香女士古龙水 Cologne 96ml\",\"quantity\":1}]";
+        try {
+            detailInfo = Base64.encodeBytes(detailInfo.getBytes("utf-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        params.put("detailInfo", detailInfo);
+
+
+        initLayout();
+        initListener();
+        update();
+
+    }
+
+    private void initLayout() {
+        mAmoutEidt = (EditText) findViewById(R.id.edit_amount);
+        mOrderNumEidt = (EditText) findViewById(R.id.edit_ordernum);
+        mMerID = (EditText) findViewById(R.id.edit_merid);
+        ArrayAdapter<String> currencyArrayAdapter = new ArrayAdapter<String>(
+                this, android.R.layout.simple_spinner_item, currency);
+        currencyArrayAdapter
+                .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+        mCurrencySpinner = (Spinner) findViewById(R.id.spinner_currency);
+        mCurrencySpinner.setAdapter(currencyArrayAdapter);
+
+        ArrayAdapter<String> paymentSchemaArrayAdapter = new ArrayAdapter<String>(
+                this, android.R.layout.simple_spinner_item, payType);
+        paymentSchemaArrayAdapter
+                .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+        mPaymentSchemaSpinner = (Spinner) findViewById(R.id.spinner_paymentschema);
+        mPaymentSchemaSpinner.setAdapter(paymentSchemaArrayAdapter);
+
+    }
+
+    private void initListener() {
+        findViewById(R.id.submit).setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                params.put("orderAmount", mAmoutEidt.getText().toString());
+                params.put("orderCurrency", mCurrencySpinner.getSelectedItem().toString());
+                String paymentSchema = paymentSchemas[mPaymentSchemaSpinner.getSelectedItemPosition()];
+                params.put("paymentSchema", paymentSchema);
+
+                switch (paymentSchema) {
+
+                }
+
+                pay(params);
+            }
+        });
+    }
+
+    private void update() {
+        params.put("orderNum", getOrderNum());
+        mMerID.setText(params.get("merID"));
+        mOrderNumEidt.setText(params.get("orderNum"));
+        mAmoutEidt.setText(params.get("orderAmount"));
+    }
+
+
+    private void pay(final Map<String, String> params) {
+        progressDialog = ProgressDialog.show(this, "", "模拟网关获取tn...");
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                params.remove("signature");
+                params.put("signature", PayUtil.getSign(params, "rfb301ir902rhyvtpd8ubjox1kh2kmon", "MD5"));
+                //String result = HttpUtil.reqStr("http://172.30.1.103:8080/app/pay", params, HttpUtil.METHOD_POST); //本地
+                // String result = HttpUtil.reqStr("https://api.allpayx.com/app/pay", params, HttpUtil.METHOD_POST); //生产
+                // final String result = HttpUtil.reqStr("http://172.30.1.112:8080/api/unifiedorder", params, HttpUtil.METHOD_POST);//测试
+
+                final String result = HttpUtil.reqStr("https://testapi.allpayx.com/api/unifiedorder", params, HttpUtil.METHOD_POST); //生产
+
+                progressDialog.dismiss();
+                Log.i(TAG, "result=" + result);
+                String tn = JsonUtil.getParam(result, "tn");
+                if (!TextUtils.isEmpty(tn)) {
+
+                    Log.i(TAG, "tn=" + tn);
+                    AllPayEngine.pay(MainActivity.this, tn, false);
+                } else {
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            Toast toast = Toast.makeText(
+                                    getApplicationContext(), "获取tn失败:" + result,
+                                    Toast.LENGTH_SHORT);
+                            toast.show();
+
+                        }
+                    });
+                }
+            }
+        }).start();
+
+    }
+
+
+    private String getOrderNum() {
+        Date now = new Date();
+        SimpleDateFormat spf = new SimpleDateFormat("yyyyMMddHHmmss");
+        return "ap" + spf.format(now).substring(1);
+    }
+
+
+    private String getTransTime() {
+        Date now = new Date();
+        SimpleDateFormat spf = new SimpleDateFormat("yyyyMMddHHmmss");
+        return spf.format(now);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (data == null) {
+            return;
+        }
+
+        if (requestCode == AllPayConst.VTPAY_PAY_REQUESR_CODE
+                && resultCode == AllPayConst.VTPAY_PAY_RESULT_CODE) {
+
+            update();
+            String result = data.getExtras().getString("pay_result");
+            Toast toast = Toast.makeText(getApplicationContext(), result,
+                    Toast.LENGTH_SHORT);
+            toast.show();
+
+        }
+
+    }
+
+
 }

v5/android/android_sdk/Demo/app/src/main/java/com/vtpayment/plugin/util/EncoderUtil.java

@@ -1,53 +1,53 @@
-package com.vtpayment.plugin.util;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public class EncoderUtil {
-	public static String Encrypt(String strSrc,String encName) {
-		//parameter strSrc is a string will be encrypted,
-		//parameter encName is the algorithm name will be used.
-		//encName dafault to "MD5"
-		MessageDigest md=null;
-		String strDes=null;
-
-		byte[] bt=strSrc.getBytes();
-		try {
-		if (encName==null||encName.equals("")) {
-		encName="MD5";
-		}
-		md=MessageDigest.getInstance(encName);
-		md.update(bt);
-		strDes=bytes2Hex(md.digest()); //to HexString
-		}
-		catch (NoSuchAlgorithmException e) {
-		System.out.println("Invalid algorithm.");
-		return null;
-		}
-		return strDes;
-		}
-
-		private static String bytes2Hex(byte[]bts) {
-		String des="";
-		String tmp=null;
-		for (int i=0;i<bts.length;i++) {
-		tmp=(Integer.toHexString(bts[i] & 0xFF));
-		if (tmp.length()==1) {
-		des+="0";
-		}
-		des+=tmp;
-		}
-		return des;
-		}
-
-//		public static void main(String[]args) {
-//		TestEncrypt te=new TestEncrypt();
-//		String strSrc="可以加密汉字.Oh,and english";
-//		System.out.println("Source String:"+strSrc);
-//		System.out.println("Encrypted String:");
-//		System.out.println("Use Def:"+te.Encrypt(strSrc,null));
-//		System.out.println("Use MD5:"+te.Encrypt(strSrc,"MD5"));
-//		System.out.println("Use SHA:"+te.Encrypt(strSrc,"SHA-1"));
-//		System.out.println("Use SHA-256:"+te.Encrypt(strSrc,"SHA-256"));
-//		}
-}
+package com.vtpayment.plugin.util;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class EncoderUtil {
+	public static String Encrypt(String strSrc,String encName) {
+		//parameter strSrc is a string will be encrypted,
+		//parameter encName is the algorithm name will be used.
+		//encName dafault to "MD5"
+		MessageDigest md=null;
+		String strDes=null;
+
+		byte[] bt=strSrc.getBytes();
+		try {
+		if (encName==null||encName.equals("")) {
+		encName="MD5";
+		}
+		md=MessageDigest.getInstance(encName);
+		md.update(bt);
+		strDes=bytes2Hex(md.digest()); //to HexString
+		}
+		catch (NoSuchAlgorithmException e) {
+		System.out.println("Invalid algorithm.");
+		return null;
+		}
+		return strDes;
+		}
+
+		private static String bytes2Hex(byte[]bts) {
+		String des="";
+		String tmp=null;
+		for (int i=0;i<bts.length;i++) {
+		tmp=(Integer.toHexString(bts[i] & 0xFF));
+		if (tmp.length()==1) {
+		des+="0";
+		}
+		des+=tmp;
+		}
+		return des;
+		}
+
+//		public static void main(String[]args) {
+//		TestEncrypt te=new TestEncrypt();
+//		String strSrc="可以加密汉字.Oh,and english";
+//		System.out.println("Source String:"+strSrc);
+//		System.out.println("Encrypted String:");
+//		System.out.println("Use Def:"+te.Encrypt(strSrc,null));
+//		System.out.println("Use MD5:"+te.Encrypt(strSrc,"MD5"));
+//		System.out.println("Use SHA:"+te.Encrypt(strSrc,"SHA-1"));
+//		System.out.println("Use SHA-256:"+te.Encrypt(strSrc,"SHA-256"));
+//		}
+}

v5/android/android_sdk/Demo/app/src/main/java/com/vtpayment/plugin/util/JsonUtil.java

@@ -1,22 +1,22 @@
-package com.vtpayment.plugin.util;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class JsonUtil {
-public static String getParam(String jsonString,String key){
-	String value="";
-	JSONObject jsonObject=null;
-	try {
-		jsonObject = new JSONObject(jsonString);
-	} catch (JSONException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	if(jsonObject!=null){
-		value=jsonObject.optString(key);
-	}
-	return value;
-}
-}
+package com.vtpayment.plugin.util;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+public class JsonUtil {
+public static String getParam(String jsonString,String key){
+	String value="";
+	JSONObject jsonObject=null;
+	try {
+		jsonObject = new JSONObject(jsonString);
+	} catch (JSONException e) {
+		// TODO Auto-generated catch block
+		e.printStackTrace();
+	}
+	if(jsonObject!=null){
+		value=jsonObject.optString(key);
+	}
+	return value;
+}
+}

v5/android/android_sdk/Demo/app/src/main/java/com/vtpayment/plugin/util/PayOrder.java

@@ -1,30 +1,30 @@
-package com.vtpayment.plugin.util;
-
-import java.io.Serializable;
-
-public class PayOrder implements Serializable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	public String orderNum;
-	public String orderAmount;
-	public String orderCurrency;
-	public String backURL;
-	public String merID;
-	public String secretKey;
-	public String  paymentSchema;
-	public String  version;
-	public String charSet;
-	public String transType;
-	public String frontURL;
-	public String merReserve;
-	public String acqID;
-	public String transTime;
-	public String OrderDesc;
-	public String signType;
-	public String signature;
-	public String language;
-	public String customerId;
-	
-}
+package com.vtpayment.plugin.util;
+
+import java.io.Serializable;
+
+public class PayOrder implements Serializable {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	public String orderNum;
+	public String orderAmount;
+	public String orderCurrency;
+	public String backURL;
+	public String merID;
+	public String secretKey;
+	public String  paymentSchema;
+	public String  version;
+	public String charSet;
+	public String transType;
+	public String frontURL;
+	public String merReserve;
+	public String acqID;
+	public String transTime;
+	public String OrderDesc;
+	public String signType;
+	public String signature;
+	public String language;
+	public String customerId;
+	
+}

v5/android/android_sdk/Demo/app/src/main/java/com/vtpayment/plugin/util/PayUtil.java

@@ -1,64 +1,64 @@
-package com.vtpayment.plugin.util;
-
-import android.util.Log;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Created by bensonzhang on 2017/12/12.
- */
-
-public class PayUtil {
-
-
-
-    public static String getSign(Map<String,String> params,String key,String signType) {
-        Map<String, String> resultMap = sortMapByKey(params);  //按Key进行排序
-        StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, String> entry : resultMap.entrySet()) {
-            sb.append(entry.getKey());
-            sb.append('=');
-            sb.append(entry.getValue());
-            sb.append('&');
-        }
-        sb.deleteCharAt(sb.lastIndexOf("&"));
-        sb.append(key);
-        Log.i("opp",sb.toString());
-        String sign =EncoderUtil.Encrypt(sb.toString(), signType) ;
-        Log.i("opp",sign);
-        return sign;
-    }
-
-    /**
-     * 使用 Map按key进行排序
-     * @param map
-     * @return
-     */
-    public static Map<String, String> sortMapByKey(Map<String, String> map) {
-        if (map == null || map.isEmpty()) {
-            return null;
-        }
-
-        Map<String, String> sortMap = new TreeMap<>(
-                new MapKeyComparator());
-
-        sortMap.putAll(map);
-
-        return sortMap;
-    }
-
-
-  static   class MapKeyComparator implements Comparator<String> {
-
-        @Override
-        public int compare(String str1, String str2) {
-
-            return str1.compareTo(str2);
-        }
-    }
-
-
-}
+package com.vtpayment.plugin.util;
+
+import android.util.Log;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * Created by bensonzhang on 2017/12/12.
+ */
+
+public class PayUtil {
+
+
+
+    public static String getSign(Map<String,String> params,String key,String signType) {
+        Map<String, String> resultMap = sortMapByKey(params);  //按Key进行排序
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : resultMap.entrySet()) {
+            sb.append(entry.getKey());
+            sb.append('=');
+            sb.append(entry.getValue());
+            sb.append('&');
+        }
+        sb.deleteCharAt(sb.lastIndexOf("&"));
+        sb.append(key);
+        Log.i("opp",sb.toString());
+        String sign =EncoderUtil.Encrypt(sb.toString(), signType) ;
+        Log.i("opp",sign);
+        return sign;
+    }
+
+    /**
+     * 使用 Map按key进行排序
+     * @param map
+     * @return
+     */
+    public static Map<String, String> sortMapByKey(Map<String, String> map) {
+        if (map == null || map.isEmpty()) {
+            return null;
+        }
+
+        Map<String, String> sortMap = new TreeMap<>(
+                new MapKeyComparator());
+
+        sortMap.putAll(map);
+
+        return sortMap;
+    }
+
+
+  static   class MapKeyComparator implements Comparator<String> {
+
+        @Override
+        public int compare(String str1, String str2) {
+
+            return str1.compareTo(str2);
+        }
+    }
+
+
+}

v5/android/android_sdk/Demo/app/src/main/res/drawable/buy_button_bg.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="false"  > 
-    <shape>
-        <stroke android:width="2px" android:color="#DDA755" /><!--边框颜色-->
-        <solid android:color="#DDA755" /><!--填充色-->
-        <corners android:radius="4dp" />
-    </shape>
-  </item>
-  
-    <item  android:state_pressed="true" > 
-    <shape>
-        <stroke android:width="2px" android:color="#BB8533" /><!--边框颜色-->
-        <solid android:color="#BB8533" /><!--填充色-->
-        <corners android:radius="4dp" />
-    </shape>
-  </item>
-</selector>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="false"  > 
+    <shape>
+        <stroke android:width="2px" android:color="#DDA755" /><!--边框颜色-->
+        <solid android:color="#DDA755" /><!--填充色-->
+        <corners android:radius="4dp" />
+    </shape>
+  </item>
+  
+    <item  android:state_pressed="true" > 
+    <shape>
+        <stroke android:width="2px" android:color="#BB8533" /><!--边框颜色-->
+        <solid android:color="#BB8533" /><!--填充色-->
+        <corners android:radius="4dp" />
+    </shape>
+  </item>
+</selector>

v5/android/android_sdk/Demo/app/src/main/res/layout/activity_main.xml

@@ -1,243 +1,243 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.vtpayment.plugin.MainActivity" >
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:background="#DDA755" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="AllPay演示Demo"
-            android:layout_centerInParent="true"
-            android:textStyle="bold"
-            android:textColor="#ffffff"
-            />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        >
-
-
-
-        <TextView
-            android:id="@+id/text_merid"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:text="商户号:"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#000000"
-            android:layout_centerVertical="true"
-            />
-
-
-        <EditText
-            android:id="@+id/edit_merid"
-            android:layout_width="180dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="20dp"
-            android:layout_toRightOf="@id/text_merid"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#888888"
-            android:inputType="numberDecimal"
-            android:enabled="false"
-            android:focusable="false"
-            android:layout_centerVertical="true"
-            />
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        >
-
-
-
-        <TextView
-            android:id="@+id/text_ordernum"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:text="订单号:"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#000000"
-            android:layout_centerVertical="true"
-            />
-
-
-        <EditText
-            android:id="@+id/edit_ordernum"
-            android:layout_width="180dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="20dp"
-            android:layout_toRightOf="@id/text_ordernum"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#888888"
-            android:inputType="numberDecimal"
-            android:enabled="false"
-            android:focusable="false"
-            android:layout_centerVertical="true"
-            />
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        >
-
-        <TextView
-            android:id="@+id/text_amount"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:text="订单金额:"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#000000"
-            android:layout_centerVertical="true"
-            />
-
-
-        <EditText
-            android:id="@+id/edit_amount"
-            android:layout_width="180dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="20dp"
-            android:layout_toRightOf="@id/text_amount"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#000000"
-            android:inputType="numberDecimal"
-            android:layout_centerVertical="true"
-            />
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        >
-
-        <TextView
-            android:id="@+id/text_currency"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:text="币种:"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#000000"
-            android:layout_centerVertical="true"
-            />
-
-
-        <Spinner android:id="@+id/spinner_currency"
-            android:layout_width="180dp"
-            android:layout_height="35dp"
-            android:layout_toRightOf="@id/text_currency"
-            android:layout_marginLeft="20dp"
-            android:paddingLeft="5dp"
-            android:background="#ffffff"
-            >
-
-        </Spinner>
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        >
-
-        <TextView
-            android:id="@+id/text_paymentschema"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:text="支付渠道:"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            android:textColor="#000000"
-            android:layout_centerVertical="true"
-            />
-
-
-        <Spinner android:id="@+id/spinner_paymentschema"
-            android:layout_width="180dp"
-            android:layout_height="35dp"
-            android:layout_toRightOf="@id/text_paymentschema"
-            android:layout_marginLeft="20dp"
-            android:paddingLeft="5dp"
-            android:background="#ffffff"
-            >
-
-        </Spinner>
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="100dp"
-        android:orientation="vertical"
-        android:gravity="center_horizontal"
-        >
-
-        <Button
-            android:id="@+id/submit"
-            android:layout_width="200dp"
-            android:layout_height="50dp"
-            android:layout_margin="10dp"
-            android:text="提交订单"
-            android:background="@drawable/buy_button_bg"
-
-            />
-
-        <Button
-            android:id="@+id/union_pay"
-            android:layout_width="100dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:text="UnionPay"
-            android:visibility="gone"
-            />
-
-        <Button
-            android:id="@+id/ali_pay"
-            android:layout_width="100dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:text="AliPay"
-            android:visibility="gone"
-            />
-
-        <Button
-            android:id="@+id/wx_pay"
-            android:layout_width="100dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:text="WeChat Pay"
-            android:visibility="gone"
-            />
-
-    </LinearLayout>
-
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.vtpayment.plugin.MainActivity" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="#DDA755" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="AllPay演示Demo"
+            android:layout_centerInParent="true"
+            android:textStyle="bold"
+            android:textColor="#ffffff"
+            />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        >
+
+
+
+        <TextView
+            android:id="@+id/text_merid"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30dp"
+            android:text="商户号:"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#000000"
+            android:layout_centerVertical="true"
+            />
+
+
+        <EditText
+            android:id="@+id/edit_merid"
+            android:layout_width="180dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@id/text_merid"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#888888"
+            android:inputType="numberDecimal"
+            android:enabled="false"
+            android:focusable="false"
+            android:layout_centerVertical="true"
+            />
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        >
+
+
+
+        <TextView
+            android:id="@+id/text_ordernum"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30dp"
+            android:text="订单号:"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#000000"
+            android:layout_centerVertical="true"
+            />
+
+
+        <EditText
+            android:id="@+id/edit_ordernum"
+            android:layout_width="180dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@id/text_ordernum"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#888888"
+            android:inputType="numberDecimal"
+            android:enabled="false"
+            android:focusable="false"
+            android:layout_centerVertical="true"
+            />
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        >
+
+        <TextView
+            android:id="@+id/text_amount"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30dp"
+            android:text="订单金额:"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#000000"
+            android:layout_centerVertical="true"
+            />
+
+
+        <EditText
+            android:id="@+id/edit_amount"
+            android:layout_width="180dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@id/text_amount"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#000000"
+            android:inputType="numberDecimal"
+            android:layout_centerVertical="true"
+            />
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        >
+
+        <TextView
+            android:id="@+id/text_currency"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30dp"
+            android:text="币种:"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#000000"
+            android:layout_centerVertical="true"
+            />
+
+
+        <Spinner android:id="@+id/spinner_currency"
+            android:layout_width="180dp"
+            android:layout_height="35dp"
+            android:layout_toRightOf="@id/text_currency"
+            android:layout_marginLeft="20dp"
+            android:paddingLeft="5dp"
+            android:background="#ffffff"
+            >
+
+        </Spinner>
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        >
+
+        <TextView
+            android:id="@+id/text_paymentschema"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30dp"
+            android:text="支付渠道:"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:textColor="#000000"
+            android:layout_centerVertical="true"
+            />
+
+
+        <Spinner android:id="@+id/spinner_paymentschema"
+            android:layout_width="180dp"
+            android:layout_height="35dp"
+            android:layout_toRightOf="@id/text_paymentschema"
+            android:layout_marginLeft="20dp"
+            android:paddingLeft="5dp"
+            android:background="#ffffff"
+            >
+
+        </Spinner>
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="100dp"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        >
+
+        <Button
+            android:id="@+id/submit"
+            android:layout_width="200dp"
+            android:layout_height="50dp"
+            android:layout_margin="10dp"
+            android:text="提交订单"
+            android:background="@drawable/buy_button_bg"
+
+            />
+
+        <Button
+            android:id="@+id/union_pay"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="UnionPay"
+            android:visibility="gone"
+            />
+
+        <Button
+            android:id="@+id/ali_pay"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="AliPay"
+            android:visibility="gone"
+            />
+
+        <Button
+            android:id="@+id/wx_pay"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="WeChat Pay"
+            android:visibility="gone"
+            />
+
+    </LinearLayout>
+
 </LinearLayout>

v5/android/android_sdk/Demo/app/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>

v5/android/android_sdk/Demo/app/src/main/res/values/strings.xml

@@ -1,13 +1,7 @@
-<resources>
-    <string name="app_name">Demo</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
-    <string name="pay_type_yl">银联(易联)</string>
-    <string name="pay_type_apmp">支付宝</string>
-    <string name="pay_type_wx">微信</string>
-    <string name="pay_type_up">银联</string>
-    <string name="pay_type_mup">银联信用卡</string>
-    <string name="pay_type_dp">国际卡</string>
-    <string name="pay_type_eb">Easebuzz</string>
-    <string name="pay_type_ca">CCAvenue</string>
-</resources>
+<resources>
+    <string name="app_name">Demo</string>
+    <string name="pay_type_apmp">支付宝</string>
+    <string name="pay_type_wx">微信</string>
+    <string name="pay_type_up">银联</string>
+    <string name="pay_type_ca">CCAvenue</string>
+</resources>

v5/android/android_sdk/Demo/app/src/main/res/values/styles.xml

@@ -1,11 +1,11 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>

v5/android/android_sdk/Demo/app/src/test/java/com/vtpayment/plugin/ExampleUnitTest.java

@@ -1,17 +1,17 @@
-package com.vtpayment.plugin;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
+package com.vtpayment.plugin;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
 }

v5/android/android_sdk/Demo/build.gradle

@@ -1,24 +1,37 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        jcenter()
-
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    ext {
+        kotlin_version = "1.3.72"
+        appcompat = "1.2.0"
+        dokka_version = '1.4.10.2'
+    }
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" //新添加的这一classpath
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        maven {
+            url 'https://s01.oss.sonatype.org/content/repositories/releases/'
+            //url 'https://s01.oss.sonatype.org/content/groups/staging/'
+        }
+
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

v5/android/android_sdk/Demo/gradle.properties

@@ -1,22 +1,19 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
--keep class org.simalliance.openmobileapi.** {*;}
--keep class org.simalliance.openmobileapi.service.** {*;}
-
--keep class com.unionpay.** {*;}
--keep class com.allpayx.sdk.** {*;}
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true

v5/android/android_sdk/Demo/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 16 19:18:48 CST 2021
+#Thu Apr 30 15:25:42 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

v5/android/android_sdk/Demo/gradlew

@@ -1,160 +1,160 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

v5/android/android_sdk/Demo/settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':app'

v5/ios/ios_sdk/Demo/Demo.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		8139EED81BFEF1250061D7EA /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 8139EED21BFEF1250061D7EA /* DateUtil.m */; };
 		8139EED91BFEF1250061D7EA /* PayOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8139EED41BFEF1250061D7EA /* PayOrder.m */; };
 		8139EEDA1BFEF1250061D7EA /* SignUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 8139EED61BFEF1250061D7EA /* SignUtil.m */; };
+		813B7820265361AE0007FA20 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 813B781F265361AE0007FA20 /* libWeChatSDK.a */; };
 		81425F831C055722007CA494 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81425F821C055722007CA494 /* CoreGraphics.framework */; };
 		81425F851C055757007CA494 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81425F841C055757007CA494 /* CoreLocation.framework */; };
 		816ACAD11BFF014800F4EC4F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816ACAD01BFF014800F4EC4F /* QuartzCore.framework */; };
@@ -97,6 +98,7 @@
 		8139EED41BFEF1250061D7EA /* PayOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayOrder.m; sourceTree = "<group>"; };
 		8139EED51BFEF1250061D7EA /* SignUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignUtil.h; sourceTree = "<group>"; };
 		8139EED61BFEF1250061D7EA /* SignUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignUtil.m; sourceTree = "<group>"; };
+		813B781F265361AE0007FA20 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeChatSDK.a; sourceTree = "<group>"; };
 		81425F801C055712007CA494 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		81425F821C055722007CA494 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		81425F841C055757007CA494 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -143,6 +145,7 @@
 				81425F851C055757007CA494 /* CoreLocation.framework in Frameworks */,
 				81DA81382499E2F800329886 /* AlipaySDK.framework in Frameworks */,
 				81425F831C055722007CA494 /* CoreGraphics.framework in Frameworks */,
+				813B7820265361AE0007FA20 /* libWeChatSDK.a in Frameworks */,
 				816ACAD91BFF025B00F4EC4F /* libc++.tbd in Frameworks */,
 				816ACAD71BFF024E00F4EC4F /* libsqlite3.tbd in Frameworks */,
 				816ACAD31BFF019300F4EC4F /* Security.framework in Frameworks */,
@@ -302,6 +305,7 @@
 		81DA813D249A009200329886 /* WXModule */ = {
 			isa = PBXGroup;
 			children = (
+				813B781F265361AE0007FA20 /* libWeChatSDK.a */,
 				81DA813E249A009200329886 /* libWXModule.a */,
 				81DA813F249A009200329886 /* WXApi.h */,
 				81DA8140249A009200329886 /* WXApiObject.h */,