#13520 Amend text

Strides-APP/app.json

@@ -21,5 +21,6 @@
     "android": "market://details?id=com.strides.chargeco",
     "ios": "itms-appss://apps.apple.com/app/id1664718768",
     "refundUrl": "https://uat.chargeco.global/RefundPolicy.html"
-  }
+  },
+  "company": "Strides YTL Pte. Ltd."
 }

Strides-APP/app/i18n/locales/de.js

@@ -1,7 +1,7 @@
 /**
  * 德国语言包
  */
- export default {
+export default {
   name: "Deutsch",
   default: "Default",
 }

Strides-APP/app/i18n/locales/es.js

@@ -1,7 +1,7 @@
 /**
  * 法国语言包
  */
- export default {
+export default {
   name: "Español",
   default: "Predeterminado",
 }

Strides-APP/app/i18n/locales/fr.js

@@ -1,7 +1,7 @@
 /**
  * 法国语言包
  */
- export default {
+export default {
   name: "Français",
   default: "Défaut",
 }

Strides-APP/app/i18n/locales/ja.js

@@ -1,7 +1,7 @@
 /**
  * 日本语言包
  */
- export default {
+export default {
   name: "日本語",
   default: "デフォルト",
 }

Strides-APP/app/i18n/locales/km.js

@@ -1,7 +1,7 @@
 /**
  * 柬埔寨-高棉语言包
  */
- export default {
+export default {
   name: "ភាសាខ្មែរ",
   default: "លំនាំដើម",
 }

Strides-APP/app/i18n/locales/ko.js

@@ -1,7 +1,7 @@
 /**
  * 韩国语言包
  */
- export default {
+export default {
   name: "한국어",
   default: "기본",
 }

Strides-APP/app/i18n/locales/my.js

@@ -1,7 +1,7 @@
 /**
  * 缅甸语言包
  */
- export default {
+export default {
   name: "ဗာရမ်",
   default: "စံထားချက်",
 }

Strides-APP/app/i18n/locales/th.js

@@ -1,7 +1,7 @@
 /**
  * 泰文语言包
  */
- export default {
+export default {
   name: "ไทย",
   default: "ค่าปริยาย",
 }

Strides-APP/app/i18n/locales/vi.js

@@ -1,7 +1,7 @@
 /**
  * 越南语言包
  */
- export default {
+export default {
   name: "Tiếng Việt",
   default: "Mặc định",
 }

Strides-APP/app/i18n/locales/zh-TW.js

@@ -1,7 +1,7 @@
 /**
  * 繁體中文語言包
  */
- export default {
+export default {
   name: "繁體中文",
   default: "跟隨系統",
   nav: {

Strides-APP/app/pages/about/About.js

@@ -24,7 +24,8 @@ export default About = () => {
         <TextView style={styles.linkText} onPress={() => startPage(PageList.condition)}>{$t("drawer.termsOfUse")}</TextView>
         <TextView style={styles.linkText} onPress={() => startPage(PageList.privacy)}>{$t("drawer.privacyPolicy")}</TextView>
       </View>
-      <Text style={styles.copyright}>{'Copyright ' + /*app.versionName + ' Build ' + app.versionCode + */getYearRange()+' LUMI CHARGING PTE. LTD.'}</Text>
+      {/*app.versionName + ' Build ' + app.versionCode + */}
+      <Text style={styles.copyright}>{'Copyright ' + getYearRange() + ' ' + app.company}</Text>
     </View>
   );
 }
@@ -71,8 +72,8 @@ const styles = StyleSheet.create({
   },
   linkText: {
     ...ui.link,
-    fontSize: 10,
-    padding: 1,
+    fontSize: 11,
+    padding: 2,
     marginLeft: 4,
     marginRight: 4
   }

Strides-APP/app/pages/chargingV2/ChargingPage.js

@@ -83,7 +83,7 @@ export default class ChargingPage extends Component {
     if (!this.isPageShow) return;
     //this.init();
     apiCharge.getConnectorDetail(this.state.stationInfo).then(res => {
-      if (res.data.status) {
+      if (res.data.status && !this.state.isStoping) {
         const state = {
           isStoping: false,
           isCharging: false,
@@ -121,22 +121,14 @@ export default class ChargingPage extends Component {
             this.refreshChargeData();
             break;
           case 'SuspendedEVSE':
-            this.setState({
-              errorCode: 'A5',
-              showErrorDialog: true,
-              errorMessage: $t('charging.errUnable2Charge')
-            });
+            this.showErrorDialog('A5', $t('charging.errUnable2Charge'));
             break;
           case 'SuspendedEV': //已连接上但未充电
             state.isAuthentic = true;
             //this.refreshChargeData();
             break;
           case 'Reserved': //预定中
-            this.setState({
-              errorCode: 'A5',
-              showErrorDialog: true,
-              errorMessage: $t('charging.errUnable2Reserved')
-            });
+            this.showErrorDialog('A5', $t('charging.errUnable2Reserved'));
             break;
           case 'Finishing': //已完成
             if (res.data.chargingPk) {
@@ -160,11 +152,7 @@ export default class ChargingPage extends Component {
             }
             break;
           default:
-            this.setState({
-              errorCode: 'A4',
-              showErrorDialog: true,
-              errorMessage: $t('charging.errNotChargeE0')
-            });
+            this.showErrorDialog('A4', $t('charging.errNotChargeE0'));
             break;
         }
         this.setState(state)
@@ -223,17 +211,9 @@ export default class ChargingPage extends Component {
       console.log("[开始充电错误]", err, code);
       //Dialog.dismissLoading();
       if (code == 5200) {
-        this.setState({
-          errorCode: 'none',
-          showErrorDialog: true,
-          errorMessage: "(" + data.transactionPk + ') ' + err
-        });
+        this.showErrorDialog('none', "(" + data.transactionPk + ') ' + err);
       } else {
-        this.setState({
-          errorCode: 'A4',
-          showErrorDialog: true,
-          errorMessage: ''+err
-        });
+        this.showErrorDialog('A4', err);
       }
     });
   }
@@ -263,6 +243,10 @@ export default class ChargingPage extends Component {
           if (res.msg) {
             toastShort(res.msg)
           }
+          this.setState({
+            isCharging: false,
+            isAuthentic: false
+          });
           //this.init();
           startPage(PageList.summary, { 
             chargingPk: res.data.chargingPk,
@@ -297,6 +281,14 @@ export default class ChargingPage extends Component {
     });
   }
 
+  showErrorDialog(code, msg) {
+    this.setState({
+      errorCode: code,
+      showErrorDialog: true,
+      errorMessage: ''+msg
+    });
+  }
+
   closeError() {
     this.setState({
       showErrorDialog: false,
@@ -342,8 +334,7 @@ export default class ChargingPage extends Component {
           message={this.state.errorMessage}
           onClose={() => {
             this.closeError();
-          }}
-        />
+          }}/>
       </View>
     );
   }

Strides-APP/app/pages/wallet/Overview.js

@@ -80,7 +80,7 @@ export default class Overview extends Component {
             }
             //item.y += index + 2;
             item.label = currency + item.y;
-            item.title = item.dateTimeStr + ' | ' + item.label + ' | ' + item.power + 'kw';
+            item.title = item.dateTimeStr + ' | ' + item.label + ' | ' + item.power + 'kW';
             weekdayData.push(item);
           });
         }
@@ -92,7 +92,7 @@ export default class Overview extends Component {
             //item.y += index + 3;
             item.y0 = 0;
             item.label = currency + item.y;
-            item.title = item.x + ' | ' + item.label + ' | ' + item.power + 'kw';
+            item.title = item.x + ' | ' + item.label + ' | ' + item.power + 'kW';
             /*if (this.enableChartArea) {
               if (index == 0) {
                 item.label = "     " + currency + item.y

Strides-APP/app/pages/wallet/TopupNew.js

@@ -149,8 +149,9 @@ export default class TopupNew extends Component {
                           })
                         }}>
                         <Text style={[styles.topupText, index == this.state.selectIndex && {color: colorAccent}]}>
+                          <Text style={{fontSize: 16}}>{item.currencySymbol} </Text>
                           {item.amount}
-                          <Text style={{fontSize: 16}}> {item.currency}</Text>
+                          {/* <Text style={{fontSize: 16}}> {item.currency}</Text> */}
                         </Text>
                       </BadgeSelectItem>
                     );