Jelajahi Sumber

Upgrade to Android SDK 34

vbea 1 tahun lalu
induk
melakukan
92defd8bd9

+ 4 - 4
Strides-APP/android/build.gradle

@@ -1,11 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        versionName = "3.1.7" //★★★★★版本号★★★★★
-        buildToolsVersion = "33.0.2"
+        versionName = "3.1.8" //★★★★★版本号★★★★★
+        buildToolsVersion = "34.0.0"
         minSdkVersion = 23
-        compileSdkVersion = 33
-        targetSdkVersion = 33
+        compileSdkVersion = 34
+        targetSdkVersion = 34
         kotlinVersion = "1.6.21"
         playServicesVersion = "17.0.0"
         firebaseMessagingVersion = "21.1.0"

+ 1 - 1
Strides-APP/app.json

@@ -2,7 +2,7 @@
   "name": "Strides",
   "displayName": "ChargEco",
   "versionCode": 440,
-  "versionName": "V3.1.7",
+  "versionName": "V3.1.8",
   "product": false,
   "debug": true,
   "isWhitelabel": true,

+ 9 - 7
Strides-APP/app/pages/payment/PaymentWeb.js

@@ -22,7 +22,7 @@ export default class PaymentWeb extends Component {
       }
     };
     this.canBack = false;
-    this.stateListener;
+    this.stateListener = undefined;
   }
 
   componentDidMount() {
@@ -34,12 +34,14 @@ export default class PaymentWeb extends Component {
         paymentInfo: param
       }, () => this.init());
     }
-    this.stateListener = AppState.addEventListener("change", state => {
-      if (state == 'active' && this.state.isCallback) {
-        //console.log("AppState", state);
-        this.completePayment();
-      }
-    });
+    if (!PaymentDefault.enableInnerWebView) {
+      this.stateListener = AppState.addEventListener("change", state => {
+        if (state == 'active' && this.state.isCallback) {
+          //console.log("AppState", state);
+          this.completePayment();
+        }
+      });
+    }
     /*this.props.navigation.addListener('beforeRemove', e => {
       if (!this.canBack) {
         if (this.state.isRepay) {