From fbdac91a3b08dfac37ebc6b03dd9d5d485b24e19 Mon Sep 17 00:00:00 2001
From: TJHello <1029291429@qq.com>
Date: Tue, 26 May 2020 15:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E5=9B=9E=E8=B0=83=E7=BA=B3=E5=85=A5?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  2 +
 .../gitee/billing/GoogleBillingUtil.java      | 50 +++++++++++++------
 .../billing/OnGoogleBillingListener.java      |  7 +++
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1485309..3999ce7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/billing/src/main/java/com/tjbaobao/gitee/billing/GoogleBillingUtil.java b/billing/src/main/java/com/tjbaobao/gitee/billing/GoogleBillingUtil.java
index c85b627..59dbe21 100644
--- a/billing/src/main/java/com/tjbaobao/gitee/billing/GoogleBillingUtil.java
+++ b/billing/src/main/java/com/tjbaobao/gitee/billing/GoogleBillingUtil.java
@@ -421,31 +421,27 @@ private List<Purchase> queryPurchases(String tag,String skuType)
     //endregion
 
     //region===================================在线订单查询=================================
-
     /**
      * 异步联网查询所有的内购历史-无论是过期的、取消、等等的订单
-     * @param listener 监听器
+     * @param activity activity
      */
-    public void queryPurchaseHistoryAsyncInApp(PurchaseHistoryResponseListener listener){
-        if(isReady()) {
-            mBillingClient.queryPurchaseHistoryAsync(BillingClient.SkuType.INAPP,listener);
-        } else{
-            listener.onPurchaseHistoryResponse(BillingClient.BillingResponse.SERVICE_DISCONNECTED,null);
-        }
+    public void queryPurchaseHistoryAsyncInApp(Activity activity){
+        queryPurchaseHistoryAsync(getTag(activity),BILLING_TYPE_INAPP);
     }
 
     /**
      * 异步联网查询所有的订阅历史-无论是过期的、取消、等等的订单
-     * @param listener 监听器
+     * @param activity activity
      */
-    public void queryPurchaseHistoryAsyncSubs(PurchaseHistoryResponseListener listener){
+    public void queryPurchaseHistoryAsyncSubs(Activity activity){
+        queryPurchaseHistoryAsync(getTag(activity),BILLING_TYPE_SUBS);
+    }
+
+    private void queryPurchaseHistoryAsync(String tag,String type){
         if(isReady()) {
-            mBillingClient.queryPurchaseHistoryAsync(BillingClient.SkuType.SUBS,listener);
-        }else{
-            listener.onPurchaseHistoryResponse(BillingClient.BillingResponse.SERVICE_DISCONNECTED,null);
+            mBillingClient.queryPurchaseHistoryAsync(type,new MyPurchaseHistoryResponseListener(tag));
         }
     }
-
     //endregion
 
     //region===================================工具集合=================================
@@ -747,12 +743,36 @@ public void onConsumeResponse(int responseCode, String purchaseToken) {
         }
     }
 
+    private class MyPurchaseHistoryResponseListener implements PurchaseHistoryResponseListener{
+
+        private String tag ;
+        public MyPurchaseHistoryResponseListener(String tag) {
+            this.tag = tag;
+        }
+
+        @Override
+        public void onPurchaseHistoryResponse(int responseCode, List<Purchase> list) {
+            if(responseCode== BillingClient.BillingResponse.OK&&list!=null){
+                for(OnGoogleBillingListener listener:onGoogleBillingListenerList){
+                    for (Purchase purchase : list) {
+                        listener.onQueryHistory(purchase);
+                    }
+                }
+            }else{
+                for(OnGoogleBillingListener listener:onGoogleBillingListenerList){
+                    listener.onFail(GoogleBillingListenerTag.HISTORY,responseCode,listener.tag.equals(tag));
+                }
+            }
+        }
+    }
+
     public enum GoogleBillingListenerTag{
 
         QUERY("query"),
         PURCHASE("purchase"),
         SETUP("setup"),
-        COMSUME("comsume")
+        COMSUME("comsume"),
+        HISTORY("history")
         ;
         public String tag ;
         GoogleBillingListenerTag(String tag){
diff --git a/billing/src/main/java/com/tjbaobao/gitee/billing/OnGoogleBillingListener.java b/billing/src/main/java/com/tjbaobao/gitee/billing/OnGoogleBillingListener.java
index 2a89f53..82ee650 100644
--- a/billing/src/main/java/com/tjbaobao/gitee/billing/OnGoogleBillingListener.java
+++ b/billing/src/main/java/com/tjbaobao/gitee/billing/OnGoogleBillingListener.java
@@ -115,4 +115,11 @@ public void onFail(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, int
     public void onError(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, boolean isSelf) {
     }
 
+    /**
+     * 获取历史订单-无论是否还有效
+     * @param purchase 商品实体
+     */
+    public void onQueryHistory(@NonNull Purchase purchase){
+
+    }
 }