diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5f94008
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..bc16ad5
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 24
+ buildToolsVersion "24.0.3"
+
+ defaultConfig {
+ applicationId "com.tsy.paydemo"
+ minSdkVersion 11
+ targetSdkVersion 23
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+ testCompile 'junit:junit:4.12'
+ compile 'com.android.support:appcompat-v7:24.2.1'
+
+ compile project(':pay_android_sdk')
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..b253438
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/tsy/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 *;
+#}
diff --git a/pay_android_sdk/src/androidTest/java/com/ci123/service/pay/ApplicationTest.java b/app/src/androidTest/java/com/tsy/paydemo/ApplicationTest.java
similarity index 91%
rename from pay_android_sdk/src/androidTest/java/com/ci123/service/pay/ApplicationTest.java
rename to app/src/androidTest/java/com/tsy/paydemo/ApplicationTest.java
index 4cb5e84..e81c514 100644
--- a/pay_android_sdk/src/androidTest/java/com/ci123/service/pay/ApplicationTest.java
+++ b/app/src/androidTest/java/com/tsy/paydemo/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.ci123.service.pay;
+package com.tsy.paydemo;
import android.app.Application;
import android.test.ApplicationTestCase;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..e9fc393
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/tsy/paydemo/MainActivity.java b/app/src/main/java/com/tsy/paydemo/MainActivity.java
new file mode 100644
index 0000000..e584741
--- /dev/null
+++ b/app/src/main/java/com/tsy/paydemo/MainActivity.java
@@ -0,0 +1,180 @@
+package com.tsy.paydemo;
+
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.tsy.sdk.pay.PayUtils;
+import com.tsy.sdk.pay.alipay.Alipay;
+import com.tsy.sdk.pay.weixin.WXPay;
+
+public class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+ private EditText editWXParam, editAlipayParam;
+ private Button btnWXPay, btnAlipay, btnWXClear, btnWXPaste, btnAliPayClear, btnAliPayPaste, btnGetIp;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ editAlipayParam = (EditText)findViewById(R.id.editAlipayParam);
+ editWXParam = (EditText)findViewById(R.id.editWXParam);
+ btnAlipay = (Button)findViewById(R.id.btnAliPay);
+ btnWXPay = (Button)findViewById(R.id.btnWXPay);
+ btnWXClear = (Button)findViewById(R.id.btnWXClear);
+ btnWXPaste = (Button)findViewById(R.id.btnWXPaste);
+ btnAliPayClear = (Button)findViewById(R.id.btnAliPayClear);
+ btnAliPayPaste = (Button)findViewById(R.id.btnAliPayPaste);
+ btnGetIp = (Button)findViewById(R.id.btnGetIp);
+
+ btnAlipay.setOnClickListener(this);
+ btnWXPay.setOnClickListener(this);
+ btnWXClear.setOnClickListener(this);
+ btnWXPaste.setOnClickListener(this);
+ btnAliPayClear.setOnClickListener(this);
+ btnAliPayPaste.setOnClickListener(this);
+ btnGetIp.setOnClickListener(this);
+ }
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.btnWXPay:
+ String wx_pay_param = editWXParam.getText().toString();
+ if(TextUtils.isEmpty(wx_pay_param)) {
+ Toast.makeText(getApplication(), "请输入参数", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ doWXPay(wx_pay_param);
+ break;
+
+ case R.id.btnWXClear:
+ editWXParam.setText("");
+ break;
+
+ case R.id.btnWXPaste:
+ ClipboardManager cbm=(ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
+ editWXParam.setText(cbm.getText());
+ break;
+
+ case R.id.btnAliPay:
+ String alipay_pay_param = editAlipayParam.getText().toString();
+ if(TextUtils.isEmpty(alipay_pay_param)) {
+ Toast.makeText(getApplication(), "请输入参数", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ doAlipay(alipay_pay_param);
+ break;
+
+ case R.id.btnAliPayClear:
+ editAlipayParam.setText("");
+ break;
+
+ case R.id.btnAliPayPaste:
+ ClipboardManager cbm2=(ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
+ editAlipayParam.setText(cbm2.getText());
+ break;
+
+ case R.id.btnGetIp:
+ String ip = PayUtils.getIpAddress();
+ if(ip != null) {
+ Toast.makeText(getApplication(), ip, Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(getApplication(), "获取ip失败", Toast.LENGTH_SHORT).show();
+ }
+
+ default:
+ break;
+ }
+ }
+
+ /**
+ * 支付宝支付
+ * @param pay_param 支付服务生成的支付参数
+ */
+ private void doAlipay(String pay_param) {
+ new Alipay(this, pay_param, new Alipay.AlipayResultCallBack() {
+ @Override
+ public void onSuccess() {
+ Toast.makeText(getApplication(), "支付成功", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onDealing() {
+ Toast.makeText(getApplication(), "支付处理中...", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onError(int error_code) {
+ switch (error_code) {
+ case Alipay.ERROR_RESULT:
+ Toast.makeText(getApplication(), "支付失败:支付结果解析错误", Toast.LENGTH_SHORT).show();
+ break;
+
+ case Alipay.ERROR_NETWORK:
+ Toast.makeText(getApplication(), "支付失败:网络连接错误", Toast.LENGTH_SHORT).show();
+ break;
+
+ case Alipay.ERROR_PAY:
+ Toast.makeText(getApplication(), "支付错误:支付码支付失败", Toast.LENGTH_SHORT).show();
+ break;
+
+ default:
+ Toast.makeText(getApplication(), "支付错误", Toast.LENGTH_SHORT).show();
+ break;
+ }
+
+ }
+
+ @Override
+ public void onCancel() {
+ Toast.makeText(getApplication(), "支付取消", Toast.LENGTH_SHORT).show();
+ }
+ }).doPay();
+ }
+
+ /**
+ * 微信支付
+ * @param pay_param 支付服务生成的支付参数
+ */
+ private void doWXPay(String pay_param) {
+ String wx_appid = "wx6b69bdbf2adca4f8"; //替换为自己的appid
+ WXPay.init(getApplicationContext(), wx_appid); //要在支付前调用
+ WXPay.getInstance().doPay(pay_param, new WXPay.WXPayResultCallBack() {
+ @Override
+ public void onSuccess() {
+ Toast.makeText(getApplication(), "支付成功", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onError(int error_code) {
+ switch (error_code) {
+ case WXPay.NO_OR_LOW_WX:
+ Toast.makeText(getApplication(), "未安装微信或微信版本过低", Toast.LENGTH_SHORT).show();
+ break;
+
+ case WXPay.ERROR_PAY_PARAM:
+ Toast.makeText(getApplication(), "参数错误", Toast.LENGTH_SHORT).show();
+ break;
+
+ case WXPay.ERROR_PAY:
+ Toast.makeText(getApplication(), "支付失败", Toast.LENGTH_SHORT).show();
+ break;
+ }
+ }
+
+ @Override
+ public void onCancel() {
+ Toast.makeText(getApplication(), "支付取消", Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+
+
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..3104628
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_wxpay_entry.xml b/app/src/main/res/layout/activity_wxpay_entry.xml
new file mode 100644
index 0000000..c1e106a
--- /dev/null
+++ b/app/src/main/res/layout/activity_wxpay_entry.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..cde69bc
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..c133a0c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..bfa42f0
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..324e72c
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..aee44e1
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 64dp
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..3ab3e9c
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+
+
+ #3F51B5
+ #303F9F
+ #FF4081
+
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..b21b5d0
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ PayDemo
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..5885930
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/pay_android_sdk/src/test/java/com/ci123/service/pay/ExampleUnitTest.java b/app/src/test/java/com/tsy/paydemo/ExampleUnitTest.java
similarity index 90%
rename from pay_android_sdk/src/test/java/com/ci123/service/pay/ExampleUnitTest.java
rename to app/src/test/java/com/tsy/paydemo/ExampleUnitTest.java
index d875852..f98a371 100644
--- a/pay_android_sdk/src/test/java/com/ci123/service/pay/ExampleUnitTest.java
+++ b/app/src/test/java/com/tsy/paydemo/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.ci123.service.pay;
+package com.tsy.paydemo;
import org.junit.Test;
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..c20bca1
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,23 @@
+// 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.2'
+
+ // 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
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..1d3591c
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,18 @@
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# 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
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..5d7b47a
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Oct 31 18:43:39 CST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/gradlew
@@ -0,0 +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 "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pay_android_sdk/build.gradle b/pay_android_sdk/build.gradle
index 5af02e6..db4edfc 100644
--- a/pay_android_sdk/build.gradle
+++ b/pay_android_sdk/build.gradle
@@ -1,8 +1,8 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ compileSdkVersion 24
+ buildToolsVersion "24.0.3"
defaultConfig {
minSdkVersion 9
@@ -21,18 +21,5 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
- compile 'com.android.support:appcompat-v7:23.4.0'
-}
-
-task clearJar(type: Delete) {
- delete 'build/libs/ci_service_pay_lib.jar'
-}
-
-task makeJar(type: Copy) {
- from('build/intermediates/bundles/release/')
- into('build/libs/')
- include('classes.jar')
- rename ('classes.jar', 'ci_service_pay_lib.jar')
-}
-
-makeJar.dependsOn(clearJar, build)
\ No newline at end of file
+ compile 'com.android.support:appcompat-v7:24.2.1'
+}
\ No newline at end of file
diff --git a/pay_android_sdk/src/androidTest/java/com/tsy/sdk/pay/ApplicationTest.java b/pay_android_sdk/src/androidTest/java/com/tsy/sdk/pay/ApplicationTest.java
new file mode 100644
index 0000000..a9d40c5
--- /dev/null
+++ b/pay_android_sdk/src/androidTest/java/com/tsy/sdk/pay/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.tsy.sdk.pay;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/pay_android_sdk/src/main/AndroidManifest.xml b/pay_android_sdk/src/main/AndroidManifest.xml
index 8f99c65..a7bf820 100644
--- a/pay_android_sdk/src/main/AndroidManifest.xml
+++ b/pay_android_sdk/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
+ package="com.tsy.sdk.pay">
\ No newline at end of file
diff --git a/pay_android_sdk/src/main/java/com/ci123/service/pay/PayUtils.java b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/PayUtils.java
similarity index 97%
rename from pay_android_sdk/src/main/java/com/ci123/service/pay/PayUtils.java
rename to pay_android_sdk/src/main/java/com/tsy/sdk/pay/PayUtils.java
index 1a0a255..3f31f30 100644
--- a/pay_android_sdk/src/main/java/com/ci123/service/pay/PayUtils.java
+++ b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/PayUtils.java
@@ -1,4 +1,4 @@
-package com.ci123.service.pay;
+package com.tsy.sdk.pay;
import java.net.Inet4Address;
import java.net.InetAddress;
diff --git a/pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/Alipay.java b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/alipay/Alipay.java
similarity index 98%
rename from pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/Alipay.java
rename to pay_android_sdk/src/main/java/com/tsy/sdk/pay/alipay/Alipay.java
index d3c15da..94011e4 100644
--- a/pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/Alipay.java
+++ b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/alipay/Alipay.java
@@ -1,4 +1,4 @@
-package com.ci123.service.pay.alipay;
+package com.tsy.sdk.pay.alipay;
import android.app.Activity;
import android.content.Context;
diff --git a/pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/AlipayResult.java b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/alipay/AlipayResult.java
similarity index 97%
rename from pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/AlipayResult.java
rename to pay_android_sdk/src/main/java/com/tsy/sdk/pay/alipay/AlipayResult.java
index 1f41478..a14ab7c 100644
--- a/pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/AlipayResult.java
+++ b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/alipay/AlipayResult.java
@@ -1,4 +1,4 @@
-package com.ci123.service.pay.alipay;
+package com.tsy.sdk.pay.alipay;
import android.text.TextUtils;
diff --git a/pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPay.java b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/weixin/WXPay.java
similarity index 98%
rename from pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPay.java
rename to pay_android_sdk/src/main/java/com/tsy/sdk/pay/weixin/WXPay.java
index dca6d65..f7bbf8a 100644
--- a/pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPay.java
+++ b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/weixin/WXPay.java
@@ -1,4 +1,4 @@
-package com.ci123.service.pay.weixin;
+package com.tsy.sdk.pay.weixin;
import android.content.Context;
import android.text.TextUtils;
diff --git a/pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPayCallbackActivity.java b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/weixin/WXPayCallbackActivity.java
similarity index 95%
rename from pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPayCallbackActivity.java
rename to pay_android_sdk/src/main/java/com/tsy/sdk/pay/weixin/WXPayCallbackActivity.java
index 0af603b..3702f1b 100644
--- a/pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPayCallbackActivity.java
+++ b/pay_android_sdk/src/main/java/com/tsy/sdk/pay/weixin/WXPayCallbackActivity.java
@@ -1,11 +1,11 @@
-package com.ci123.service.pay.weixin;
+package com.tsy.sdk.pay.weixin;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
-import com.ci123.service.pay.R;
+import com.tsy.sdk.pay.R;
import com.tencent.mm.sdk.constants.ConstantsAPI;
import com.tencent.mm.sdk.modelbase.BaseReq;
import com.tencent.mm.sdk.modelbase.BaseResp;
diff --git a/pay_android_sdk/src/test/java/com/tsy/sdk/pay/ExampleUnitTest.java b/pay_android_sdk/src/test/java/com/tsy/sdk/pay/ExampleUnitTest.java
new file mode 100644
index 0000000..30871a3
--- /dev/null
+++ b/pay_android_sdk/src/test/java/com/tsy/sdk/pay/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.tsy.sdk.pay;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() throws Exception {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..0370290
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':pay_android_sdk'