wudebin 1 mese fa
parent
commit
d88bb3bdb2

+ 2 - 2
Strides-SPAPP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Mon May 04 18:07:10 CST 2026
-VERSION_CODE=957
+#Wed May 06 13:20:48 CST 2026
+VERSION_CODE=959

+ 5 - 1
Strides-SPAPP/app/pages/Router.js

@@ -522,7 +522,11 @@ const Router = () => {
       if (utils.isNotEmpty(name)) {
         let _current = navigation.current?.getCurrentRoute()
         utils.logEventTracking("page_navigation", _current.name + " → " + name);
-        navigation.current?.navigate(name, params);
+        if (navigation.current.navigateDeprecated) {
+          navigation.current.navigateDeprecated(name, params);
+        } else {
+          navigation.current.navigate(name, params);
+        }
       }
     }
     global.dispatchPage = (params) => {

+ 4 - 2
Strides-SPAPP/app/pages/charge/QRScan.js

@@ -33,6 +33,7 @@ export default class QRScan extends Component {
 
   componentDidMount() {
     this.props.navigation.addListener('focus', () => {
+      this.scaning = false;
       setTimeout(() => {
         this.setState({
           isResult: false
@@ -161,6 +162,8 @@ export default class QRScan extends Component {
           });
           if (code == 5194 && btn == Dialog.BUTTON_OK && app.vehicle.enable) {
             startPage(app.vehicle.newVersionPage ? PageList.vehiclesListV2 : PageList.myVehicles)
+          } else {
+            this.scaning = false;
           }
         },
         onBackPress: () => {
@@ -168,10 +171,9 @@ export default class QRScan extends Component {
           this.setState({
             isResult: false
           });
+          this.scaning = false;
         }
       })
-    }).finally(() => {
-      this.scaning = false;
     });
   }