react-native-timacare 3.1.66 → 3.1.67

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

@@ -59,27 +59,15 @@ export default function ReviewLoan(props: any) {
         timeInsuranceProperty: values?.timeInsuranceProperty?.id ?? 0,
         moneyInsurenceCustomer: values.moneyInsurenceCustomer,
         moneyInsuranceProperty: values.moneyInsuranceProperty,
-        bankId: values.bankId,
-        bankAccountName: values?.bankAccountName,
-        bankAccountNumber: values?.bankAccountNumber,
-        brand: values?.brand,
-        yearCar: Number(values.yearCar),
-        vehicles: values?.vehicles,
-        plateNumber: values?.plateNumber,
-        chassis: values?.chassis,
-        engine: values?.engine,
-        ownerFullName: values?.ownerFullName,
-        motobikeCertificateNumber: values?.motobikeCertificateNumber,
-        motobikeCertificateDate: values?.motobikeCertificateDate,
-        typeLoanBrief: values?.typeLoanBrief,
-        carTypeId: values?.carTypeId,
       };
-      const response = await Api.getInstance().updateInfoLoan(body);
+
+      const response = await Api.getInstance().updateInfoLoanV2(body);
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta?.errorCode === 200) {
-          navigation.push(ScreenNames.ReviewInformationOther, {
+          navigation.push(ScreenNames.OCR, {
             loan: props.route?.params?.loan,
+            front: true,
           });
         } else {
           Alert.alert('Thông báo', response.data?.meta?.errorMessage);
@@ -96,28 +84,12 @@ export default function ReviewLoan(props: any) {
   const getData = async () => {
     try {
       setIsLoading(true);
-      const response = await Api.getInstance().getInfoLoan(
+      const response = await Api.getInstance().getInfoLoanAutoDEV2(
         props.route?.params?.loan?.id
       );
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta.errorCode === 200) {
-          formRef.current.setFieldValue(
-            'bankAccountName',
-            response?.data?.data?.bankAccountName ?? ''
-          );
-          formRef.current.setFieldValue(
-            'bankAccountNumber',
-            response?.data?.data?.bankAccountNumber ?? ''
-          );
-          formRef.current.setFieldValue(
-            'bankId',
-            response?.data?.data?.bankId ?? null
-          );
-          formRef.current.setFieldValue(
-            'bankName',
-            response?.data?.data?.bankName ?? ''
-          );
           formRef.current.setFieldValue(
             'loanAmount',
             response?.data?.data?.loanAmount ?? 0
@@ -176,61 +148,6 @@ export default function ReviewLoan(props: any) {
             'timeInsuranceProperty',
             timeInsuranceProperty
           );
-          formRef.current?.setFieldValue(
-            'brand',
-            response.data.data?.brand ?? null
-          );
-          formRef.current?.setFieldValue(
-            'yearCar',
-            response.data.data?.yearCar ?? null
-          );
-          formRef.current?.setFieldValue(
-            'vehicles',
-            response.data.data?.vehicles ?? null
-          );
-          formRef.current?.setFieldValue(
-            'plateNumber',
-            response.data.data?.plateNumber ?? ''
-          );
-          formRef.current?.setFieldValue(
-            'chassis',
-            response.data.data?.chassis ?? ''
-          );
-          formRef.current?.setFieldValue(
-            'engine',
-            response.data.data?.engine ?? ''
-          );
-          formRef.current?.setFieldValue(
-            'ownerFullName',
-            response.data.data?.ownerFullName ?? ''
-          );
-          formRef.current?.setFieldValue(
-            'motobikeCertificateNumber',
-            response.data.data?.motobikeCertificateNumber ?? ''
-          );
-          formRef.current?.setFieldValue(
-            'motobikeCertificateDate',
-            response.data.data?.motobikeCertificateDate ?? ''
-          );
-
-          if (response.data?.data?.brand) {
-            ttsStore.getListYearCar(response.data?.data?.brand);
-          }
-          if (response.data?.data?.brand && response.data?.data?.yearCar) {
-            ttsStore.getListCar(
-              response.data?.data?.brand,
-              response.data?.data?.yearCar
-            );
-          }
-
-          formRef.current?.setFieldValue(
-            'typeLoanBrief',
-            response.data.data?.typeLoanBrief ?? null
-          );
-          formRef.current?.setFieldValue(
-            'carTypeId',
-            response.data.data?.carTypeId ?? null
-          );
         } else {
         }
       }
@@ -242,8 +159,8 @@ export default function ReviewLoan(props: any) {
 
   useEffect(() => {
     getData();
-    ttsStore.getListBrand();
     ttsStore.getFirstPayment(props.route?.params?.loan?.id);
+    appStore.getRateTypeAll();
   }, []);
 
   const getInfoInsurence = async (
@@ -322,14 +239,14 @@ export default function ReviewLoan(props: any) {
                 zIndex: 1000,
               }}
               onPress={() => {
-                navigation.goBack();
+                navigation.navigate(ScreenNames.Main);
               }}
             >
               <IconBack />
             </TouchableOpacity>
             <MText style={$title}>Thông tin chi tiết</MText>
           </View>
-          <StepIndicator steps={3} currentStep={1} />
+          {/* <StepIndicator steps={3} currentStep={1} /> */}
           <Formik
             validateOnBlur={false}
             validateOnChange={false}
@@ -346,21 +263,6 @@ export default function ReviewLoan(props: any) {
               timeInsuranceProperty: null,
               moneyInsurenceCustomer: null,
               moneyInsuranceProperty: null,
-              bankId: null,
-              bankName: '',
-              bankAccountName: '',
-              bankAccountNumber: '',
-              brand: '',
-              yearCar: null,
-              vehicles: '',
-              plateNumber: '',
-              chassis: '',
-              engine: '',
-              ownerFullName: '',
-              motobikeCertificateNumber: '',
-              motobikeCertificateDate: '',
-              typeLoanBrief: null,
-              carTypeId: null,
             }}
             validationSchema={yup.object().shape({
               loanAmount: yup.string().required('Số tiền là bắt buộc'),
@@ -372,35 +274,6 @@ export default function ReviewLoan(props: any) {
               firstPaymentDate: yup
                 .string()
                 .required('Ngày thanh toán đầu kỳ là bắt buộc'),
-              bankName: yup.string().required('Vui lòng chọn ngân hàng'),
-              bankAccountName: yup.string().required('Vui lòng nhập chủ thẻ'),
-              bankAccountNumber: yup
-                .string()
-                .required('Vui lòng nhập số tài khoản'),
-              brand: yup.string().required('Vui lòng chọn hãng xe'),
-              yearCar: yup
-                .string()
-                .required('Vui lòng chọn năm sản xuất')
-                .nullable(),
-              vehicles: yup.string().required('Vui lòng chọn xe').nullable(),
-              plateNumber: yup.string().required('Vui lòng nhập biển số'),
-              chassis: yup.string().required('Vui lòng nhập số khung'),
-              engine: yup.string().required('Vui lòng nhập số máy'),
-              ownerFullName: yup.string().required('Vui lòng nhập chủ xe'),
-              motobikeCertificateNumber: yup
-                .string()
-                .required('Vui lòng nhập số đăng ký xe'),
-              motobikeCertificateDate: yup
-                .string()
-                .required('Vui lòng nhập ngày đăng ký'),
-              typeLoanBrief: yup
-                .number()
-                .required('Vui lòng chọn loại tài sản')
-                .nullable(),
-              carTypeId: yup
-                .number()
-                .required('Vui lòng chọn loại xe')
-                .nullable(),
             })}
           >
             {({
@@ -413,7 +286,7 @@ export default function ReviewLoan(props: any) {
               <ScrollView
                 style={[commonStyles.fill, { paddingHorizontal: 16 }]}
               >
-                <MText style={$title2}>2.1 Thông tin đề nghị khoản vay</MText>
+                <MText style={$title2}>Thông tin đề nghị khoản vay</MText>
                 <View style={$row}>
                   <View style={{ flex: 1 }}>
                     <MText style={$label}>Số tiền đề nghị vay</MText>
@@ -422,7 +295,7 @@ export default function ReviewLoan(props: any) {
                       style={[
                         $textInput,
                         {
-                          color: '#333333',
+                          color: '#EF592E',
                           fontSize: 16,
                           fontWeight: '500',
                         },
@@ -781,7 +654,7 @@ export default function ReviewLoan(props: any) {
                   </View>
                 </View>
 
-                <MText style={[$title2, { marginTop: 10 }]}>
+                {/* <MText style={[$title2, { marginTop: 10 }]}>
                   2.2 Thông tin giải ngân
                 </MText>
                 <MText style={$label}>Ngân hàng</MText>
@@ -1153,40 +1026,41 @@ export default function ReviewLoan(props: any) {
                       <MText style={$error}>{errors.carTypeId}</MText>
                     )}
                   </View>
-                </View>
-                <MButton
-                  onPress={() => {
-                    handleSubmit();
-                  }}
-                  style={{
-                    marginVertical: 24,
-                  }}
-                >
-                  <LinearGradient
-                    start={{ x: 1, y: 0 }}
-                    end={{ x: 0, y: 1 }}
-                    style={{
-                      height: 40,
-                      marginVertical: 16,
-                      borderRadius: 30,
-                      alignItems: 'center',
-                      justifyContent: 'center',
-                    }}
-                    colors={['#FF7A00', '#EF4123']}
-                  >
-                    <MText
-                      style={{
-                        color: 'white',
-                        fontSize: 16,
-                      }}
-                    >
-                      Tiếp tục
-                    </MText>
-                  </LinearGradient>
-                </MButton>
+                </View> */}
               </ScrollView>
             )}
           </Formik>
+          <MButton
+            onPress={() => {
+              formRef.current?.handleSubmit();
+            }}
+            style={{
+              marginVertical: 24,
+              marginHorizontal: 16,
+            }}
+          >
+            <LinearGradient
+              start={{ x: 1, y: 0 }}
+              end={{ x: 0, y: 1 }}
+              style={{
+                height: 40,
+                marginVertical: 16,
+                borderRadius: 30,
+                alignItems: 'center',
+                justifyContent: 'center',
+              }}
+              colors={['#FF7A00', '#EF4123']}
+            >
+              <MText
+                style={{
+                  color: 'white',
+                  fontSize: 16,
+                }}
+              >
+                Tiếp tục
+              </MText>
+            </LinearGradient>
+          </MButton>
           <KeyboardSpacer />
         </View>
       </View>

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

@@ -70,7 +70,7 @@ export default function TTSNationalIDBack(props) {
         name: 'image.jpg',
       });
 
-      const response = await Api.getInstance().uploadImageOcr(formData);
+      const response = await Api.getInstance().uploadImageAutoDE(formData);
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta?.errorCode === 200) {

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

@@ -84,7 +84,7 @@ export const TTSNationalIDFront = observer(function TTSNationalIDFront(props) {
         name: 'image.jpg',
       });
 
-      const response = await Api.getInstance().uploadImageOcr(formData);
+      const response = await Api.getInstance().uploadImageAutoDE(formData);
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta?.errorCode === 200) {

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

@@ -172,23 +172,26 @@ export default function TTSSelfie(props: any) {
         type: 'image/jpg',
         name: 'image.jpg',
       });
-      const response = await Api.getInstance().uploadImageOcr(formData);
+      const response = await Api.getInstance().uploadImageAutoDE(formData);
       setIsLoading(false);
       if (response.kind === 'ok') {
         if (response.data?.meta.errorCode === 200) {
-          if (props?.route?.params?.loan?.typeLoan === 5) {
-            navigation.push(ScreenNames.VehicleCamera, {
-              front: true,
-              loan: props?.route?.params?.loan,
-            });
-          } else {
-            navigation.dispatch(
-              CommonActions.reset({
-                index: 1,
-                routes: [{ name: ScreenNames.Main }],
-              })
-            );
-          }
+          // if (props?.route?.params?.loan?.typeLoan === 5) {
+          //   navigation.push(ScreenNames.VehicleCamera, {
+          //     front: true,
+          //     loan: props?.route?.params?.loan,
+          //   });
+          // } else {
+          //   navigation.dispatch(
+          //     CommonActions.reset({
+          //       index: 1,
+          //       routes: [{ name: ScreenNames.Main }],
+          //     })
+          //   );
+          // }
+          navigation.push(ScreenNames.ReviewInformation, {
+            loan: props?.route?.params?.loan,
+          });
         } else {
           Alert.alert('Thông báo', response.data?.meta?.errorMessage);
         }

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

@@ -39,7 +39,20 @@ export default function TTSSignLoan(props) {
           Alert.alert(
             'Thông báo',
             response.data?.meta?.errorMessage ||
-              'Có lỗi xảy ra. Vui lòng thử lại sau.'
+              'Có lỗi xảy ra. Vui lòng thử lại sau.',
+            [
+              {
+                text: 'Đồng ý',
+                onPress: () => {
+                  navigation.dispatch(
+                    CommonActions.reset({
+                      index: 1,
+                      routes: [{ name: ScreenNames.Main }],
+                    })
+                  );
+                },
+              },
+            ]
           );
         }
       } else {
@@ -47,6 +60,8 @@ export default function TTSSignLoan(props) {
       }
     } catch (error) {
       setIsLoading(false);
+    } finally {
+      setIsLoading(false);
     }
   };
 
@@ -78,7 +93,6 @@ export default function TTSSignLoan(props) {
       );
       return;
     }
-
     if (contract === null) {
       Alert.alert('Thông báo', 'Không tạo được hợp đồng');
       return;
@@ -101,30 +115,35 @@ export default function TTSSignLoan(props) {
       );
       return;
     }
-    // navigation.push(ScreenNames.TTSOTP, { loan });
     try {
       setIsLoading(true);
       const response = await Api.getInstance().sign_viettel_for_borrower({
         loanBriefId: loan?.id,
       });
       if (response.kind === 'ok' && response.data.meta.errorCode === 200) {
-        Alert.alert(
-          'Thông báo',
-          'Vui lòng kiểm tra tin nhắn để hoàn tất ký hợp đồng',
-          [
-            {
-              text: 'Xác nhận',
-              onPress: () => {
-                navigation.dispatch(
-                  CommonActions.reset({
-                    index: 1,
-                    routes: [{ name: ScreenNames.Main }],
-                  })
-                );
+        if (response.data?.data) {
+          navigation.push(ScreenNames.MySignViettel, {
+            url: response?.data?.data,
+          });
+        } else {
+          Alert.alert(
+            'Thông báo',
+            'Vui lòng kiểm tra tin nhắn để hoàn tất ký hợp đồng',
+            [
+              {
+                text: 'Xác nhận',
+                onPress: () => {
+                  navigation.dispatch(
+                    CommonActions.reset({
+                      index: 1,
+                      routes: [{ name: ScreenNames.Main }],
+                    })
+                  );
+                },
               },
-            },
-          ]
-        );
+            ]
+          );
+        }
       } else {
         Alert.alert(
           'Thông báo',

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

@@ -7,6 +7,7 @@ import {
   ImageStyle,
   Platform,
   SafeAreaView,
+  StyleSheet,
   TextStyle,
   TouchableOpacity,
   View,
@@ -41,6 +42,12 @@ 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');
+const frameWidth = screenWidth * 0.85;
+const frameHeight = frameWidth * 0.63; // tỷ lệ giống CCCD
+const frameLeft = (screenWidth - frameWidth) / 2;
+const frameTop = ((screenWidth * 4) / 3 - frameHeight) / 2;
+
 export default function VehicleCamera(props: any) {
   const isFocused = useIsFocused();
   const [shouldRenderCamera, setShouldRenderCamera] = useState(false);
@@ -244,30 +251,16 @@ export default function VehicleCamera(props: any) {
 
   return (
     <View
-      style={[$flex, { backgroundColor: 'black' }]}
+      style={[$flex, { backgroundColor: '#000' }]}
       pointerEvents={'box-none'}
     >
       {passPermission && shouldRenderCamera ? (
-        <View
-          style={[
-            commonStyles.alignCenter,
-            commonStyles.fill,
-            commonStyles.justifyCenter,
-            {
-              position: 'absolute',
-              width: Dimensions.get('window').width,
-              height: Dimensions.get('window').height,
-              zIndex: 1000,
-            },
-          ]}
-        >
+        <View style={{ flex: 1 }}>
           <RNCamera
             ref={myCamera}
             defaultVideoQuality={RNCamera.Constants.VideoQuality['720p']}
             style={{
-              width: Dimensions.get('window').width,
-              height: 260,
-              overflow: 'hidden',
+              flex: 1,
             }}
             maxZoom={1}
             androidCameraPermissionOptions={{
@@ -279,32 +272,61 @@ export default function VehicleCamera(props: any) {
             quality={0.8}
             pictureSize="1280x720"
           >
-            {({ camera, status, recordAudioPermissionStatus }) => {
-              if (status !== 'READY') return <ActivityIndicator />;
-            }}
+            <View style={$overlay}>
+              <View style={$darkOverlayTop} />
+              <View style={$row}>
+                <View style={$darkOverlaySide} />
+                <View style={$frameBorder}>
+                  {/* Top Left */}
+                  <Corner
+                    style={{
+                      top: 0,
+                      left: 0,
+                      borderTopWidth: CORNER_WIDTH,
+                      borderLeftWidth: CORNER_WIDTH,
+                      borderColor: BORDER_COLOR,
+                    }}
+                  />
+
+                  {/* Top Right */}
+                  <Corner
+                    style={{
+                      top: 0,
+                      right: 0,
+                      borderTopWidth: CORNER_WIDTH,
+                      borderRightWidth: CORNER_WIDTH,
+                      borderColor: BORDER_COLOR,
+                    }}
+                  />
+
+                  {/* Bottom Left */}
+                  <Corner
+                    style={{
+                      bottom: 0,
+                      left: 0,
+                      borderBottomWidth: CORNER_WIDTH,
+                      borderLeftWidth: CORNER_WIDTH,
+                      borderColor: BORDER_COLOR,
+                    }}
+                  />
+
+                  {/* Bottom Right */}
+                  <Corner
+                    style={{
+                      bottom: 0,
+                      right: 0,
+                      borderBottomWidth: CORNER_WIDTH,
+                      borderRightWidth: CORNER_WIDTH,
+                      borderColor: BORDER_COLOR,
+                    }}
+                  />
+                </View>
+                <View style={$darkOverlaySide} />
+              </View>
+              <View style={$darkOverlayBottom} />
+            </View>
           </RNCamera>
-          <TouchableOpacity
-            onPress={() => {
-              pickImageFromGallery();
-            }}
-            style={{
-              flexDirection: 'row',
-              alignItems: 'center',
-              gap: 8,
-              marginTop: 16,
-              zIndex: 1000,
-            }}
-          >
-            <IconUpload />
-            <MText
-              style={{
-                color: 'white',
-                fontSize: 12,
-              }}
-            >
-              Tải ảnh từ thư viện
-            </MText>
-          </TouchableOpacity>
+
           <View
             style={{
               position: 'absolute',
@@ -314,6 +336,28 @@ export default function VehicleCamera(props: any) {
               zIndex: 1000,
             }}
           >
+            <TouchableOpacity
+              onPress={() => {
+                pickImageFromGallery();
+              }}
+              style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'center',
+                gap: 8,
+                marginBottom: 50,
+              }}
+            >
+              <IconUpload />
+              <MText
+                style={{
+                  color: 'white',
+                  fontSize: 12,
+                }}
+              >
+                Tải ảnh từ thư viện
+              </MText>
+            </TouchableOpacity>
             {!taking && (
               <>
                 <MText
@@ -388,7 +432,7 @@ export default function VehicleCamera(props: any) {
           </SafeAreaView>
         </View>
       ) : (
-        <></>
+        <View></View>
       )}
       <Modal
         isVisible={showModal}
@@ -514,6 +558,52 @@ export default function VehicleCamera(props: any) {
   );
 }
 
+const CORNER_SIZE = 20;
+const CORNER_WIDTH = 2;
+const BORDER_COLOR = '#FDFDFD';
+
+const Corner = ({ style }: { style: ViewStyle }) => (
+  <View
+    style={[
+      style,
+      {
+        position: 'absolute',
+        width: CORNER_SIZE,
+        height: CORNER_SIZE,
+      },
+    ]}
+  />
+);
+
+const overlayColor = 'rgba(22, 22, 22, 0.7)';
+
+const $overlay: ViewStyle = {
+  ...StyleSheet.absoluteFillObject,
+  justifyContent: 'center',
+  alignItems: 'center',
+};
+
+const $darkOverlayTop: ViewStyle = {
+  width: '100%',
+  height: (screenHeight - frameHeight) / 2,
+  backgroundColor: overlayColor,
+};
+
+const $darkOverlayBottom: ViewStyle = {
+  width: '100%',
+  height: (screenHeight - frameHeight) / 2,
+  backgroundColor: overlayColor,
+};
+const $darkOverlaySide: ViewStyle = {
+  width: (screenWidth - frameWidth) / 2,
+  height: frameHeight,
+  backgroundColor: overlayColor,
+};
+const $frameBorder: ViewStyle = {
+  width: frameWidth,
+  height: frameHeight,
+};
+
 const $row: ViewStyle = {
   flexDirection: 'row',
   alignItems: 'center',