react-native-timacare 3.1.29-production → 3.1.31-production

package/src/screens/toan-trinh-so/OCR.tsx

@@ -14,7 +14,7 @@ import {
   Dimensions,
   StyleSheet,
   Alert,
-  PermissionsAndroid,
+  Platform,
 } from 'react-native';
 import { MText } from '../../components/MText';
 import { load, OCR_V1, save } from '../../utils/storage';
@@ -49,6 +49,7 @@ import Loading from '../../components/Loading';
 import DeviceInfo from 'react-native-device-info';
 import { IconUpload } from '../../assets/svgs';
 import ImagePicker from 'react-native-image-crop-picker';
+import { launchImageLibrary } from 'react-native-image-picker';
 
 const { NFCReader } = NativeModules;
 
@@ -149,7 +150,6 @@ export const OCR = observer(function OCR(props: any) {
 
   useEffect(() => {
     let timeout: NodeJS.Timeout;
-
     if (isFocused) {
       // Delay mounting camera to give Android time to release the previous one
       timeout = setTimeout(() => {
@@ -321,46 +321,53 @@ export const OCR = observer(function OCR(props: any) {
 
   const pickImageFromGallery = async () => {
     if (Platform.OS === 'android') {
-      const granted = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES ||
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
-        {
-          title: 'Permission to access photos',
-          message: 'App needs access to your photos to pick images.',
-          buttonNeutral: 'Ask Me Later',
-          buttonNegative: 'Cancel',
-          buttonPositive: 'OK',
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front && !props.route?.params?.callback) {
+          navigation.push(ScreenNames.TTSNationalIDFront, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (
+          !props?.route?.params?.front &&
+          !props.route?.params?.callback
+        ) {
+          navigation.push(ScreenNames.TTSNationalIDBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
         }
-      );
-
-      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-        console.log('Permission denied');
-        return;
       }
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front && !props.route?.params?.callback) {
+          navigation.push(ScreenNames.TTSNationalIDFront, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (
+          !props?.route?.params?.front &&
+          !props.route?.params?.callback
+        ) {
+          navigation.push(ScreenNames.TTSNationalIDBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        }
+      });
     }
-    ImagePicker.openPicker({}).then((image) => {
-      if (props?.route?.params?.front && !props.route?.params?.callback) {
-        navigation.push(ScreenNames.TTSNationalIDFront, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (
-        !props?.route?.params?.front &&
-        !props.route?.params?.callback
-      ) {
-        navigation.push(ScreenNames.TTSNationalIDBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
-      }
-    });
   };
 
   return (

package/src/screens/toan-trinh-so/RegisterCamera.tsx

@@ -5,7 +5,6 @@ import {
   Dimensions,
   Image,
   ImageStyle,
-  PermissionsAndroid,
   Platform,
   SafeAreaView,
   TextStyle,
@@ -41,6 +40,7 @@ import { ScreenNames } from '../../navigation';
 import DeviceInfo from 'react-native-device-info';
 import ImagePicker from 'react-native-image-crop-picker';
 import { IconUpload } from '../../assets/svgs';
+import { launchImageLibrary } from 'react-native-image-picker';
 
 export default function RegisterCamera(props: any) {
   const isFocused = useIsFocused();
@@ -191,43 +191,47 @@ export default function RegisterCamera(props: any) {
 
   const pickImageFromGallery = async () => {
     if (Platform.OS === 'android') {
-      const granted = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES ||
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
-        {
-          title: 'Permission to access photos',
-          message: 'App needs access to your photos to pick images.',
-          buttonNeutral: 'Ask Me Later',
-          buttonNegative: 'Cancel',
-          buttonPositive: 'OK',
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistration, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
+        } else {
+          navigation.push(ScreenNames.RegisterBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
         }
-      );
-
-      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-        console.log('Permission denied');
-        return;
       }
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistration, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        } else {
+          navigation.push(ScreenNames.RegisterBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        }
+      });
     }
-    ImagePicker.openPicker({}).then((image) => {
-      if (props?.route?.params?.front) {
-        navigation.push(ScreenNames.VehicleRegistration, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (props.route?.params?.callback) {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
-      } else {
-        navigation.push(ScreenNames.RegisterBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      }
-    });
   };
   return (
     <View
@@ -249,7 +253,7 @@ export default function RegisterCamera(props: any) {
           <View
             style={{
               marginVertical: 16,
-              marginTop: DeviceInfo.hasNotch() ? 70 : 0,
+              marginTop: DeviceInfo.hasNotch() ? 70 : 8,
             }}
           >
             <TouchableOpacity
@@ -353,7 +357,7 @@ export default function RegisterCamera(props: any) {
                 <View
                   style={{
                     alignItems: 'center',
-                    marginVertical: 24,
+                    marginVertical: DeviceInfo.hasNotch() ? 24 : 16,
                   }}
                 >
                   <MButton

package/src/screens/toan-trinh-so/ReviewInformation.tsx

@@ -242,6 +242,7 @@ export default function ReviewInformation(props) {
   useEffect(() => {
     getData();
     ttsStore.getListBank();
+    ttsStore.getRelationship();
   }, []);
 
   return (

package/src/screens/toan-trinh-so/ReviewInformationOther.tsx

@@ -127,7 +127,7 @@ export default function ReviewInformationOther(props) {
             formRef.current.setFieldValue('relationshipType1', r);
           }
           if (response.data?.data?.listRelationships[1]?.relationshipType) {
-            let r = EnumRelationshipOption2.find(
+            let r = ttsStore.listRelationship?.find(
               (x) =>
                 x.id ===
                 response.data?.data?.listRelationships[1]?.relationshipType
@@ -644,7 +644,7 @@ export default function ReviewInformationOther(props) {
                       onPress={() => {
                         navigation.push(ScreenNames.MSelect, {
                           title: 'Mối quan hệ',
-                          data: EnumRelationshipOption2,
+                          data: ttsStore.listRelationship,
                           callback: (item) => {
                             setFieldValue('relationshipType2', item);
                           },

package/src/screens/toan-trinh-so/VehicleCamera.tsx

@@ -5,7 +5,6 @@ import {
   Dimensions,
   Image,
   ImageStyle,
-  PermissionsAndroid,
   Platform,
   SafeAreaView,
   TextStyle,
@@ -40,6 +39,7 @@ import { ScreenNames } from '../../navigation';
 import { load, OCR_V2, save } from '../../utils/storage';
 import { IconUpload } from '../../assets/svgs';
 import ImagePicker from 'react-native-image-crop-picker';
+import { launchImageLibrary } from 'react-native-image-picker';
 
 export default function VehicleCamera(props: any) {
   const isFocused = useIsFocused();
@@ -199,45 +199,47 @@ export default function VehicleCamera(props: any) {
 
   const pickImageFromGallery = async () => {
     if (Platform.OS === 'android') {
-      const granted = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.READ_MEDIA_IMAGES ||
-          PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
-        {
-          title: 'Permission to access photos',
-          message: 'App needs access to your photos to pick images.',
-          buttonNeutral: 'Ask Me Later',
-          buttonNegative: 'Cancel',
-          buttonPositive: 'OK',
+      const result = await launchImageLibrary({
+        mediaType: 'photo',
+      });
+      if (result.assets) {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistrationFront, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(result.assets[0]?.uri);
+        } else {
+          navigation.push(ScreenNames.VehicleRegistrationBack, {
+            uri: result.assets[0]?.uri,
+            loan: props?.route?.params?.loan,
+          });
         }
-      );
-
-      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-        console.log('Permission denied');
-        return;
       }
+    } else {
+      ImagePicker.openPicker({}).then((image) => {
+        if (props?.route?.params?.front) {
+          navigation.push(ScreenNames.VehicleRegistrationFront, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        } else if (props.route?.params?.callback) {
+          navigation.goBack();
+          props.route?.params?.callback(
+            Platform.OS === 'android' ? image?.path : 'file://' + image?.path
+          );
+        } else {
+          navigation.push(ScreenNames.VehicleRegistrationBack, {
+            uri:
+              Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
+            loan: props?.route?.params?.loan,
+          });
+        }
+      });
     }
-    ImagePicker.openPicker({}).then((image) => {
-      console.log(image);
-
-      if (props?.route?.params?.front) {
-        navigation.push(ScreenNames.VehicleRegistrationFront, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      } else if (props.route?.params?.callback) {
-        navigation.goBack();
-        props.route?.params?.callback(
-          Platform.OS === 'android' ? image?.path : 'file://' + image?.path
-        );
-      } else {
-        navigation.push(ScreenNames.VehicleRegistrationBack, {
-          uri:
-            Platform.OS === 'android' ? image?.path : 'file://' + image?.path,
-          loan: props?.route?.params?.loan,
-        });
-      }
-    });
   };
 
   return (