vbea 2 лет назад
Родитель
Сommit
98c80ff0df

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

@@ -1,2 +1,2 @@
-#Mon Sep 18 13:22:22 CST 2023
-VERSION_CODE=328
+#Thu Sep 21 09:42:39 CST 2023
+VERSION_CODE=330

+ 1 - 1
Strides-APP/app/pages/charge/Details.js

@@ -174,7 +174,7 @@ export default class Details extends Component {
       <>
       <ScrollView
         style={styles.container}
-        keyboardShouldPersistTaps={'handled'}
+        keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}
         refreshControl={
           <RefreshControl
             {...MyRefreshProps()}

+ 1 - 1
Strides-APP/app/pages/charge/Rating.js

@@ -62,7 +62,7 @@ export default class Rating extends React.Component {
     return (
       <ScrollView
         style={styles.container}
-        keyboardShouldPersistTaps={'handled'}
+        keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}
         contentInsetAdjustmentBehavior={'automatic'}>
         <View style={styles.stationInfoView}>
           <Image

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

@@ -538,7 +538,7 @@ export default class TabCharge extends Component {
     return (
       <ScrollView
         style={styles.container}
-        keyboardShouldPersistTaps={'handled'}
+        keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}
         contentContainerStyle={$padding(0, 16)}
         refreshControl={
           <RefreshControl

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

@@ -61,7 +61,7 @@ export default class TabInfos extends Component {
     return (
       <ScrollView
         style={styles.container}
-        keyboardShouldPersistTaps={'handled'}
+        keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}
         contentContainerStyle={$padding(0, 16)}
         refreshControl={
           <RefreshControl

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

@@ -259,7 +259,7 @@ export default class TabReserve extends Component {
     return (
       <ScrollView
         style={ui.flex1}
-        keyboardShouldPersistTaps={'handled'}
+        keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}
         contentContainerStyle={$padding(0, 16)}
         refreshControl={
           <RefreshControl

+ 1 - 2
Strides-APP/app/pages/my/Feedback.js

@@ -219,8 +219,7 @@ export default class Feedback extends React.Component {
     return (
       <ScrollView
         style={styles.container}
-        keyboardShouldPersistTaps='handled'
-        contentInsetAdjustmentBehavior='automatic'>
+        keyboardShouldPersistTaps='handled'>
         <View style={styles.headerView}>
           <View style={ui.flex1}>
             <Text style={styles.title}>{$t('feedback.tipsSomething')}</Text>

+ 1 - 1
Strides-APP/app/pages/sign/Login.js

@@ -135,7 +135,7 @@ export default class Login extends React.Component {
       </View>
       <ScrollView
         style={styles.container}
-        keyboardShouldPersistTaps={'handled'}>
+        keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
         <View style={styles.header}>
           <Image
             style={styles.headerImg}

+ 1 - 1
Strides-APP/app/pages/sign/LoginV2.js

@@ -127,7 +127,7 @@ export default class Login extends React.Component {
       </View>
       <ScrollView
         style={styles.container}
-        keyboardShouldPersistTaps={'handled'}>
+        keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
         <View style={styles.header}>
           <Image
           style={styles.headerImg}

+ 1 - 1
Strides-APP/app/pages/sign/Register.js

@@ -244,7 +244,7 @@ export default class Register extends React.Component {
       <View style={StyleSheet.absoluteFillObject}>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.header}>
             <View style={styles.logoView}>
               <Image

+ 1 - 1
Strides-APP/app/pages/sign/RegisterDriver.js

@@ -238,7 +238,7 @@ export default class RegisterDriver extends React.Component {
       <View style={styles.container}>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.signView}>
             {/* <View style={styles.signInput}>
               <Text style={styles.inputLabel}>Display Name</Text>

+ 1 - 1
Strides-APP/app/pages/sign/RegisterPublic.js

@@ -238,7 +238,7 @@ export default class RegisterPublic extends React.Component {
       <View style={styles.container}>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.signView}>
             {/* <View style={styles.tabView}>
               <Text 

+ 1 - 1
Strides-APP/app/pages/sign/RegisterV2.js

@@ -270,7 +270,7 @@ export default class RegisterV2 extends React.Component {
         </View>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.signView}>
             <View style={styles.tabView}>
               <TextView 

+ 1 - 1
Strides-APP/app/pages/sign/RegisterV3.js

@@ -262,7 +262,7 @@ export default class RegisterV3 extends React.Component {
       <View style={styles.container}>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.signView}>
             {/* <View style={styles.tabView}>
               <Text 

+ 1 - 1
Strides-APP/app/pages/sign/RegisterV4.js

@@ -330,7 +330,7 @@ export default class RegisterV4 extends React.Component {
       <View style={styles.container}>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.signView}>
             {/* <View style={styles.tabView}>
               <Text 

+ 1 - 1
Strides-APP/app/pages/sign/ResetPassword.js

@@ -149,7 +149,7 @@ export default class ResetPassword extends Component {
       <View style={StyleSheet.absoluteFillObject}>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.header}>
             <View style={styles.logoView}>
               <Image

+ 1 - 1
Strides-APP/app/pages/sign/ResetPasswordV2.js

@@ -210,7 +210,7 @@ export default class ResetPassword extends Component {
       <View style={StyleSheet.absoluteFillObject}>
         <ScrollView
           style={styles.scollView}
-          keyboardShouldPersistTaps={'handled'}>
+          keyboardShouldPersistTaps={isIOS ? 'never' : 'handled'}>
           <View style={styles.resetView}>
             {/* <Text style={styles.title}>Reset Password</Text> */}
             <View style={styles.signInput}>