react-native-timacare 3.3.29 → 3.3.31

package/lib/typescript/screens/liveness-v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/liveness-v2/index.tsx"],"names":[],"mappings":"AAgDA,eAAO,MAAM,UAAU,KAskBrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screens/liveness-v2/index.tsx"],"names":[],"mappings":"AAgDA,eAAO,MAAM,UAAU,KAikBrB,CAAC"}

package/lib/typescript/screens/toan-trinh-so/OCR.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OCR.d.ts","sourceRoot":"","sources":["../../../../src/screens/toan-trinh-so/OCR.tsx"],"names":[],"mappings":"AA4DA,eAAO,MAAM,GAAG,KAkvBd,CAAC"}
+{"version":3,"file":"OCR.d.ts","sourceRoot":"","sources":["../../../../src/screens/toan-trinh-so/OCR.tsx"],"names":[],"mappings":"AA4DA,eAAO,MAAM,GAAG,KA8pBd,CAAC"}

package/lib/typescript/screens/toan-trinh-so/RegisterCamera.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RegisterCamera.d.ts","sourceRoot":"","sources":["../../../../src/screens/toan-trinh-so/RegisterCamera.tsx"],"names":[],"mappings":"AAwCA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,GAAG,eAochD"}
+{"version":3,"file":"RegisterCamera.d.ts","sourceRoot":"","sources":["../../../../src/screens/toan-trinh-so/RegisterCamera.tsx"],"names":[],"mappings":"AAyCA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,GAAG,eAochD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-timacare",
-  "version": "3.3.29",
+  "version": "3.3.31",
   "description": "SDK Tima Care",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/screens/camera/CCCDCameraScreen.tsx

@@ -181,18 +181,16 @@ export default function CCCDCameraScreen(props) {
         ]}
       >
         {device ? (
-          <VisionCamera
-            ref={myCamera}
-            style={{
-              width: Dimensions.get('window').width,
-              height: 260,
-              overflow: 'hidden',
-            }}
-            device={device}
-            isActive={true}
-            photo={true}
-            format={format}
-          />
+          <View style={$cameraFrame}>
+            <VisionCamera
+              ref={myCamera}
+              style={StyleSheet.absoluteFill}
+              device={device}
+              isActive={true}
+              photo={true}
+              format={format}
+            />
+          </View>
         ) : (
           <ActivityIndicator />
         )}
