From 93a98db51d99d32635a978f8a7a403041b30033a Mon Sep 17 00:00:00 2001
From: wxy <18768105626@163.com>
Date: Mon, 30 Sep 2019 10:46:26 +0800
Subject: [PATCH 1/3] fixed entryActivity target url if cordova-android version
 < 7.0

---
 scripts/android-install.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/android-install.js b/scripts/android-install.js
index 4653e94..d6ecf1c 100644
--- a/scripts/android-install.js
+++ b/scripts/android-install.js
@@ -43,12 +43,17 @@ module.exports = function (context) {
         console.info("Android platform has not been added.");
         return ;
     }
-
-    var targetDir  = path.join(projectRoot, "platforms", "android", "src", packageName.replace(/\./g, path.sep), "wxapi");
-
- 	if (!fs.existsSync(targetDir)) {
-		targetDir  = path.join(projectRoot, "platforms", "android", "app", "src", "main", "java", packageName.replace(/\./g, path.sep), "wxapi");
-	} 
+    
+    var targetDir;
+
+    var tempDir = path.join(projectRoot, "platforms", "android", "src", packageName.replace(/\./g, path.sep));
+    if(!fs.existsSync(tempDir)){
+        // cordova-android version >= 7.0
+        targetDir  = path.join(projectRoot, "platforms", "android", "app", "src", "main", "java", packageName.replace(/\./g, path.sep), "wxapi");
+    }else{
+        // cordova-android version < 7.0
+        targetDir  = path.join(projectRoot, "platforms", "android", "src", packageName.replace(/\./g, path.sep), "wxapi");
+    }
 
     // var engines =  config.getEngines();
 

From be92b620e3362357cf5ff64662da46cd0641975c Mon Sep 17 00:00:00 2001
From: "18768105626@163.com" <18768105626@163.com>
Date: Mon, 17 Oct 2022 14:48:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E9=80=89=E5=8F=96=E5=8F=91=E7=A5=A8=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=81=9A=E4=BB=BB?=
 =?UTF-8?q?=E4=BD=95=E9=80=89=E6=8B=A9=E8=B7=B3=E5=9B=9E=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/android/EntryActivity.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/android/EntryActivity.java b/src/android/EntryActivity.java
index 0be0760..b87385d 100644
--- a/src/android/EntryActivity.java
+++ b/src/android/EntryActivity.java
@@ -164,6 +164,11 @@ protected void plunckInvoiceData(BaseResp resp) {
             ChooseCardFromWXCardPackage.Resp resp1 = (ChooseCardFromWXCardPackage.Resp) resp;
             JSONObject response = new JSONObject();
 
+             if(resp1.cardItemList == null){
+              ctx.error(Wechat.ERROR_WECHAT_RESPONSE_USER_CANCEL);
+              return ;
+            }
+
             try {
                 JSONArray resp2 = new JSONArray(resp1.cardItemList);
                 response.put("data", resp2);

From 0c1a1e6a12aba96ab749682e434324234079ca9b Mon Sep 17 00:00:00 2001
From: "18768105626@163.com" <18768105626@163.com>
Date: Mon, 17 Oct 2022 18:59:08 +0800
Subject: [PATCH 3/3] update

---
 src/android/EntryActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/android/EntryActivity.java b/src/android/EntryActivity.java
index b87385d..2842148 100644
--- a/src/android/EntryActivity.java
+++ b/src/android/EntryActivity.java
@@ -165,8 +165,8 @@ protected void plunckInvoiceData(BaseResp resp) {
             JSONObject response = new JSONObject();
 
              if(resp1.cardItemList == null){
-              ctx.error(Wechat.ERROR_WECHAT_RESPONSE_USER_CANCEL);
-              return ;
+                ctx.error(Wechat.ERROR_WECHAT_RESPONSE_USER_CANCEL);
+                return ;
             }
 
             try {