升级支付功能，修复内存泄漏

Author: sdwfqin

README.md

@@ -14,7 +14,7 @@
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
 
     // 支付模块
-    implementation 'com.sdwfqin.quicklib:paylib:3.0.2'
+    implementation 'com.sdwfqin.quicklib:paylib:3.1.0'
 
     // Android 图片加载库（Glide封装）
     implementation 'com.sdwfqin.quick:imageloader:3.0.2'
@@ -32,7 +32,7 @@
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
     // 支付模块
-    implementation 'com.sdwfqin.quicklib:paylib:1.0.5'
+    implementation 'com.sdwfqin.quicklib:paylib:1.1.1'
 
     // Android 图片加载库（Glide封装）
     implementation 'com.sdwfqin.quick:imageloader:2.0.2'

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // classpath "com.tencent.bugly:tinker-support:1.1.5"

paylib/README.md

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 // gradlew pay:clean pay:build pay:bintrayUpload
 
-version = "3.0.2"
+version = "3.1.0"
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode 10
+        versionCode 31
         versionName version
     }
 

paylib/build.gradle

@@ -37,13 +37,15 @@ public void handleMessage(Message msg) {
                     // 同步返回需要验证的信息
                     String resultInfo = payResult.getResult();
                     String resultStatus = payResult.getResultStatus();
+                    String memo = payResult.getMemo();
                     // 判断resultStatus 为9000则代表支付成功
-                    if (TextUtils.equals(resultStatus, "9000")) {
-                        sOnRequestListener.onSuccess(resultStatus);
-                    } else {
-                        // 该笔订单真实的支付结果，需要依赖服务端的异步通知。
-                        sOnRequestListener.onError(resultStatus);
+                    int status = 0;
+                    try {
+                        status = Integer.parseInt(resultStatus);
+                    } catch (NumberFormatException e) {
+                        status = -1;
                     }
+                    sOnRequestListener.onCallback(status, memo);
                     break;
                 }
                 default:
@@ -110,4 +112,10 @@ public static void aliPay(final Activity activity, String orderInfo, OnRequestLi
         payThread.start();
     }
 
+    /**
+     * 销毁
+     */
+    public static void detach() {
+        sOnRequestListener = null;
+    }
 }

paylib/src/main/java/com/sdwfqin/paylib/alipay/AliPayTools.java

@@ -7,7 +7,6 @@
  * @date 2018/1/25
  */
 public interface OnRequestListener {
-    void onSuccess(String s);
 
-    void onError(String s);
+    void onCallback(int code, String msg);
 }

paylib/src/main/java/com/sdwfqin/paylib/interfaces/OnRequestListener.java

@@ -23,6 +23,10 @@
  */
 public class WechatPay {
 
+    /**
+     * 未安装微信或微信版本过低
+     */
+    public static final int SUCCESS_PAY = 0;
     /**
      * 未安装微信或微信版本过低
      */
@@ -35,8 +39,16 @@ public class WechatPay {
      * 支付失败
      */
     public static final int ERROR_PAY = 3;
+    /**
+     * 支付取消
+     */
+    public static final int CANCEL_PAY = 4;
+    /**
+     * 统一下单网络异常
+     */
+    public static final int WX_NETWORK_ERROR = 5;
 
-    private static WechatPay sMWechatPay;
+    private static WechatPay sWechatPay;
     private IWXAPI mWXApi;
     private String mPayParam;
     private WechatPayResultCallBack mCallback;
@@ -47,13 +59,13 @@ public WechatPay(Context context, String wxAppid) {
     }
 
     public static void init(Context context, String wxAppid) {
-        if (sMWechatPay == null) {
-            sMWechatPay = new WechatPay(context, wxAppid);
+        if (sWechatPay == null) {
+            sWechatPay = new WechatPay(context, wxAppid);
         }
     }
 
     public static WechatPay getInstance() {
-        return sMWechatPay;
+        return sWechatPay;
     }
 
     public IWXAPI getWXApi() {
@@ -160,4 +172,14 @@ public interface WechatPayResultCallBack {
          */
         void onCancel();
     }
+
+    /**
+     * 销毁方法
+     */
+    public static void detach(){
+        if (sWechatPay != null){
+            sWechatPay.getWXApi().detach();
+        }
+        sWechatPay = null;
+    }
 }

paylib/src/main/java/com/sdwfqin/paylib/wechat/WechatPay.java

@@ -104,7 +104,7 @@ public static void wechatPayUnifyOrder(final Context mContext, final String appi
         call.enqueue(new Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
-                onRequestListener.onError(e.getMessage());
+                onRequestListener.onCallback(WechatPay.WX_NETWORK_ERROR, e.getMessage());
             }
 
             @Override
@@ -130,7 +130,7 @@ public void onResponse(Call call, Response response) throws IOException {
 
                     wechatPayApp(mContext, appid, mchId, wxPrivateKey, sortedMap, onRequestListener);
                 } catch (IOException e) {
-                    onRequestListener.onError(e.getMessage());
+                    onRequestListener.onCallback(WechatPay.WX_NETWORK_ERROR, e.getMessage());
                 }
             }
         });
@@ -225,30 +225,30 @@ public static void doWXPay(Context mContext, String wxAppid, String payParam, fi
         WechatPay.getInstance().doPay(payParam, new WechatPay.WechatPayResultCallBack() {
             @Override
             public void onSuccess() {
-                onRequestListener.onSuccess("微信支付成功");
+                onRequestListener.onCallback(WechatPay.SUCCESS_PAY, "微信支付成功");
             }
 
             @Override
             public void onError(int errorCode) {
                 switch (errorCode) {
                     case WechatPay.NO_OR_LOW_WX:
-                        onRequestListener.onError("未安装微信或微信版本过低");
+                        onRequestListener.onCallback(WechatPay.NO_OR_LOW_WX, "未安装微信或微信版本过低");
                         break;
 
                     case WechatPay.ERROR_PAY_PARAM:
-                        onRequestListener.onError("参数错误");
+                        onRequestListener.onCallback(WechatPay.ERROR_PAY_PARAM, "参数错误");
                         break;
 
                     case WechatPay.ERROR_PAY:
-                        onRequestListener.onError("支付失败");
+                        onRequestListener.onCallback(WechatPay.ERROR_PAY, "支付失败");
                         break;
                     default:
                 }
             }
 
             @Override
             public void onCancel() {
-                onRequestListener.onError("支付取消");
+                onRequestListener.onCallback(WechatPay.CANCEL_PAY, "支付取消");
             }
         });
     }