1. At registration page

- add vehicle brand selection field
- add model selection field
https://dev.wormwood.com.sg/zentao/task-view-48.html

2. Campaigns was configurable now

Strides-APP/app.json

@@ -31,13 +31,15 @@
     "drawer": true,
     "summary": true,
     "anzPayment": false,
-    "paymentMethod": false
+    "paymentMethod": false,
+    "showCampaigns": true
   },
   "vehicle": {
     "newVersionPage": false,
     "showLicencePlate": true,
     "showRequiredAsterisk": false,
     "requireConnectorType": true,
-    "requireImageUpload": true
+    "requireImageUpload": true,
+    "vehicleInRegisterPage": false
   }
 }

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

@@ -108,6 +108,8 @@ export default {
     labelPDVPhotos: "  PDV Photos\n(Front & Back)",
     labelPhoneNumber: "Phone Number",
     labelValidateEmail: "Validate Email",
+    labelVehicleBrand: "Vehicle Brand",
+    labelVehicleModel: "Vehicle Model",
     labelYourCompany: "Your Company",
     linkAndLink: "and ",
     linkAndLinkEnd: ".",
@@ -230,8 +232,8 @@ export default {
     userType: "User Type",
     vehicleBrand: "Brand",
     vehicleModel: "Model",
-    selectBrand: "Select Brand",
-    selectModel: "Select Model",
+    selectBrand: "Select Vehicle Brand",
+    selectModel: "Select Vehicle Model",
     selectUpload: "Select To Upload",
     max4mbPhoto: "(Max 4 mb Per Photo)",
     connecterType: "Connecter Type",

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

@@ -108,6 +108,8 @@ export default {
     labelPDVPhotos: " 駕駛證照片\n(正面&背面)",
     labelPhoneNumber: "手機號碼",
     labelValidateEmail: "信箱驗證碼",
+    labelVehicleBrand: "車輛品牌",
+    labelVehicleModel: "車輛型號",
     labelYourCompany: "妳的公司",
     linkAndLink: "》《",
     linkAndLinkEnd: "》",

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

@@ -108,6 +108,8 @@ export default {
     labelPDVPhotos: " 驾驶证照片\n(正面&背面)",
     labelPhoneNumber: "手机号码",
     labelValidateEmail: "邮箱验证码",
+    labelVehicleBrand: "车辆品牌",
+    labelVehicleModel: "车辆型号",
     labelYourCompany: "你的公司",
     linkAndLink: "》《",
     linkAndLinkEnd: "》",

Strides-APP/app/pages/alert/ListAlerts.js

@@ -29,7 +29,7 @@ export default class ListAlerts extends Component {
     });
     setTimeout(() => {
       this.getMessageList();
-    }, 1000);
+    }, 500);
   }
 
   toDetail(item={}) {

Strides-APP/app/pages/alert/ListCampaign.js

@@ -23,6 +23,9 @@ export default class ListCampaign extends Component {
     this.props.navigation.addListener('focus', () => {
       this.getMessageList();
     });
+    setTimeout(() => {
+      this.getMessageList();
+    }, 500);
   }
 
   toDetail(item={}) {

Strides-APP/app/pages/alert/ListNews.js

@@ -24,6 +24,9 @@ export default class ListNews extends Component {
     this.props.navigation.addListener('focus', () => {
       this.getMessageList();
     });
+    setTimeout(() => {
+      this.getMessageList();
+    }, 500);
   }
 
   toDetail(item={}) {

Strides-APP/app/pages/alert/Notification.js

@@ -4,7 +4,7 @@
  */
 import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
 import React, { Component } from 'react';
-import { StyleSheet } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import { PageList } from '../Router';
 import ListAlerts from './ListAlerts';
 import ListNews from './ListNews';
@@ -21,13 +21,23 @@ export default class Notification extends Component {
     super(props);
     this.state = {
       refreshing: false,
-      countInfo: {}
+      countInfo: {},
+      pageAdapter: []
     };
-    this.pageAdapter = [/*{
+    this.pageAdapterAll = [{
       title: $t('notification.tabCampaign'),
       name: "Campaigns",
       component: ListCampaign
-    }, */{
+    }, {
+      title: $t('notification.tabAlerts'),
+      name: "Alerts",
+      component: ListAlerts
+    }, {
+      title: AlertUtil.isPromotion ? $t('notification.tabPromotions') : $t("notification.tabArticles"),
+      name: "News",
+      component: ListNews
+    }]
+    this.pageAdapter = [{
       title: $t('notification.tabAlerts'),
       name: "Alerts",
       component: ListAlerts
@@ -48,7 +58,13 @@ export default class Notification extends Component {
   }
 
   componentDidMount() {
-    utils.setBackClick([this.props?.route?.name, "Campaigns", "Alerts", "Promotions"], this.backPage)
+    this.setState({
+      pageAdapter: app.v3.showCampaigns ? this.pageAdapterAll : this.pageAdapter
+    }, () => {
+      setTimeout(() => {
+        this.init();
+      }, 300);
+    });
     this.props.navigation.addListener('focus', () => {
       if (this.isHide) {
         this.isHide = false;
@@ -58,11 +74,6 @@ export default class Notification extends Component {
     this.props.navigation.addListener('blur', () => {
       this.isHide = true;
     });
-    this.getTotalCount();
-    //BackHandler.addEventListener('hardwareBackPress', this.backPage)
-    AlertUtil.setOnRefreshListener(() => {
-      this.getTotalCount();
-    })
   }
 
   componentWillUnmount() {
@@ -70,6 +81,15 @@ export default class Notification extends Component {
     //BackHandler.removeEventListener("hardwareBackPress", this.backPage)
   }
 
+  init() {
+    utils.setBackClick([this.props?.route?.name, "Campaigns", "Alerts", "Promotions"], this.backPage)
+    this.getTotalCount();
+    //BackHandler.addEventListener('hardwareBackPress', this.backPage)
+    AlertUtil.setOnRefreshListener(() => {
+      this.getTotalCount();
+    })
+  }
+
   backPage = () => {
     //const params = this.props.route.params;
     if (!this.isHide) {
@@ -99,11 +119,19 @@ export default class Notification extends Component {
   getBadgeText(index) {
     let count = 0;
     switch (index) {
-      /*case 0:
-        count = this.state.countInfo?.campaignUnreadCount;
-        break;*/
       case 0:
-        count = this.state.countInfo?.alertUnreadCount;
+        if (app.v3.showCampaigns) {
+          count = this.state.countInfo?.campaignUnreadCount;
+        } else {
+          count = this.state.countInfo?.alertUnreadCount;
+        }
+        break;
+      case 1:
+        if (app.v3.showCampaigns) {
+          count = this.state.countInfo?.alertUnreadCount;
+        } else {
+          count = this.state.countInfo?.newsUnreadCount;
+        }
         break
       case 2:
         count = this.state.countInfo?.newsUnreadCount;
@@ -118,29 +146,33 @@ export default class Notification extends Component {
 
   render() {
     const Tab = createMaterialTopTabNavigator();
-    return (
-      <Tab.Navigator
-        style={styles.container}
-        screenOptions={{
-          lazy: false,
-          lazyPreloadDistance: 1,
-          ...this.tabBarStyle
-        }}
-        backBehavior={() => this.backPage()}>
-        { this.pageAdapter.map((item, index) => 
-          <Tab.Screen
-            key={index}
-            name={item.name}
-            component={item.component}
-            options={{
-              title: item.title,
-              tabBarAllowFontScaling: false,
-              tabBarBadge: () => this.getBadgeText(index)
-            }}
-          />
-        )}
-      </Tab.Navigator>
-    );
+    if (this.state.pageAdapter.length > 0) {
+      return (
+        <Tab.Navigator
+          style={styles.container}
+          screenOptions={{
+            lazy: false,
+            lazyPreloadDistance: 1,
+            ...this.tabBarStyle
+          }}
+          backBehavior={() => this.backPage()}>
+          { this.state.pageAdapter.map((item, index) => 
+            <Tab.Screen
+              key={index}
+              name={item.name}
+              component={item.component}
+              options={{
+                title: item.title,
+                tabBarAllowFontScaling: false,
+                tabBarBadge: () => this.getBadgeText(index)
+              }}
+            />
+          )}
+        </Tab.Navigator>
+      );
+    } else {
+      return <View></View>
+    }
   }
 }