react-native-timacare 3.3.8 → 3.3.10

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

@@ -48,6 +48,7 @@ import { Api } from '../../services/api';
 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;
@@ -319,27 +320,53 @@ export const OCR = observer(function OCR(props: any) {
   };
 
   const pickImageFromGallery = async () => {
-    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 (Platform.OS === 'android') {
+      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);
+        }
       }
+    } 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
+          );
+        }
+      });
     }
   };
 

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

@@ -38,6 +38,7 @@ import { commonStyles } from '../CommonStyles';
 import { load, OCR_V3, save } from '../../utils/storage';
 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';
 
@@ -188,24 +189,47 @@ export default function RegisterCamera(props: any) {
   };
 
   const pickImageFromGallery = async () => {
-    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 (Platform.OS === 'android') {
+      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,
+          });
+        }
       }
+    } 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,
+          });
+        }
+      });
     }
   };
   return (

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

@@ -39,6 +39,7 @@ import { commonStyles } from '../CommonStyles';
 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';
 
 const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
@@ -204,24 +205,47 @@ export default function VehicleCamera(props: any) {
   }, [isFocused]);
 
   const pickImageFromGallery = async () => {
-    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 (Platform.OS === 'android') {
+      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,
+          });
+        }
       }
+    } 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,
+          });
+        }
+      });
     }
   };