vbea 2 éve
szülő
commit
d18b16ac35

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

@@ -1,2 +1,2 @@
-#Wed Aug 09 14:57:58 CST 2023
-VERSION_CODE=275
+#Fri Aug 18 17:34:47 CST 2023
+VERSION_CODE=277

+ 5 - 4
Strides-APP/app/pages/alert/Notification.js

@@ -8,6 +8,7 @@ import { StyleSheet, BackHandler } from 'react-native';
 import { PageList } from '../Router';
 import Alerts from './Alerts';
 import Promotions from './Promotions';
+import app from '../../../app.json';
 
 export default class Notification extends Component {
   constructor(props) {
@@ -29,8 +30,8 @@ export default class Notification extends Component {
       pressColor: rippleColor,
       scrollEnabled: false,
       indicatorStyle: styles.indicator,
-      activeTintColor: colorLight,
-      inactiveTintColor: "#E0E0E0", 
+      activeTintColor: app.isWhitelabel ? textPrimary : colorLight,
+      inactiveTintColor: app.isWhitelabel ? textSecondary : "#E0E0E0"
     }
     this.isHide = false;
   }
@@ -90,9 +91,9 @@ const styles = StyleSheet.create({
     backgroundColor: colorLight
   },
   tabStyle: {
-    backgroundColor: colorPrimary
+    backgroundColor: app.isWhitelabel ? colorLight : colorPrimary
   },
   indicator: {
-    backgroundColor: colorLight
+    backgroundColor: app.isWhitelabel ? colorPrimary : colorLight
   }
 })

+ 5 - 4
Strides-APP/app/pages/chargeV2/ChargeAdapter.js

@@ -15,6 +15,7 @@ import PagerUtil from './PagerUtil';
 import utils from '../../utils/utils';
 import { Styles } from '../../components/Toolbar';
 import { getFocusedRouteNameFromRoute } from '@react-navigation/core';
+import app from '../../../app.json';
 
 export const PagerList = {
   "tabInfo": "Info",
@@ -55,8 +56,8 @@ export default class ChargeAdapter extends Component {
       pressColor: rippleColor,
       scrollEnabled: this.pageAdapter.length > 3,
       indicatorStyle: styles.indicator,
-      activeTintColor: textPrimary,
-      inactiveTintColor: textSecondary //"#E0E0E0",
+      activeTintColor: app.isWhitelabel ? textPrimary : colorLight,
+      inactiveTintColor: app.isWhitelabel ? textSecondary : "#E0E0E0"
     }
     this.action = "";
     this.isHide = false;
@@ -283,10 +284,10 @@ const styles = StyleSheet.create({
     backgroundColor: colorLight
   },
   tabStyle: {
-    backgroundColor: colorLight //colorPrimary
+    backgroundColor: app.isWhitelabel ? colorLight : colorPrimary
   },
   indicator: {
-    backgroundColor: colorAccent //colorLight
+    backgroundColor: app.isWhitelabel ? colorPrimary : colorLight
   }
 })
  

+ 1 - 1
Strides-APP/app/pages/chargeV2/PagerUtil.js

@@ -8,7 +8,7 @@ var refreshListener = [];
 const DEBUG = app.debug && !app.product;
 
 export default PagerUtil = {
-  ENABLE_NEW_UI: false, //是否启用新的充电页面
+  ENABLE_NEW_UI: true, //是否启用新的充电页面
   getStationInfo: () => {
     return chargeInfoState.stationInfo ?? {}
   },