react-native-timacare 3.1.65 → 3.1.67

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',

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

@@ -84,7 +84,7 @@ export default function VehicleRegistration(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/VehicleRegistrationBack.tsx

@@ -70,7 +70,7 @@ export default function VehicleRegistrationBack(props: any) {
         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/VehicleRegistrationFront.tsx

@@ -77,7 +77,7 @@ export default function VehicleRegistrationFront(props: any) {
         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/store.ts

@@ -256,7 +256,7 @@ class Store {
 
     async getFirstPayment(id) {
         try {
-            const response = await Api.getInstance().getFirstPaymentTTS(id);
+            const response = await Api.getInstance().getFirstPaymentTTSV2(id);
             if (response.kind === 'ok') {
                 if (response.data.meta.errorCode === 200) {
                     this.listFirstPayment = response.data.data.map((item: any) => {
@@ -275,10 +275,10 @@ class Store {
 
     async signViettel(id, onSuccess?) {
         try {
+
             const response = await Api.getInstance().sign_viettel_for_borrower({
                 loanBriefId: id
             })
-
             if (response.kind === 'ok' && response.data.meta.errorCode === 200) {
                 Alert.alert(
                     'Thông báo',