Skip to content

Commit 0fc5c02

Browse files
xulihangxulihang
committed
update vision camera to v4
1 parent ac61a57 commit 0fc5c02

File tree

10 files changed

+53
-46
lines changed

10 files changed

+53
-46
lines changed

‎android/src/main/java/com/visioncameradynamsoftdocumentnormalizer/BitmapUtils.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import androidx.annotation.RequiresApi;
3434

3535
import com.mrousavy.camera.core.FrameInvalidError;
36-
import com.mrousavy.camera.frameprocessor.Frame;
37-
import com.mrousavy.camera.types.Orientation;
36+
import com.mrousavy.camera.frameprocessors.Frame;
37+
import com.mrousavy.camera.core.types.Orientation;
3838

3939
import java.io.ByteArrayOutputStream;
4040
import java.io.File;
@@ -85,13 +85,13 @@ public static Bitmap getBitmap(Frame image) throws FrameInvalidError {
8585
}
8686

8787
public static int getRotationDegreeFromOrientation(Orientation orientation) {
88-
if (orientation.getUnionValue().equals(Orientation.PORTRAIT.getUnionValue())) {
89-
return 90;
90-
}else if (orientation.getUnionValue().equals(Orientation.LANDSCAPE_LEFT.getUnionValue())) {
88+
if (orientation.name().equals(Orientation.PORTRAIT.name())) {
9189
return 0;
92-
} else if (orientation.getUnionValue().equals(Orientation.LANDSCAPE_RIGHT.getUnionValue())) {
90+
}else if (orientation.name().equals(Orientation.LANDSCAPE_LEFT.name())) {
91+
return 90;
92+
} else if (orientation.name().equals(Orientation.LANDSCAPE_RIGHT.name())) {
9393
return 270;
94-
}else if (orientation.getUnionValue().equals(Orientation.PORTRAIT_UPSIDE_DOWN.getUnionValue())) {
94+
}else if (orientation.name().equals(Orientation.PORTRAIT_UPSIDE_DOWN.name())) {
9595
return 180;
9696
}
9797
return 0;

‎android/src/main/java/com/visioncameradynamsoftdocumentnormalizer/VisionCameraDetectionPlugin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import com.facebook.react.bridge.WritableNativeArray;
1616
import com.facebook.react.bridge.WritableNativeMap;
1717
import com.mrousavy.camera.core.FrameInvalidError;
18-
import com.mrousavy.camera.frameprocessor.Frame;
19-
import com.mrousavy.camera.frameprocessor.FrameProcessorPlugin;
20-
import com.mrousavy.camera.frameprocessor.VisionCameraProxy;
18+
import com.mrousavy.camera.frameprocessors.Frame;
19+
import com.mrousavy.camera.frameprocessors.FrameProcessorPlugin;
20+
import com.mrousavy.camera.frameprocessors.VisionCameraProxy;
2121

2222
import java.util.ArrayList;
2323
import java.util.List;

‎android/src/main/java/com/visioncameradynamsoftdocumentnormalizer/VisionCameraDynamsoftDocumentNormalizerPackage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.facebook.react.bridge.NativeModule;
77
import com.facebook.react.bridge.ReactApplicationContext;
88
import com.facebook.react.uimanager.ViewManager;
9-
import com.mrousavy.camera.frameprocessor.FrameProcessorPluginRegistry;
9+
import com.mrousavy.camera.frameprocessors.FrameProcessorPluginRegistry;
1010

1111
import java.util.ArrayList;
1212
import java.util.Collections;

‎example/android/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "33.0.0"
5+
buildToolsVersion = "34.0.0"
66
minSdkVersion = 21
7-
compileSdkVersion = 33
8-
targetSdkVersion = 33
7+
compileSdkVersion = 34
8+
targetSdkVersion = 34
99

1010
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
1111
ndkVersion = "23.1.7779620"

‎example/ios/Podfile.lock‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ PODS:
380380
- React-jsinspector (0.72.5)
381381
- React-logger (0.72.5):
382382
- glog
383-
- react-native-worklets-core (0.2.4):
383+
- react-native-worklets-core (1.1.1):
384384
- React
385385
- React-callinvoker
386386
- React-Core
@@ -499,12 +499,19 @@ PODS:
499499
- RNSVG (13.14.0):
500500
- React-Core
501501
- SocketRocket (0.6.1)
502-
- VisionCamera (3.9.0):
502+
- VisionCamera (4.0.1):
503+
- VisionCamera/Core (= 4.0.1)
504+
- VisionCamera/FrameProcessors (= 4.0.1)
505+
- VisionCamera/React (= 4.0.1)
506+
- VisionCamera/Core (4.0.1)
507+
- VisionCamera/FrameProcessors (4.0.1):
503508
- React
504509
- React-callinvoker
505-
- React-Core
506510
- react-native-worklets-core
507-
- VisionCameraDynamsoftDocumentNormalizer (2.1.0):
511+
- VisionCamera/React (4.0.1):
512+
- React-Core
513+
- VisionCamera/FrameProcessors
514+
- VisionCameraDynamsoftDocumentNormalizer (2.3.0):
508515
- DynamsoftCaptureVisionRouter (= 2.0.21)
509516
- DynamsoftCore (= 3.0.20)
510517
- DynamsoftDocumentNormalizer (= 2.0.20)
@@ -737,7 +744,7 @@ SPEC CHECKSUMS:
737744
React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
738745
React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
739746
React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
740-
react-native-worklets-core: b4094f51cb2bc649e297206425cb8956f4945e3e
747+
react-native-worklets-core: ff2156b19b8f4a979fa0db52659e39a755b1454b
741748
React-NativeModulesApple: 797bc6078d566eef3fb3f74127e6e1d2e945a15f
742749
React-perflogger: cd8886513f68e1c135a1e79d20575c6489641597
743750
React-RCTActionSheet: 726d2615ca62a77ce3e2c13d87f65379cdc73498
@@ -758,11 +765,11 @@ SPEC CHECKSUMS:
758765
RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
759766
RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
760767
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
761-
VisionCamera: 72ec2908dff5de402074d0cfd41932cd33c1fe65
762-
VisionCameraDynamsoftDocumentNormalizer: 15e769f93f336a619ac497eca2f96270ba98ae30
768+
VisionCamera: 8e00df84a76cf26ca70ecd3b6ed05dc0d3b60beb
769+
VisionCameraDynamsoftDocumentNormalizer: e000ab117d740278964bb73f871325d8755663f5
763770
Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6
764771
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
765772

766773
PODFILE CHECKSUM: b95ea2c415e9fcc44f83fb346e35b14f6879dfb1
767774

768-
COCOAPODS: 1.14.2
775+
COCOAPODS: 1.15.2

‎example/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"dependencies": {
1414
"react": "18.2.0",
1515
"react-native": "0.72.5",
16-
"react-native-vision-camera": "3.9.0",
17-
"react-native-worklets-core": "^0.2.4",
16+
"react-native-vision-camera": "4.0.1",
17+
"react-native-worklets-core": "1.1.1",
1818
"react-native-share": "^8.0.0",
1919
"react-native-simple-radio-button": "^2.7.4",
2020
"react-native-svg": "^13.4.0",

‎example/src/components/Scanner.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default function Scanner(props:ScannerProps) {
2525
}
2626
setDetectionResults(results);
2727
}
28-
const convertAndSetResultsJS = Worklets.createRunInJsFn(convertAndSetResults);
28+
const convertAndSetResultsJS = Worklets.createRunOnJS(convertAndSetResults);
2929
const frameWidth = useSharedValue(1920);
3030
const frameHeight = useSharedValue(1080);
3131
const [viewBox,setViewBox] = useState("0 0 1080 1920");
@@ -70,7 +70,7 @@ export default function Scanner(props:ScannerProps) {
7070
console.log("viewBox"+viewBox);
7171
}
7272

73-
const updateViewBoxJS = Worklets.createRunInJsFn(updateViewBox);
73+
const updateViewBoxJS = Worklets.createRunOnJS(updateViewBox);
7474
const updatePointsData = () => {
7575
if (detectionResults.length>0) {
7676
let result = detectionResults[0];
@@ -85,7 +85,7 @@ export default function Scanner(props:ScannerProps) {
8585
}
8686
}
8787

88-
const updatePointsDataJS = Worklets.createRunInJsFn(updatePointsData);
88+
const updatePointsDataJS = Worklets.createRunOnJS(updatePointsData);
8989

9090
useEffect(() => {
9191
if (pointsText != "default") {

‎example/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6180,15 +6180,15 @@ react-native-svg@^13.4.0:
61806180
css-select "^5.1.0"
61816181
css-tree "^1.1.3"
61826182

6183-
react-native-vision-camera@3.9.0:
6184-
version "3.9.0"
6185-
resolved "https://registry.npmmirror.com/react-native-vision-camera/-/react-native-vision-camera-3.9.0.tgz#6a96a6cbad53c2db84d671c388b250327681a553"
6186-
integrity sha512-q0HejFTS56s5DXWHZhlWLLZMKn/8OXALrqET+FySPIKskwYEdJ5rOV2aDlD6hlo67qCNFGUIMZWGFFc9L2os1g==
6183+
react-native-vision-camera@4.0.1:
6184+
version "4.0.1"
6185+
resolved "https://registry.npmmirror.com/react-native-vision-camera/-/react-native-vision-camera-4.0.1.tgz#045c8ff9c236d3bf7e1dba24172a4c11b19bbd37"
6186+
integrity sha512-TuXLw/ak+LPaJOCuUaYG1g2EmTAEEeIVAhSbCsqEHlklMjkO0oRBGcPC6HpKw3++jkcKRBVVyY48HbB002UZfg==
61876187

6188-
react-native-worklets-core@^0.2.4:
6189-
version "0.2.4"
6190-
resolved "https://registry.npmmirror.com/react-native-worklets-core/-/react-native-worklets-core-0.2.4.tgz#a4a79c04f2c6769ff03e96b7529c8638c88fa560"
6191-
integrity sha512-NKqxLRDOYfO7RJRZHHDA/1yztdiSadSTTILgHw2VwSrcQcmnWAZGXWr9EYpzKblpbk/vXfJa6QpWIKHjNrbe4w==
6188+
react-native-worklets-core@1.1.1:
6189+
version "1.1.1"
6190+
resolved "https://registry.npmmirror.com/react-native-worklets-core/-/react-native-worklets-core-1.1.1.tgz#c0a454c3be6d1ceab09ff925424ab371f5b048d3"
6191+
integrity sha512-mcZl5dDRJo+VI23HS6fPExr8YOW2fpxk+EtY1FIt81SyKt5FBHl97sSmdEjAOLKOb9myW6IiG5DWL8WQJ0iCWg==
61926192
dependencies:
61936193
string-hash-64 "^1.0.3"
61946194

@@ -7171,7 +7171,7 @@ vary@~1.1.2:
71717171
integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
71727172

71737173
vision-camera-dynamsoft-document-normalizer@../:
7174-
version "2.1.0"
7174+
version "2.3.0"
71757175

71767176
vlq@^1.0.0:
71777177
version "1.0.1"

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"react": "18.2.0",
7575
"react-native": "0.72.5",
7676
"react-native-builder-bob": "^0.18.0",
77-
"react-native-vision-camera": "3.9.0",
78-
"react-native-worklets-core": "^0.2.4",
77+
"react-native-vision-camera": "4.0.1",
78+
"react-native-worklets-core": "1.1.1",
7979
"release-it": "^16.1.3",
8080
"typescript": "^5.1.6"
8181
},

‎yarn.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6952,15 +6952,15 @@ react-native-builder-bob@^0.18.0:
69526952
optionalDependencies:
69536953
jetifier "^2.0.0"
69546954

6955-
react-native-vision-camera@3.9.0:
6956-
version "3.9.0"
6957-
resolved "https://registry.npmmirror.com/react-native-vision-camera/-/react-native-vision-camera-3.9.0.tgz#6a96a6cbad53c2db84d671c388b250327681a553"
6958-
integrity sha512-q0HejFTS56s5DXWHZhlWLLZMKn/8OXALrqET+FySPIKskwYEdJ5rOV2aDlD6hlo67qCNFGUIMZWGFFc9L2os1g==
6955+
react-native-vision-camera@4.0.1:
6956+
version "4.0.1"
6957+
resolved "https://registry.npmmirror.com/react-native-vision-camera/-/react-native-vision-camera-4.0.1.tgz#045c8ff9c236d3bf7e1dba24172a4c11b19bbd37"
6958+
integrity sha512-TuXLw/ak+LPaJOCuUaYG1g2EmTAEEeIVAhSbCsqEHlklMjkO0oRBGcPC6HpKw3++jkcKRBVVyY48HbB002UZfg==
69596959

6960-
react-native-worklets-core@^0.2.4:
6961-
version "0.2.4"
6962-
resolved "https://registry.npmmirror.com/react-native-worklets-core/-/react-native-worklets-core-0.2.4.tgz#a4a79c04f2c6769ff03e96b7529c8638c88fa560"
6963-
integrity sha512-NKqxLRDOYfO7RJRZHHDA/1yztdiSadSTTILgHw2VwSrcQcmnWAZGXWr9EYpzKblpbk/vXfJa6QpWIKHjNrbe4w==
6960+
react-native-worklets-core@1.1.1:
6961+
version "1.1.1"
6962+
resolved "https://registry.npmmirror.com/react-native-worklets-core/-/react-native-worklets-core-1.1.1.tgz#c0a454c3be6d1ceab09ff925424ab371f5b048d3"
6963+
integrity sha512-mcZl5dDRJo+VI23HS6fPExr8YOW2fpxk+EtY1FIt81SyKt5FBHl97sSmdEjAOLKOb9myW6IiG5DWL8WQJ0iCWg==
69646964
dependencies:
69656965
string-hash-64 "^1.0.3"
69666966

0 commit comments

Comments
 (0)