@@ -230,7 +228,7 @@ export default function CCCDCameraScreen(props) {
       <View
         style={{
           position: 'absolute',
-          bottom: 24 + insets.bottom,
+          bottom: insets.bottom,
           alignSelf: 'center',
           flexDirection: 'column',
           alignItems: 'center',
@@ -262,6 +260,13 @@ const $back: ViewStyle = {
   right: 0,
 };
 
+const $cameraFrame: ViewStyle = {
+  width: Dimensions.get('window').width,
+  height: 260,
+  overflow: 'hidden',
+  backgroundColor: 'black',
+};
+
 const $overlay: ViewStyle = {
   ...StyleSheet.absoluteFillObject,
   justifyContent: 'center',

package/src/screens/liveness-v2/index.tsx

@@ -368,7 +368,7 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
             stopped = true;
             cameraRef.current?.stopRecording();
           }
-        }, 3000);
+        }, 3500);
         cameraRef.current.startRecording({
           videoCodec: Platform.OS === 'ios' ? 'h264' : undefined,
           onRecordingFinished: (video) => {
@@ -383,17 +383,12 @@ export const LivenessV2 = observer(function LivenessV2(props: any) {
       });
       if (data.path) {
         setIsLoading(true);
-        // captureFromVideo(data.uri);
         const newPath =
           CachesDirectoryPath + '/' + new Date().getTime() + '.mp4';
         await RNFS.copyFile(data.path, newPath).then(() => {
           console.log('Copied to:', newPath);
         });
-        const thump = await extractFramesFromVideo(
-          Platform.OS === 'android'
-            ? 'file://' + data.path
-            : 'file://' + newPath
-        );
+        const thump = await extractFramesFromVideo(data.path);
         if (thump.length > 0) {
           uploadLiveness(thump);
         }

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

@@ -397,91 +397,7 @@ export const OCR = observer(function OCR(props: any) {
         >
           <IconBackWhite />
         </TouchableOpacity>
-        <View
-          style={{
-            flexDirection: 'row',
-            padding: 2,
-            borderRadius: 4,
-            alignItems: 'center',
-            backgroundColor: 'transparent',
-          }}
-        >
-          {/* <TouchableOpacity
-            style={{}}
-            onPress={() => {
-              setType('passport');
-            }}
-          >
-            <LinearGradient
-              colors={
-                type === 'passport'
-                  ? ['#FF8E4F', '#EF592E']
-                  : ['black', 'black']
-              }
-              style={{
-                height: 28,
-                paddingHorizontal: 8,
-                borderRadius: 4,
-                width: 100,
-                flexDirection: 'row',
-                alignItems: 'center',
-              }}
-            >
-              <Cam2Svg />
-              <MText
-                style={{
-                  color: 'white',
-                  fontSize: 12,
-                  fontWeight: 'bold',
-                  marginLeft: 5,
-                }}
-              >
-                Chụp 2 mặt
-              </MText>
-            </LinearGradient>
-          </TouchableOpacity> */}
-          {/* <View
-            style={{
-              backgroundColor: 'white',
-              width: 1,
-              borderRadius: 10,
-              height: 20,
-              marginHorizontal: 8,
-            }}
-          ></View> */}
-          {/* <TouchableOpacity
-            style={{}}
-            onPress={() => {
-              setType('nfc');
-            }}
-          >
-            <LinearGradient
-              colors={
-                type === 'nfc' ? ['#FF8E4F', '#EF592E'] : ['black', 'black']
-              }
-              style={{
-                height: 28,
-                paddingHorizontal: 8,
-                borderRadius: 4,
-                width: 100,
-                flexDirection: 'row',
-                alignItems: 'center',
-              }}
-            >
-              <ChipSvg />
-              <MText
-                style={{
-                  color: 'white',
-                  fontSize: 12,
-                  fontWeight: 'bold',
-                  marginLeft: 5,
-                }}
-              >
-                NFC
-              </MText>
-            </LinearGradient>
-          </TouchableOpacity> */}
-        </View>
+
         <MText
           style={{
             color: 'white',
@@ -513,18 +429,16 @@ export const OCR = observer(function OCR(props: any) {
           ]}
         >
           {device ? (
-            <VisionCamera
-              ref={myCamera}
-              style={{
-                width: Dimensions.get('window').width,
-                height: 260,
-                overflow: 'hidden',
-              }}
-              device={device}
-              isActive={true}
-              photo={true}
-              format={format}
-            />
+            <View style={styles.passportCameraFrame}>
+              <VisionCamera
+                ref={myCamera}
+                style={StyleSheet.absoluteFill}
+                device={device}
+                isActive={true}
+                photo={true}
+                format={format}
+              />
+            </View>
           ) : (
             <ActivityIndicator />
           )}
@@ -535,7 +449,6 @@ export const OCR = observer(function OCR(props: any) {
             style={{
               flexDirection: 'row',
               alignItems: 'center',
-              gap: 8,
               marginTop: 16,
             }}
           >
@@ -544,6 +457,7 @@ export const OCR = observer(function OCR(props: any) {
               style={{
                 color: 'white',
                 fontSize: 12,
+                marginLeft: 8,
               }}
             >
               Tải ảnh từ thư viện
@@ -592,7 +506,9 @@ export const OCR = observer(function OCR(props: any) {
             </View>
             <View style={styles.overlayBottom} />
           </View>
-          <View style={styles.buttonContainer}>
+          <View
+            style={[styles.buttonContainer, { bottom: insets.bottom + 24 }]}
+          >
             <MText
               style={{
                 color: 'white',
@@ -881,6 +797,12 @@ const styles = StyleSheet.create({
   camera: {
     flex: 1,
   },
+  passportCameraFrame: {
+    width: Dimensions.get('window').width,
+    height: 260,
+    overflow: 'hidden',
+    backgroundColor: 'black',
+  },
   buttonContainer: {
     flex: 0,
     flexDirection: 'column',

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

@@ -2,15 +2,16 @@
 import React, { useEffect, useRef, useState } from 'react';
 import {
   ActivityIndicator,
-  Dimensions,
   Image,
   ImageStyle,
   Platform,
+  StyleSheet,
   TextStyle,
   TouchableOpacity,
   View,
   ViewStyle,
   Alert,
+  useWindowDimensions,
 } from 'react-native';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import {
@@ -41,6 +42,8 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 export default function RegisterCamera(props: any) {
   const insets = useSafeAreaInsets();
   const isFocused = useIsFocused();
+  const { width: screenWidth, height: screenHeight } = useWindowDimensions();
+  const cameraHeight = (screenWidth * 4) / 3.1;
   const [shouldRenderCamera, setShouldRenderCamera] = useState(false);
   const navigation = useNavigation();
   const [showModal, setShowModal] = useState(false);
@@ -240,28 +243,18 @@ export default function RegisterCamera(props: any) {
           style={[
             commonStyles.fill,
             {
-              width: Dimensions.get('window').width,
-              height: Dimensions.get('window').height,
-              // alignItems: 'center',
+              width: screenWidth,
+              height: screenHeight,
               zIndex: 1000,
             },
           ]}
         >
-          <View
-            style={{
-              marginVertical: 16,
-              marginTop: insets.top + 16,
-            }}
-          >
+          <View style={[styles.header, { paddingTop: insets.top + 16 }]}>
             <TouchableOpacity
               onPress={() => {
                 navigation.goBack();
               }}
-              style={{
-                position: 'absolute',
-                left: 16,
-                zIndex: 100000,
-              }}
+              style={[styles.backButton, { top: insets.top + 16 }]}
             >
               <MText
                 style={{
@@ -284,17 +277,25 @@ export default function RegisterCamera(props: any) {
             </MText>
           </View>
           {device ? (
-            <VisionCamera
-              ref={myCamera}
-              style={{
-                width: Dimensions.get('window').width,
-                height: (Dimensions.get('window').width * 4) / 3.1,
-              }}
-              device={device}
-              isActive={true}
-              photo={true}
-              format={format}
-            />
+            <View
+              style={[
+                styles.cameraFrame,
+                {
+                  width: screenWidth,
+                  height: cameraHeight,
+                  marginTop: insets.top + 64,
+                },
+              ]}
+            >
+              <VisionCamera
+                ref={myCamera}
+                style={StyleSheet.absoluteFill}
+                device={device}
+                isActive={true}
+                photo={true}
+                format={format}
+              />
+            </View>
           ) : (
             <ActivityIndicator />
           )}
@@ -316,7 +317,6 @@ export default function RegisterCamera(props: any) {
                     style={{
                       flexDirection: 'row',
                       alignItems: 'center',
-                      gap: 8,
                     }}
                   >
                     <IconUpload />
@@ -324,6 +324,7 @@ export default function RegisterCamera(props: any) {
                       style={{
                         color: 'white',
                         fontSize: 12,
+                        marginLeft: 8,
                       }}
                     >
                       Tải ảnh từ thư viện
@@ -343,7 +344,7 @@ export default function RegisterCamera(props: any) {
                 <View
                   style={{
                     alignItems: 'center',
-                    marginVertical: DeviceInfo.hasNotch() ? 24 : 16,
+                    marginTop: 16,
                   }}
                 >
                   <MButton
@@ -551,3 +552,23 @@ const $container: ViewStyle = {
   borderTopRightRadius: 26,
   borderTopLeftRadius: 26,
 };
+
+const styles = StyleSheet.create({
+  header: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    right: 0,
+    zIndex: 10,
+    paddingBottom: 16,
+  },
+  backButton: {
+    position: 'absolute',
+    left: 16,
+    zIndex: 100000,
+  },
+  cameraFrame: {
+    overflow: 'hidden',
+    backgroundColor: 'black',
+  },
+});