react-native-timacare 0.0.9 → 0.0.10

package/src/screens/liveness/index.tsx

@@ -27,16 +27,24 @@ import { myLog } from '../../utils/log';
 import { MText } from '../../components/MText';
 import livenessStore from './LivenessStore';
 import RNFS, { CachesDirectoryPath } from 'react-native-fs';
-// import { RNFFmpeg } from "react-native-ffmpeg"
+import { RNFFmpeg } from 'react-native-ffmpeg';
 import { ScreenNames } from '../../navigation';
 import selfieStore from '../selfie/SelfieStore';
 import Slack from 'react-native-slack-webhook';
 import Loading from '../../components/Loading';
+import { Api } from '../../services/api';
 const webHookURL =
   'https://hooks.slack.com/services/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';
 
 export const LiveNess = observer(function LiveNess(props: any) {
   const navigation = useNavigation();
+  const [isLoading, setIsLoading] = useState(false);
+  const [ekycSuccess, setEkycSuccess] = useState(false);
+  const [recording, setRecording] = useState(false);
+  const [hintAction, setHintAction] = useState(
+    'Vui lòng bấm bắt đầu và thực hiện\ncác hành động theo yêu cầu'
+  );
+
   const [passPermission, setPassPermission] = useState(false);
   const [flash, setFlash] = useState(false);
   const [front, setFront] = useState(true);
@@ -54,68 +62,101 @@ export const LiveNess = observer(function LiveNess(props: any) {
   ];
 
   const uploadLiveness = async (template) => {
-    try {
+    if (loan?.typeLoan === 4) {
       const listImage = [];
-      const imgSelfie = await RNFS.readFile(selfieStore.photo, 'base64');
-
       for (let i = 1; i <= 20; i++) {
         const file = 'file://' + template + `_img_${('000' + i).slice(-4)}.jpg`;
         const imgBase64 = await RNFS.readFile(file, 'base64');
         listImage.push(imgBase64);
       }
+      myLog('call api 2 uploadLiveness');
+      const response = await Api.getInstance().uploadLivenessV2({
+        loanBriefId: loan?.id,
+        files: listImage,
+        selfie: null,
+      });
+      setIsLoading(false);
+      if (response.kind === 'ok') {
+        if (response.data.meta.errorCode === 200) {
+          setEkycSuccess(true);
+          myLog('data', response.data.data);
+        } else {
+          Alert.alert(response.data.meta.errorMessage);
+        }
+      } else {
+        Alert.alert('Lỗi đã xảy ra. Vui lòng thực hiện lại');
+      }
+      try {
+      } catch (error) {
+        myLog(e);
+      }
+    } else {
+      try {
+        const listImage = [];
+        const imgSelfie = await RNFS.readFile(selfieStore.photo, 'base64');
+        for (let i = 1; i <= 20; i++) {
+          const file =
+            'file://' + template + `_img_${('000' + i).slice(-4)}.jpg`;
+          const imgBase64 = await RNFS.readFile(file, 'base64');
+          listImage.push(imgBase64);
+        }
 
-      await livenessStore.uploadLiveness(
-        {
-          loanBriefId: loan.id,
-          files: listImage,
-          selfie: imgSelfie,
-        },
-        () => {
-          try {
-            new Slack(webHookURL).post(
-              JSON.stringify({
-                loanID: loan?.id,
-                eKYC: 'Success',
-              }),
-              '#timacare'
-            );
-          } catch (e) {}
-          RNFS.unlink(livenessStore.videoFile);
-          for (let i = 1; i <= 20; i++) {
-            const file =
-              'file://' + template + `_img_${('000' + i).slice(-4)}.jpg`;
-            RNFS.unlink(file);
-          }
-        },
-        (errorMessage) => {
-          try {
-            new Slack(webHookURL).post(
-              JSON.stringify({
-                loanID: loan.id,
-                eKYC: 'Fail',
-              }),
-              '#timacare'
-            );
-          } catch (e) {}
-          Alert.alert('Thông báo', errorMessage, [
-            {
-              text: 'Đồng ý',
-              onPress: () => {
-                setPassPermission(false);
-                setTimeout(() => {
-                  setPassPermission(true);
-                }, 100);
+        await livenessStore.uploadLiveness(
+          {
+            loanBriefId: loan.id,
+            files: listImage,
+            selfie: imgSelfie,
+          },
+          () => {
+            setEkycSuccess(true);
+            try {
+              new Slack(webHookURL).post(
+                JSON.stringify({
+                  loanID: loan?.id,
+                  eKYC: 'Success',
+                }),
+                '#timacare'
+              );
+            } catch (e) {}
+            RNFS.unlink(livenessStore.videoFile);
+            for (let i = 1; i <= 20; i++) {
+              const file =
+                'file://' + template + `_img_${('000' + i).slice(-4)}.jpg`;
+              RNFS.unlink(file);
+            }
+          },
+          (errorMessage) => {
+            try {
+              new Slack(webHookURL).post(
+                JSON.stringify({
+                  loanID: loan?.id,
+                  eKYC: 'Fail',
+                }),
+                '#timacare'
+              );
+            } catch (e) {}
+            Alert.alert('Thông báo', errorMessage, [
+              {
+                text: 'Đồng ý',
+                onPress: () => {
+                  setPassPermission(false);
+                  setTimeout(() => {
+                    setPassPermission(true);
+                  }, 100);
+                },
               },
-            },
-          ]);
-        }
-      );
-    } catch (e) {}
+            ]);
+          }
+        );
+      } catch (e) {
+        myLog(e);
+      }
+    }
   };
 
   const captureFromVideo = async (videoFile) => {
     if (!livenessStore.cancel) {
-      livenessStore.isLoading = true;
+      setIsLoading(true);
       const time = new Date().getTime();
       const template = CachesDirectoryPath + '/' + time;
       const output = template + '_img_%04d.jpg';
@@ -123,6 +164,7 @@ export const LiveNess = observer(function LiveNess(props: any) {
         myLog(`FFmpeg process exited with rc=${result}.`);
         if (result === 0) {
           uploadLiveness(template);
+          myLog('FFmpeg template', template);
         } else {
           Alert.alert(
             'Thông báo',
@@ -141,10 +183,12 @@ export const LiveNess = observer(function LiveNess(props: any) {
       livenessStore.counter += 1;
       if (livenessStore.counter < 20) {
         if ((livenessStore.counter + 1) % 4 === 0) {
+          setHintAction(actions[Math.round(Math.random() * actions.length)]);
           livenessStore.hintAction =
             actions[Math.round(Math.random() * actions.length)];
         }
       } else {
+        setHintAction('');
         livenessStore.hintAction = '';
         clearInterval(livenessStore.interval);
       }
@@ -162,7 +206,7 @@ export const LiveNess = observer(function LiveNess(props: any) {
 
   const recordVideo = async () => {
     if (myCamera) {
-      livenessStore.recording = true;
+      setRecording(true);
       const videoFile =
         CachesDirectoryPath + '/' + new Date().getTime() + '.mp4';
       const options = {
@@ -176,8 +220,7 @@ export const LiveNess = observer(function LiveNess(props: any) {
       startLiveNess();
       const data = await myCamera.current.recordAsync(options);
       if (data.uri) {
-        // livenessStore.videoFile = data.uri
-        livenessStore.recording = false;
+        setRecording(false);
         captureFromVideo(data.uri);
       } else {
         Alert.alert(
@@ -196,54 +239,51 @@ export const LiveNess = observer(function LiveNess(props: any) {
     ).then((result) => {
       switch (result) {
         case RESULTS.UNAVAILABLE:
-          console.log(
-            'This feature is not available (on this device / in this context)'
+          Alert.alert(
+            'Thông báo',
+            'Máy ảnh trên thiết bị không tương thích.\nVui lòng kiểm tra lại thiết bị!',
+            [{ text: 'Đồng ý' }]
           );
-          // Alert.alert(
-          //   "Thông báo",
-          //   "Máy ảnh trên thiết bị không tương thích.\nVui lòng kiểm tra lại thiết bị!",
-          //   [{ text: "Đồng ý" }],
-          // )
           break;
         case RESULTS.DENIED:
           console.log(
             'The permission has not been requested / is denied but requestable'
           );
-          // Alert.alert(
-          //   "Thông báo",
-          //   "Bạn đã từ chối quyền máy ảnh. Vui lòng cấp quyền máy ảnh để tiếp tục!",
-          //   [
-          //     {
-          //       text: "Đồng ý",
-          //       // onPress: () => {
-          //       //   if (Platform.OS === "ios") {
-          //       //     openSettings()
-          //       //   } else {
-          //       //     requestPermissions()
-          //       //   }
-          //       // },
-          //     },
-          //   ],
-          // )
+          Alert.alert(
+            'Thông báo',
+            'Bạn đã từ chối quyền máy ảnh. Vui lòng cấp quyền máy ảnh để tiếp tục!',
+            [
+              {
+                text: 'Đồng ý',
+                onPress: () => {
+                  if (Platform.OS === 'ios') {
+                    openSettings();
+                  } else {
+                    requestPermissions();
+                  }
+                },
+              },
+            ]
+          );
           break;
         case RESULTS.LIMITED:
           console.log('The permission is limited: some actions are possible');
-          // Alert.alert(
-          //   "Thông báo",
-          //   "Quyền máy ảnh bị hạn chế. Vui lòng kiểm tra lại để tiếp tục!",
-          //   [
-          //     {
-          //       text: "Đồng ý",
-          //       onPress: () => {
-          //         if (Platform.OS === "ios") {
-          //           openSettings()
-          //         } else {
-          //           requestPermissions()
-          //         }
-          //       },
-          //     },
-          //   ],
-          // )
+          Alert.alert(
+            'Thông báo',
+            'Quyền máy ảnh bị hạn chế. Vui lòng kiểm tra lại để tiếp tục!',
+            [
+              {
+                text: 'Đồng ý',
+                onPress: () => {
+                  if (Platform.OS === 'ios') {
+                    openSettings();
+                  } else {
+                    requestPermissions();
+                  }
+                },
+              },
+            ]
+          );
           break;
         case RESULTS.GRANTED:
           console.log('The permission is granted');
@@ -251,22 +291,22 @@ export const LiveNess = observer(function LiveNess(props: any) {
           break;
         case RESULTS.BLOCKED:
           console.log('The permission is denied and not requestable anymore');
-          // Alert.alert(
-          //   "Thông báo",
-          //   "Bạn đã từ chối quyền máy ảnh. Vui lòng cấp quyền máy ảnh để tiếp tục!",
-          //   [
-          //     {
-          //       text: "Đồng ý",
-          //       // onPress: () => {
-          //       //   if (Platform.OS === "ios") {
-          //       //     openSettings()
-          //       //   } else {
-          //       //     openSettings()
-          //       //   }
-          //       // },
-          //     },
-          //   ],
-          // )
+          Alert.alert(
+            'Thông báo',
+            'Bạn đã từ chối quyền máy ảnh. Vui lòng cấp quyền máy ảnh để tiếp tục!',
+            [
+              {
+                text: 'Đồng ý',
+                onPress: () => {
+                  if (Platform.OS === 'ios') {
+                    openSettings();
+                  } else {
+                    openSettings();
+                  }
+                },
+              },
+            ]
+          );
           break;
       }
     });
@@ -285,7 +325,7 @@ export const LiveNess = observer(function LiveNess(props: any) {
       clearInterval(livenessStore.interval);
       clearInterval(livenessStore.intervalFace);
       RNFFmpeg.cancel();
-      livenessStore.isLoading = false;
+      setIsLoading(false);
     };
   }, []);
 
@@ -337,10 +377,10 @@ export const LiveNess = observer(function LiveNess(props: any) {
                 buttonPositive: 'Ok',
                 buttonNegative: 'Cancel',
               }}
-              onGoogleVisionBarcodesDetected={({ barcodes }) => {
-                console.log(barcodes);
-              }}
-              onFacesDetected={handlerFace}
+              // onGoogleVisionBarcodesDetected={({ barcodes }) => {
+              //   console.log(barcodes);
+              // }}
+              // onFacesDetected={handlerFace}
             >
               {({ camera, status, recordAudioPermissionStatus }) => {
                 if (status !== 'READY') return <ActivityIndicator />;
@@ -359,15 +399,8 @@ export const LiveNess = observer(function LiveNess(props: any) {
           { position: 'absolute', width: '100%', height: '100%' },
         ]}
       >
-        <View
-          style={[
-            commonStyles.row,
-            commonStyles.alignCenter,
-            { paddingHorizontal: 16 },
-          ]}
-        >
+        <View style={[commonStyles.row, commonStyles.alignCenter]}>
           <MButton
-            //@ts-ignore
             onPress={() => {
               navigation.goBack();
               livenessStore.ekycSuccess = false;
@@ -405,22 +438,21 @@ export const LiveNess = observer(function LiveNess(props: any) {
             width: '100%',
           }}
         >
-          {(Platform.OS === 'ios' ? false : !livenessStore.isFace) &&
-            !livenessStore.recording && (
-              <MText
-                style={[
-                  commonStyles.textNormal,
-                  {
-                    color: 'white',
-                    textAlign: 'center',
-                    backgroundColor: '#00000099',
-                    paddingVertical: 12,
-                  },
-                ]}
-              >
-                Vui lòng hướng khuôn mặt vào máy ảnh
-              </MText>
-            )}
+          {!recording && (
+            <MText
+              style={[
+                commonStyles.textNormal,
+                {
+                  color: 'white',
+                  textAlign: 'center',
+                  backgroundColor: '#00000099',
+                  paddingVertical: 12,
+                },
+              ]}
+            >
+              Vui lòng hướng khuôn mặt vào máy ảnh
+            </MText>
+          )}
           <MText
             style={{
               lineHeight: 22,
@@ -433,11 +465,10 @@ export const LiveNess = observer(function LiveNess(props: any) {
               paddingHorizontal: 16,
             }}
           >
-            {livenessStore.hintAction}
+            {hintAction}
           </MText>
-          {!livenessStore.recording && (
+          {!recording ? (
             <MButton
-              disabled={Platform.OS === 'ios' ? false : !livenessStore.isFace}
               onPress={() => recordVideo()}
               style={[
                 commonStyles.alignCenter,
@@ -465,36 +496,14 @@ export const LiveNess = observer(function LiveNess(props: any) {
                 Bắt đầu
               </MText>
             </MButton>
+          ) : (
+            <View />
           )}
         </View>
       </SafeAreaView>
-      {/* <Modal visible={livenessStore.isLoading} animationType={"fade"} transparent>
-        <View
-          style={[
-            commonStyles.alignCenter,
-            commonStyles.justifyCenter,
-            { backgroundColor: "transparent", height: "100%" },
-          ]}
-        >
-          <View
-            style={[
-              commonStyles.alignCenter,
-              commonStyles.justifyCenter,
-              { width: 150, height: 150, backgroundColor: "white", borderRadius: 8 },
-            ]}
-          >
-            <ActivityIndicator size={"large"} color={color.primary} />
-            <MText style={commonStyles.textNormal}>đang tải thông tin</MText>
-          </View>
-        </View>
-      </Modal> */}
-      <Loading isLoading={livenessStore.isLoading} />
+      <Loading isLoading={isLoading} />
 
-      <Modal
-        visible={livenessStore.ekycSuccess}
-        animationType={'fade'}
-        transparent
-      >
+      <Modal visible={ekycSuccess} animationType={'fade'} transparent>
         <View
           style={[
             commonStyles.alignCenter,
@@ -510,8 +519,13 @@ export const LiveNess = observer(function LiveNess(props: any) {
             ]}
           >
             <IconEkyc />
-            <MText style={[commonStyles.textNormalBold, { marginTop: 16 }]}>
-              Chúc mừng bạn đã thực hiện xác thực khách hàng thành công.
+            <MText
+              style={[
+                commonStyles.textNormalBold,
+                { marginTop: 16, textAlign: 'center' },
+              ]}
+            >
+              Chúc mừng bạn đã thực hiện xác thực{'\n'}khách hàng thành công.
             </MText>
             <TouchableOpacity
               style={{
@@ -524,13 +538,17 @@ export const LiveNess = observer(function LiveNess(props: any) {
                 justifyContent: 'center',
               }}
               onPress={() => {
-                livenessStore.ekycSuccess = false;
-                navigation.dispatch(
-                  CommonActions.reset({
-                    index: 1,
-                    routes: [{ name: ScreenNames.Main }],
-                  })
-                );
+                setEkycSuccess(false);
+                if (loan?.typeLoan === 4) {
+                  navigation.push(ScreenNames.QuickSubmit, { loan });
+                } else {
+                  navigation.dispatch(
+                    CommonActions.reset({
+                      index: 1,
+                      routes: [{ name: ScreenNames.Main }],
+                    })
+                  );
+                }
               }}
             >
               <MText style={[commonStyles.textNormalBold, { color: 'white' }]}>

package/src/screens/payment-evidence/Guideline.tsx

@@ -7,7 +7,16 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import { B1, B2, B3, B4, B5, B6, Close2Icon } from '../../assets/icons';
+import {
+  B1,
+  B2,
+  B3,
+  B4,
+  B5,
+  B6,
+  CallBlack,
+  Close2Icon,
+} from '../../assets/icons';
 import { MText } from '../../components/MText';
 import { useNavigation } from '@react-navigation/native';
 import AppIntroSlider from 'react-native-app-intro-slider';
@@ -77,12 +86,11 @@ export default function Guideline() {
           alignItems: 'center',
         }}
       >
-        <MText style={{ fontWeight: 'bold', fontSize: 16 }}>Hướng dẫn</MText>
         <TouchableOpacity
           onPress={() => navigation.goBack()}
           style={{
             position: 'absolute',
-            right: 0,
+            left: 0,
             width: 40,
             height: 40,
             alignItems: 'center',
@@ -91,6 +99,23 @@ export default function Guideline() {
         >
           <Close2Icon />
         </TouchableOpacity>
+        <MText style={{ fontWeight: 'bold', fontSize: 16 }}>Hướng dẫn</MText>
+        <TouchableOpacity
+          // onPress={() => navigation.goBack()}
+          style={{
+            position: 'absolute',
+            right: 10,
+            width: 32,
+            height: 32,
+            alignItems: 'center',
+            justifyContent: 'center',
+            borderWidth: 1,
+            borderRadius: 30,
+            borderColor: '#BDBDBD',
+          }}
+        >
+          <CallBlack />
+        </TouchableOpacity>
       </View>
       <View
         style={{

package/src/screens/payment-evidence/ModalGuideline.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { SafeAreaView, TouchableOpacity, View } from 'react-native';
 import Modal from 'react-native-modal';
-import { GuideLineIcon, LineIcon } from '../../assets/icons';
+import { CallRed, GuideLineIcon, LineIcon } from '../../assets/icons';
 import { MText } from '../../components/MText';
 
 interface Props {
@@ -37,7 +37,7 @@ export default function ModalGuideline({ isOpen, onClose }: Props) {
       <SafeAreaView style={{ flex: 1 }}>
         <View
           style={{
-            width: 40,
+            // width: 40,
             height: 40,
             backgroundColor: 'white',
             justifyContent: 'center',
@@ -47,9 +47,18 @@ export default function ModalGuideline({ isOpen, onClose }: Props) {
             borderBottomLeftRadius: 6,
             top: -16,
             right: -16,
+            flexDirection: 'row',
           }}
         >
-          <GuideLineIcon />
+          <View style={{ paddingHorizontal: 8 }}>
+            <GuideLineIcon />
+          </View>
+          <View
+            style={{ width: 1, backgroundColor: '#828282', height: '60%' }}
+          />
+          <View style={{ paddingHorizontal: 8 }}>
+            <CallRed />
+          </View>
         </View>
         <View
           style={{

package/src/screens/payment-evidence/index.tsx

@@ -5,7 +5,7 @@ import React, { useState } from 'react';
 import { SafeAreaView, TouchableOpacity, View } from 'react-native';
 import WebView from 'react-native-webview';
 import { ScreenNames } from '../../navigation';
-import { GuideLineIcon, IconBack } from '../../assets/icons';
+import { CallRed, GuideLineIcon, IconBack } from '../../assets/icons';
 import { MText } from '../../components/MText';
 import { color } from '../../theme';
 import { commonStyles } from '../CommonStyles';
@@ -45,19 +45,33 @@ export const PaymentEvidence = observer(function PaymentEvidence(props: any) {
           >
             Mục đích sử dụng
           </MText>
-          <TouchableOpacity
+          <View
             style={{
               position: 'absolute',
-              right: 0,
+              right: 16,
               width: 40,
               height: 40,
               alignItems: 'center',
               justifyContent: 'center',
+              flexDirection: 'row',
             }}
-            onPress={() => navigation.navigate(ScreenNames.Guideline)}
           >
-            <GuideLineIcon />
-          </TouchableOpacity>
+            <TouchableOpacity
+              style={{ paddingHorizontal: 8 }}
+              onPress={() => navigation.navigate(ScreenNames.Guideline)}
+            >
+              <GuideLineIcon />
+            </TouchableOpacity>
+            {/* <View
+              style={{ width: 1, backgroundColor: '#828282', height: '60%' }}
+            /> */}
+            <TouchableOpacity
+              style={{ paddingHorizontal: 8 }}
+              // onPress={() => navigation.navigate(ScreenNames.Guideline)}
+            >
+              <CallRed />
+            </TouchableOpacity>
+          </View>
         </View>
         <View style={{ flex: 1, marginBottom: 16 }}>
           <WebView

package/src/screens/register/index.tsx

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