修复支付问题

app/proguard-rules.pro

@@ -289,3 +289,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.huawei.hianalytics.**{*;}
 -keep class com.huawei.updatesdk.**{*;}
 -keep class com.huawei.hms.**{*;}
+
+-keep class com.shayu.lib_google.**{*;}
+-keep class com.shayu.lib_huawei.**{*;}

common/build.gradle

@@ -211,7 +211,7 @@ dependencies {
     api 'tech.sud.mgp:SudASR:1.3.3.1158'
 
     //华为支付插件包
-    api project(':lib_huawei')
+    //api project(':lib_huawei')
 
     //google插件包
     api project(':lib_google')

common/src/main/java/com/yunbao/common/utils/GoogleUtils.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON;
 
 import org.json.JSONObject;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -122,8 +123,21 @@ public class GoogleUtils {
         }
     }
 
+    Timer timer;
+
     public void setBillingListener(GoogleBillingListener billingListener) {
-        Timer timer = new Timer();
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+
+        try {
+            googlePay.getClass().getMethod("initResultCode").invoke(googlePay);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        timer = new Timer();
         TimerTask task = new TimerTask() {
             @Override
             public void run() {
@@ -133,18 +147,21 @@ public class GoogleUtils {
                     String token = resultCode.getString("resultToken");
                     String orderId = resultCode.getString("resultOrderId");
                     if (code == 0) {
+                        timer.cancel();
                         billingListener.onPaySuccess(token, orderId);
+                    } else if (code == 1) {
+                        timer.cancel();
+                        billingListener.onPayFailed("支付取消");
+                    } else if (code == 2) {
                         timer.cancel();
-                    } else if (code == 1 || code == 2) {
                         billingListener.onPayFailed("支付失败");
-                        timer.cancel();
                     }
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
             }
         };
-        timer.scheduleAtFixedRate(task, 60000, 1000);
+        timer.schedule(task, 1000, 1000);
     }
 
     public void initializeApp(Context context) {
@@ -175,7 +192,7 @@ public class GoogleUtils {
                 }
             }
         };
-        timer.schedule(task, 10000, 1000);
+        timer.schedule(task, 1000, 1000);
     }
 
     public void initFireToken(Activity activity) {
@@ -198,16 +215,14 @@ public class GoogleUtils {
         }
     }
 
