add

Strides-APP/android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 
 import com.android.build.OutputFile
 
-def myVersionName = "2.1.0" //★★★★★版本号★★★★★
+def myVersionName = "2.1.1" //★★★★★版本号★★★★★
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
  * and bundleReleaseJsAndAssets).

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Mon Feb 13 17:14:09 CST 2023
-VERSION_CODE=116
+#Tue Feb 14 10:13:01 CST 2023
+VERSION_CODE=121

Strides-APP/app.json

@@ -1,8 +1,8 @@
 {
   "name": "JuicePlus",
   "displayName": "ChargEco",
-  "versionCode": 110,
-  "versionName": "V2.1.0",
+  "versionCode": 111,
+  "versionName": "V2.1.1",
   "product": false,
   "debug": false
 }

Strides-APP/app/components/Button.js

@@ -22,7 +22,7 @@ export default Button = ({
       <Pressable
         style={({pressed }) => [
           pressed && isIOS && {
-            backgroundColor: 'rgba(0,0,0,.2)'
+            backgroundColor: rippleColor
           },
           isIOS && getRadius(style, borderRadius),
           viewStyle

Strides-APP/app/components/Dropdown.js

@@ -19,7 +19,7 @@ export default Dropdown = ({
     itemHeight=50,
     prefixList='',//列表前缀
     suffixList='',//列表后缀
-    rippleStyle,
+    rippleStyle=ripple,
     style = styles.valueView,
     textStyle = styles.valueText,
     placeholderStyle=styles.placeText,
@@ -112,7 +112,12 @@ export default Dropdown = ({
   return (
     <>
       <Pressable
-        style={style}
+        style={({pressed }) => [
+          pressed && isIOS && {
+            backgroundColor: rippleColor
+          },
+          style
+        ]}
         android_ripple={rippleStyle}
         onPress={() => showList()}>
         { showText && 

Strides-APP/app/pages/chargeV2/Charging.js

@@ -235,7 +235,7 @@ export const DashboardView = ({isCharging=false, connectorInfo={}}) => {
               style={styles.dashboardItemTitle}>Time Elapsed</Text>
           </View>
           <View style={styles.dashboardItemView}>
-            <Text style={styles.dashboardItemValue}>{connectorInfo?.totalKWhDelivered ?? "0"} kWh</Text>
+            <Text style={styles.dashboardItemValue}>{utils.toFixed(connectorInfo?.totalKWhDelivered, 2) ?? "0"} kWh</Text>
             <Text
               numberOfLines={1}
               ellipsizeMode="tail"

Strides-APP/app/utils/utils.js

@@ -113,11 +113,11 @@ export default {
   },
   minutes2HHmm(minutes) {
     if (minutes) {
-      if (minutes > 60) {
-        const m = parseInt(minutes);
+      const m = Number(minutes);
+      if (m > 60) {
         const h = m / 60;
         const mm = m % 60;
-        return h + ' hr ' + parseInt(mm) + 'min';
+        return parseInt(h) + ' hr ' + parseInt(mm) + 'min';
       } else {
         return parseInt(minutes) + 'min';
       }
@@ -182,7 +182,7 @@ export default {
    */
   toFixed(text, scape) {
     if (text) {
-      return Number(text).toFixed(scape);
+      return Number(Number(text).toFixed(scape));
     } else {
       return text;
     }

Strides-APP/index.js

@@ -34,6 +34,7 @@ const Index = () => {
 
 //热更新配置
 let codePushOptions = {
+  updateDialog: true,
   //实时检测更新并下载
   checkFrequency: codePush.CheckFrequency.ON_APP_RESUME,
   //下载完成后立即安装

Strides-APP/package.json

@@ -19,7 +19,8 @@
     "sit:android": "appcenter codepush release-react -a vbe/ChargEcoAndroid -d Staging -t",
     "prod:android": "appcenter codepush release-react -a vbe/ChargEcoAndroid -d Production -t",
     "sit:ios": "appcenter codepush release-react -a vbe/ChargEcoiOS -d Staging -t",
-    "prod:ios": "appcenter codepush release-react -a vbe/ChargEcoiOS -d Production -t"
+    "prod:ios": "appcenter codepush release-react -a vbe/ChargEcoiOS -d Production -t",
+    "push:ios": "appcenter codepush release-react -a vbe/ChargEcoiOS -c ios/bundle -d Production -t"
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.15.3",
@@ -37,7 +38,7 @@
     "react": "17.0.1",
     "react-native": "0.64.2",
     "react-native-camera": "^3.43.5",
-    "react-native-code-push": "6.4.1",
+    "react-native-code-push": "^7.1.0",
     "react-native-device-info": "^8.3.1",
     "react-native-gesture-handler": "^1.10.3",
     "react-native-gradients": "^1.1.1",
@@ -63,7 +64,7 @@
     "react-native-view-shot": "^3.1.2",
     "react-native-webview": "^11.6.4",
     "supercluster": "^7.1.3",
-    "vbe-cluster-map": "1.0",
+    "vbe-cluster-map": "https://gitee.com/vbes/vbe-cluster-map.git",
     "victory-native": "^35.3.3"
   },
   "devDependencies": {