更新最新支付宝支付接口

README.md

@@ -1,7 +1,17 @@
 # PayAndroid
-对微信支付和支付宝支付的App端SDK进行二次封装，对外提供一个较为简单的接口和支付结果回调
 
-注：生成pay_param的部分可见：http://www.jianshu.com/p/9b353529f02c
+> 对微信支付和支付宝支付的App端SDK进行二次封装，对外提供一个较为简单的接口和支付结果回调
+
+
+## 注意注意：支付宝开放平台新支付的通知！
+
+支付宝升级了支付模式，增加开放平台的概念，之前只要在商户平台申请pid即可实现支付，现在是在开放平台创建App，根据相应APP_ID发起支付。更新后调用方式不变。
+
+1. 老版本接口支付
+   pay_param生成参见：http://www.jianshu.com/p/9b353529f02c
+
+2. 新版本接口支付
+   pay_param生成参见：http://www.jianshu.com/p/59341ea9d86d
 
 ## Android SDK接入指南
 

pay_android_sdk_1.0/build.gradle → pay_android_sdk/build.gradle

@@ -22,8 +22,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.4.0'
-    compile files('libs/alipaySdk-20160516.jar')
-    compile files('libs/libammsdk.jar')
 }
 
 task clearJar(type: Delete) {

pay_android_sdk/src/androidTest/java/com/ci123/service/pay/ApplicationTest.java

@@ -0,0 +1,13 @@
+package com.ci123.service.pay;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}

pay_android_sdk_1.0/src/main/AndroidManifest.xml → pay_android_sdk/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tsy.pay">
+    package="com.ci123.service.pay">
 
 </manifest>

pay_android_sdk_1.0/src/main/java/com/tsy/pay/PayUtils.java → pay_android_sdk/src/main/java/com/ci123/service/pay/PayUtils.java

@@ -1,4 +1,4 @@
-package com.tsy.pay;
+package com.ci123.service.pay;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;

pay_android_sdk_1.0/src/main/java/com/tsy/pay/alipay/Alipay.java → pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/Alipay.java

@@ -1,4 +1,4 @@
-package com.tsy.pay.alipay;
+package com.ci123.service.pay.alipay;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,6 +7,8 @@
 
 import com.alipay.sdk.app.PayTask;
 
+import java.util.Map;
+
 /**
  * 支付宝支付
  * Created by tsy on 16/6/1.
@@ -39,9 +41,7 @@ public void doPay() {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                String result = mPayTask.pay(mParams, true);
-
-                final AlipayResult pay_result = new AlipayResult(result);
+                final Map<String, String> pay_result = mPayTask.payV2(mParams,true);
                 handler.post(new Runnable() {
                     @Override
                     public void run() {
@@ -54,7 +54,7 @@ public void run() {
                             return;
                         }
 
-                        String resultStatus = pay_result.getResultStatus();
+                        String resultStatus = pay_result.get("resultStatus");
                         if(TextUtils.equals(resultStatus, "9000")) {    //支付成功
                             mCallback.onSuccess();
                         } else if(TextUtils.equals(resultStatus, "8000")) { //支付结果因为支付渠道原因或者系统原因还在等待支付结果确认，最终交易是否成功以服务端异步通知为准（小概率状态）

pay_android_sdk_1.0/src/main/java/com/tsy/pay/alipay/AlipayResult.java → pay_android_sdk/src/main/java/com/ci123/service/pay/alipay/AlipayResult.java

@@ -1,4 +1,4 @@
-package com.tsy.pay.alipay;
+package com.ci123.service.pay.alipay;
 
 import android.text.TextUtils;
 

pay_android_sdk_1.0/src/main/java/com/tsy/pay/weixin/WXPay.java → pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPay.java

@@ -1,4 +1,4 @@
-package com.tsy.pay.weixin;
+package com.ci123.service.pay.weixin;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -73,7 +73,7 @@ public void doPay(String pay_param, WXPayResultCallBack callback) {
             }
             return;
         }
-        if(param == null || TextUtils.isEmpty(param.optString("appid")) || TextUtils.isEmpty(param.optString("partnerid"))
+        if(TextUtils.isEmpty(param.optString("appid")) || TextUtils.isEmpty(param.optString("partnerid"))
                 || TextUtils.isEmpty(param.optString("prepayid")) || TextUtils.isEmpty(param.optString("package")) ||
                 TextUtils.isEmpty(param.optString("noncestr")) || TextUtils.isEmpty(param.optString("timestamp")) ||
                 TextUtils.isEmpty(param.optString("sign"))) {

pay_android_sdk_1.0/src/main/java/com/tsy/pay/weixin/WXPayCallbackActivity.java → pay_android_sdk/src/main/java/com/ci123/service/pay/weixin/WXPayCallbackActivity.java

@@ -1,11 +1,11 @@
-package com.tsy.pay.weixin;
+package com.ci123.service.pay.weixin;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.tsy.pay.R;
+import com.ci123.service.pay.R;
 import com.tencent.mm.sdk.constants.ConstantsAPI;
 import com.tencent.mm.sdk.modelbase.BaseReq;
 import com.tencent.mm.sdk.modelbase.BaseResp;

pay_android_sdk/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">ci_service_pay_lib</string>
+</resources>

pay_android_sdk/src/test/java/com/ci123/service/pay/ExampleUnitTest.java

@@ -0,0 +1,15 @@
+package com.ci123.service.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);
+    }
+}