-
     public void setQueryPurchaseListener(Activity activity, QueryPurchasesListener queryPurchasesListener) {
         Timer timer = new Timer();
         TimerTask task = new TimerTask() {
             @Override
             public void run() {
                 try {
-                    Class<?> clz = activity.getClassLoader().loadClass("com.shayu.lib_google.utils.GoogleBillingManage");
-                    googlePay = clz.getConstructor(Activity.class).newInstance(activity);
                     JSONObject object = (JSONObject) googlePay.getClass().getMethod("getQuerySize").invoke(googlePay);
+                    L.e("setQueryPurchaseListenersetQueryPurchaseListener__" + object.getInt("querySize"));
                     if (object.getInt("querySize") != -1) {
                         queryPurchasesListener.onResult(object);
                         timer.cancel();
@@ -217,7 +232,7 @@ public class GoogleUtils {
                 }
             }
         };
-        timer.schedule(task, 10000, 1000);
+        timer.schedule(task, 1000, 1000);
     }
 
 

config.gradle

@@ -20,7 +20,7 @@ ext {
 
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包
-            isGooglePlay     :  2,
+            isGooglePlay     :  1,
             //是否上报异常日志
             isUploadLog      :  true,
             //是否打包成插件包模式

gradle.properties

@@ -23,6 +23,6 @@ android.enableJetifier=true
 
 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=65471
+systemProp.https.proxyPort=55219
-systemProp.http.proxyPort=65471
+systemProp.http.proxyPort=55219
 #android.enableR8.fullMode=true

lib_google/src/main/java/com/shayu/lib_google/utils/GoogleBillingManage.java

@@ -1,7 +1,6 @@
 package com.shayu.lib_google.utils;
 
 import android.app.Activity;
-import android.os.Handler;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -145,6 +144,7 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
         queryPurchasesAsync(new PurchasesResponseListener() {
             @Override
             public void onQueryPurchasesResponse(@NonNull BillingResult billingResult, @NonNull List<Purchase> list) {
+                Log.e("TAG", "消耗所有商品消耗所有商品消耗所有商品消耗所有商品消耗所有商品消耗所有商品" + list.size());
                 querySize = list.size();
                 if (querySize > 0) {
                     tradeNo = list.get(0).getProducts().get(0);
@@ -162,12 +162,33 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
      * 查询商品订单
      */
     public void queryPurchasesAsync(PurchasesResponseListener responseListener) {
-        if (billingClient == null) return;
         //内购商品交易查询
+        if (billingClient == null) {
+            billingClient = BillingClient.newBuilder(mContext).setListener(this).enablePendingPurchases().build();
+            //请求连接到GooglePay
+            billingClient.startConnection(new BillingClientStateListener() {
+                @Override
+                public void onBillingSetupFinished(@NonNull BillingResult billingResult) {
+                    int code = billingResult.getResponseCode();
+                    if (code != BillingClient.BillingResponseCode.OK) {
+                        String msg = billingResult.getDebugMessage();
+                        Log.e(TAG, "连接到GooglePay失败    code = " + code + "    msg = " + msg);
+                        return;
+                    }
+                    Log.e(TAG, "连接到GooglePay成功");
                     QueryPurchasesParams inAppPurchasesQurey = QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.INAPP).build();
                     billingClient.queryPurchasesAsync(inAppPurchasesQurey, responseListener);
                 }
 
+                //连接失败
+                @Override
+                public void onBillingServiceDisconnected() {
+                    Log.e(TAG, "连接到GooglePay失败，请重试");
+                }
+            });
+        }
+    }
+
     public String getAdid() {
         try {
             return AdvertisingIdClient.getAdvertisingIdInfo(mContext).getId();
@@ -180,11 +201,15 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
         }
     }
 
-
     int resultCode = -1;
     String resultToken = "";
     String resultOrderId = "";
 
+
+    public void initResultCode() {
+        resultCode = -1;
+    }
+
     public JSONObject getPayResult() {
         JSONObject object = new JSONObject();
         try {

main/src/main/java/com/yunbao/main/activity/GoogleFragment.java

@@ -28,6 +28,9 @@ import com.yunbao.main.views.TestWebViewClient;
 @SuppressLint("ValidFragment")
 public class GoogleFragment extends Fragment {
 
+    private long lastClickTime = 0;
+    private static final long INTERVAL_TIME = 1500;
+
     private View view;
     public static String mOrderid, mProductId, MoneyUsds;
 
@@ -99,7 +102,8 @@ public class GoogleFragment extends Fragment {
 
         @JavascriptInterface
         public void androidNewGoToGooglePay(String ProductId, String OrderNumber, String MoneyUsd) {
-            Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
+            long currentTime = System.currentTimeMillis();
+            if (currentTime - lastClickTime > INTERVAL_TIME) {
                 mProductId = ProductId;
                 mOrderid = OrderNumber;
                 MoneyUsds = MoneyUsd;
@@ -139,11 +143,20 @@ public class GoogleFragment extends Fragment {
 
                     @Override
                     public void onPayFailed(String msg) {
+                        payHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
                                 ToastUtil.show(msg);
                             }
                         });
+                    }
+                });
                 googleUtils.purchase(mProductId);
             }
+            lastClickTime = currentTime;
+
+            Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
+        }
 
         @JavascriptInterface
         public void androidMethodBack() {

main/src/main/java/com/yunbao/main/activity/HuaWeiFragment.java

@@ -23,7 +23,8 @@ import com.yunbao.main.views.TestWebViewClient;
 
 @SuppressLint("ValidFragment")
 public class HuaWeiFragment extends Fragment {
-
+    private long lastClickTime = 0;
+    private static final long INTERVAL_TIME = 1500;
     private View view;
     public static String mOrderid, mProductId, MoneyUsds;
 
@@ -80,10 +81,11 @@ public class HuaWeiFragment extends Fragment {
         public void androidNewGoToGooglePay(String ProductId, String OrderNumber, String MoneyUsd) {
             Log.e(TAG, "ProductId:" + ProductId + "  OrderNumber:" + OrderNumber + "   MoneyUsd:" + MoneyUsd);
 
+            long currentTime = System.currentTimeMillis();
+            if (currentTime - lastClickTime > INTERVAL_TIME) {
                 if (ProductId.equals("zs640")) {
                     ProductId = "zs0640";
                 }
-
                 mProductId = ProductId;
                 mOrderid = OrderNumber;
                 MoneyUsds = MoneyUsd;
@@ -92,6 +94,10 @@ public class HuaWeiFragment extends Fragment {
                 HwBuilder hwBuilder = new HwBuilder(getActivity());
                 hwBuilder.pay(mProductId);
             }
+            lastClickTime = currentTime;
+
+
+        }
 
         @JavascriptInterface
         public void androidMethodBack() {

main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java

@@ -93,8 +93,6 @@ public class MyWalletActivity extends AbsActivity {
             loadingDialog.setShowText(getString(R.string.order_query));
 
             if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
-
-                googleUtils.queryPurchasesAsync();
                 googleUtils.setQueryPurchaseListener(mContext, new GoogleUtils.QueryPurchasesListener() {
                     @Override
                     public void onResult(JSONObject obj) {
@@ -139,10 +137,14 @@ public class MyWalletActivity extends AbsActivity {
                         }
                     }
                 });
-            } else {
+                googleUtils.queryPurchasesAsync();
+            } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
                 hwBuilder.consume();
                 loadingDialog.setShowText(getString(R.string.order_query_success));
                 payHandler.postDelayed(() -> loadingDialog.dismiss(), 2000);
+            } else {
+                loadingDialog.setShowText(getString(R.string.order_query_success));
+                payHandler.postDelayed(() -> loadingDialog.dismiss(), 2000);
             }
         });
 

settings.gradle

@@ -4,5 +4,5 @@ include ':FaceUnity'
 //include ':recognizer'//融云语音转文字模块
 include ':Share'
 include ':pluginsForAnchor'
-include ':lib_huawei'
+//include ':lib_huawei'
 include ':lib_google'