react-native-timacare 3.1.38 → 3.1.39

package/src/screens/nationalID/index.tsx

@@ -21,6 +21,7 @@ import {
 } from '@react-navigation/native';
 import { observer, Observer } from 'mobx-react-lite';
 import { commonStyles } from '../CommonStyles';
+import KeyboardSpacer from '../../components/keyboardspace';
 import MButton from '../../components/MButton';
 import { color } from '../../theme';
 import { ScreenNames } from '../../navigation';
@@ -45,7 +46,6 @@ import { toJS } from 'mobx';
 import Loading from '../../components/Loading';
 import LinearGradient from 'react-native-linear-gradient';
 import MHeader from '../../components/MHeader';
-import ImageEditor from '@react-native-community/image-editor';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -53,17 +53,15 @@ const logoView: ImageStyle = {
   height: '100%',
   resizeMode: 'cover',
 };
-
-const screenWidth = Dimensions.get('window').width;
-const screenHeight = Dimensions.get('window').height;
-
+const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
 const frameWidth = screenWidth * 0.85;
-const frameHeight = screenWidth * 0.54;
+const frameHeight = frameWidth * 0.63; // tỷ lệ giống CCCD
 
 export const NationalID = observer(function NationalID(props: any) {
   const navigation = useNavigation();
   const [isLoading, setIsLoading] = useState(false);
   const [photo, setPhoto] = useState(null);
+  const [base64, setBase64] = useState(null);
   const loan = toJS(props.route.params?.loan);
 
   const nextStep = () => {
@@ -97,39 +95,13 @@ export const NationalID = observer(function NationalID(props: any) {
 
   const takePhoto = () => {
     //@ts-ignore
-    navigation.push(ScreenNames.Camera, {
+    navigation.push(ScreenNames.CCCDCameraScreen, {
       front: false,
       callback: (photo) => {
-        Image.getSize(photo, async (imgWidth, imgHeight) => {
-          const scaleFactor = 0.68; // Tỉ lệ thu phóng khung hình
-          const widthRatio = imgWidth / screenWidth;
-          const heightRatio = imgHeight / ((screenWidth * 4) / 3); // nếu preview là 4:3
-          const frameLeft = (screenWidth - frameWidth) / 2;
-          const frameTop = ((screenWidth * 4) / 3 - frameHeight) / 2;
-          const cropData = {
-            offset: {
-              x:
-                (frameLeft - (frameWidth * (scaleFactor - 1)) / 2) * widthRatio,
-              y:
-                (frameTop - (frameHeight * (scaleFactor - 1)) / 2) *
-                heightRatio,
-            },
-            size: {
-              width: frameWidth * widthRatio * scaleFactor,
-              height: frameHeight * heightRatio * scaleFactor,
-            },
-            resizeMode: 'contain',
-          };
-          try {
-            const croppedImageUri = await ImageEditor.cropImage(
-              photo,
-              cropData
-            );
-            setPhoto(croppedImageUri.uri);
-          } catch (error) {
-            console.error('Crop error:', error);
-          }
-        });
+        setPhoto(photo);
+      },
+      base64: (data) => {
+        setBase64(data);
       },
     });
   };
@@ -164,21 +136,28 @@ export const NationalID = observer(function NationalID(props: any) {
                   Chụp CMND/ CCCD mặt trước
                 </MText>
               </View>
-              <Image
-                source={
-                  photo
-                    ? { uri: photo }
-                    : require('../../assets/img/national_id.png')
-                }
+              <View
                 style={{
-                  width: frameWidth,
+                  width: '100%',
                   height: frameHeight,
                   borderWidth: 8,
                   borderRadius: 6,
                   borderColor: '#FFFFFF',
                   marginTop: 16,
                 }}
-              />
+              >
+                <Image
+                  source={
+                    photo
+                      ? { uri: photo }
+                      : require('../../assets/img/national_id.png')
+                  }
+                  style={{
+                    width: '100%',
+                    height: '100%',
+                  }}
+                />
+              </View>
               <View style={{ marginTop: 24 }}>
                 <MText style={[commonStyles.textNormalBold, { fontSize: 16 }]}>
                   Lưu ý chụp CMND/ CCCD
@@ -298,6 +277,7 @@ export const NationalID = observer(function NationalID(props: any) {
             <CIMBBank />
           </View>
         )}
+        <KeyboardSpacer />
       </SafeAreaView>
       <Loading isLoading={isLoading} />
     </View>

package/src/screens/nationalIDBack/index.tsx

@@ -30,7 +30,6 @@ import nationalIDStore from './Store';
 import Loading from '../../components/Loading';
 import LinearGradient from 'react-native-linear-gradient';
 import MHeader from '../../components/MHeader';
-import ImageEditor from '@react-native-community/image-editor';
 
 const logoView: ImageStyle = {
   position: 'absolute',
@@ -39,16 +38,15 @@ const logoView: ImageStyle = {
   resizeMode: 'cover',
 };
 
-const screenWidth = Dimensions.get('window').width;
-const screenHeight = Dimensions.get('window').height;
-
+const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
 const frameWidth = screenWidth * 0.85;
-const frameHeight = screenWidth * 0.54;
+const frameHeight = frameWidth * 0.63; // tỷ lệ giống CCCD
 
 export const NationalIDBack = observer(function NationalIDBack(props: any) {
   const navigation = useNavigation();
   const [photo, setPhoto] = useState(null);
   const loan = props.route.params?.loan;
+  const [base64, setBase64] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
 
   const nextStep = (values) => {
@@ -76,39 +74,14 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
   };
 
   const takePhoto = () => {
-    navigation.push(ScreenNames.Camera, {
+    //@ts-ignore
+    navigation.push(ScreenNames.CCCDCameraScreen, {
       front: false,
       callback: (photo) => {
-        Image.getSize(photo, async (imgWidth, imgHeight) => {
-          const scaleFactor = 0.68; // Tỉ lệ thu phóng khung hình
-          const widthRatio = imgWidth / screenWidth;
-          const heightRatio = imgHeight / ((screenWidth * 4) / 3); // nếu preview là 4:3
-          const frameLeft = (screenWidth - frameWidth) / 2;
-          const frameTop = ((screenWidth * 4) / 3 - frameHeight) / 2;
-          const cropData = {
-            offset: {
-              x:
-                (frameLeft - (frameWidth * (scaleFactor - 1)) / 2) * widthRatio,
-              y:
-                (frameTop - (frameHeight * (scaleFactor - 1)) / 2) *
-                heightRatio,
-            },
-            size: {
-              width: frameWidth * widthRatio * scaleFactor,
-              height: frameHeight * heightRatio * scaleFactor,
-            },
-            resizeMode: 'contain',
-          };
-          try {
-            const croppedImageUri = await ImageEditor.cropImage(
-              photo,
-              cropData
-            );
-            setPhoto(croppedImageUri.uri);
-          } catch (error) {
-            console.error('Crop error:', error);
-          }
-        });
+        setPhoto(photo);
+      },
+      base64: (data) => {
+        setBase64(data);
       },
     });
   };
@@ -143,22 +116,28 @@ export const NationalIDBack = observer(function NationalIDBack(props: any) {
                   Chụp CMND/ CCCD mặt sau
                 </MText>
               </View>
-
-              <Image
-                source={
-                  photo
-                    ? { uri: photo }
-                    : require('../../assets/img/national_id_back.png')
-                }
+              <View
                 style={{
-                  width: frameWidth,
+                  width: '100%',
                   height: frameHeight,
                   borderWidth: 8,
                   borderRadius: 6,
                   borderColor: '#FFFFFF',
                   marginTop: 16,
                 }}
-              />
+              >
+                <Image
+                  source={
+                    photo
+                      ? { uri: photo }
+                      : require('../../assets/img/national_id_back.png')
+                  }
+                  style={{
+                    width: '100%',
+                    height: '100%',
+                  }}
+                />
+              </View>
               <View style={{ marginTop: 24 }}>
                 <MText style={[commonStyles.textNormalBold, { fontSize: 16 }]}>
                   Lưu ý chụp CMND/ CCCD

package/src/screens/register/index.tsx

@@ -184,7 +184,7 @@ export const Register = observer(function Register() {
           <View style={{ marginTop: 50 }}>
             <Formik
               initialValues={{
-                phone: __DEV__ ? '0339223176' : '',
+                phone: __DEV__ ? '0839621640' : '',
                 terms: true,
               }}
               onSubmit={(values) => {

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

@@ -149,7 +149,6 @@ export default function RegisterCamera(props: any) {
 
   useEffect(() => {
     let timeout: NodeJS.Timeout;
-
     if (isFocused) {
       // Delay mounting camera to give Android time to release the previous one
       timeout = setTimeout(() => {

package/src/services/api/api-config.ts

@@ -1,5 +1,5 @@
 // const API_URL = 'https://apiapplos.tima.vn/'
-const API_URL = __DEV__ ? 'https://apidevlos.tima.vn/' : 'https://apiapplos.tima.vn/'
+const API_URL = 'https://apidevlos.tima.vn/'
 export interface ApiConfig {
   url: string
   timeout: number