@unif/react-native-camera 1.1.6 → 1.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/lib/commonjs/camera/Camera.js +8 -4
  2. package/lib/commonjs/camera/Camera.js.map +1 -1
  3. package/lib/commonjs/camera/preview/SinglePre.js +4 -2
  4. package/lib/commonjs/camera/preview/SinglePre.js.map +1 -1
  5. package/lib/commonjs/camera/setup/SetUp.js +26 -28
  6. package/lib/commonjs/camera/setup/SetUp.js.map +1 -1
  7. package/lib/commonjs/camera/watermark/ViewShotWatermark.js +4 -3
  8. package/lib/commonjs/camera/watermark/ViewShotWatermark.js.map +1 -1
  9. package/lib/commonjs/utils/watermark.js +8 -2
  10. package/lib/commonjs/utils/watermark.js.map +1 -1
  11. package/lib/module/camera/Camera.js +8 -4
  12. package/lib/module/camera/Camera.js.map +1 -1
  13. package/lib/module/camera/preview/SinglePre.js +4 -2
  14. package/lib/module/camera/preview/SinglePre.js.map +1 -1
  15. package/lib/module/camera/setup/SetUp.js +26 -28
  16. package/lib/module/camera/setup/SetUp.js.map +1 -1
  17. package/lib/module/camera/watermark/ViewShotWatermark.js +4 -3
  18. package/lib/module/camera/watermark/ViewShotWatermark.js.map +1 -1
  19. package/lib/module/utils/watermark.js +8 -2
  20. package/lib/module/utils/watermark.js.map +1 -1
  21. package/lib/typescript/src/camera/Camera.d.ts.map +1 -1
  22. package/lib/typescript/src/camera/preview/SinglePre.d.ts +2 -1
  23. package/lib/typescript/src/camera/preview/SinglePre.d.ts.map +1 -1
  24. package/lib/typescript/src/camera/setup/SetUp.d.ts.map +1 -1
  25. package/lib/typescript/src/camera/watermark/ViewShotWatermark.d.ts +2 -0
  26. package/lib/typescript/src/camera/watermark/ViewShotWatermark.d.ts.map +1 -1
  27. package/lib/typescript/src/utils/watermark.d.ts +1 -1
  28. package/lib/typescript/src/utils/watermark.d.ts.map +1 -1
  29. package/package.json +1 -1
  30. package/src/camera/Camera.tsx +6 -3
  31. package/src/camera/preview/SinglePre.tsx +18 -4
  32. package/src/camera/setup/SetUp.tsx +11 -55
  33. package/src/camera/watermark/ViewShotWatermark.tsx +12 -5
  34. package/src/utils/watermark.ts +12 -2
  35. package/lib/commonjs/assets/tools/16_9.png +0 -0
  36. package/lib/commonjs/assets/tools/4_3.png +0 -0
  37. package/lib/module/assets/tools/16_9.png +0 -0
  38. package/lib/module/assets/tools/4_3.png +0 -0
  39. package/src/assets/tools/16_9.png +0 -0
  40. package/src/assets/tools/4_3.png +0 -0
@@ -22,7 +22,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
22
22
  * @Author: 刘利军
23
23
  * @Date: 2024-12-02 13:48:40
24
24
  * @LastEditors: 刘利军
25
- * @LastEditTime: 2025-01-20 14:18:36
25
+ * @LastEditTime: 2025-01-17 08:44:43
26
26
  * @Description:
27
27
  * @PageName:
28
28
  */
@@ -119,15 +119,17 @@ const Camera = ({
119
119
  video: showVideo(),
120
120
  audio: showVideo(),
121
121
  resizeMode: resizeMode
122
- }), /*#__PURE__*/_react.default.createElement(_setup.SetUp, {
123
- isMultiCam: device === null || device === void 0 ? void 0 : device.isMultiCam,
122
+ }), /*#__PURE__*/_react.default.createElement(_setup.SetUp
123
+ // isMultiCam={device?.isMultiCam}
124
+ , {
125
+ isMultiCam: false,
124
126
  onChange: val => flash = val,
125
127
  onAspectRationChange: setAspectRatio,
126
128
  onScreenChange: setResizeMode,
127
129
  onVolumeChange: val => enableShutterSound = val,
128
130
  onFishEyeOpen: val => {
129
131
  if (val === 'fishEye') {
130
- setZoom(0.5);
132
+ setZoom(device.minZoom);
131
133
  }
132
134
  if (val === 'default') {
133
135
  setZoom(device.neutralZoom);
@@ -190,6 +192,7 @@ const Camera = ({
190
192
  });
191
193
  }
192
194
  }), watermarkUriVis && /*#__PURE__*/_react.default.createElement(_watermark.ViewShotWatermark, {
195
+ resizeMode: resizeMode,
193
196
  data: photos.at(-1),
194
197
  watermark: data.watermark,
195
198
  onChange: value => {
@@ -209,6 +212,7 @@ const Camera = ({
209
212
  }), /*#__PURE__*/_react.default.createElement(_preview.PreViewContainer, {
210
213
  visible: preVis
211
214
  }, isSingle() ? /*#__PURE__*/_react.default.createElement(_preview.SinglePre, {
215
+ resizeMode: resizeMode,
212
216
  uri: (_photos$ = photos[0]) === null || _photos$ === void 0 ? void 0 : _photos$.path,
213
217
  onBack: () => signleBack(),
214
218
  onSave: () => confirm()
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_react","_interopRequireWildcard","_reactNativeVisionCamera","_reactNativeSafeAreaContext","_NoCamera","_interopRequireDefault","_footer","_setup","_preview","_reactNativeGestureHandler","_hooks","_watermark","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","PhotoAspectRatio","exports","enableShutterSound","flash","Camera","visible","data","back","onChange","_cameraMode$","_cameraMode$2","_photos$","cameraMode","dataRetainedMode","position","setPosition","useState","type","isActive","setIsActive","preVis","setPreVis","watermarkUriVis","setWatermarkUriVis","device","useCameraDevice","physicalDevices","aspectRatio","setAspectRatio","resizeMode","setResizeMode","zoom","setZoom","neutralZoom","format","useCameraFormat","photoAspectRatio","videoAspectRatio","videoResolution","photoResolution","camera","useRef","photos","setPhotos","mode","setMode","confirmApi","contextHolder","useConfirm","useEffect","createElement","commonBack","signleBack","isSingle","showPreview","showVideo","some","item","confirm","code","map","id","Date","getTime","toString","cameraType","path","message","openViewShotWatermark","val","GestureHandlerRootView","SafeAreaProvider","ref","style","styles","enableZoomGesture","photoQualityBalance","photo","video","audio","SetUp","isMultiCam","onAspectRationChange","onScreenChange","onVolumeChange","onFishEyeOpen","Footer","backPress","length","isBack","open","text","thumbnailPress","takePress","_camera$current","current","takePhoto","p","frontTime","watermark","savePress","rotatePress","ViewShotWatermark","at","value","photosList","PreViewContainer","SinglePre","uri","onBack","onSave","PreView","onDel","snapItem","isConfirm","photoList","filter","WaterMarkRender","_default","StyleSheet","create","flex","backgroundColor"],"sourceRoot":"../../../src","sources":["camera/Camera.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_react","_interopRequireWildcard","_reactNativeVisionCamera","_reactNativeSafeAreaContext","_NoCamera","_interopRequireDefault","_footer","_setup","_preview","_reactNativeGestureHandler","_hooks","_watermark","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","PhotoAspectRatio","exports","enableShutterSound","flash","Camera","visible","data","back","onChange","_cameraMode$","_cameraMode$2","_photos$","cameraMode","dataRetainedMode","position","setPosition","useState","type","isActive","setIsActive","preVis","setPreVis","watermarkUriVis","setWatermarkUriVis","device","useCameraDevice","physicalDevices","aspectRatio","setAspectRatio","resizeMode","setResizeMode","zoom","setZoom","neutralZoom","format","useCameraFormat","photoAspectRatio","videoAspectRatio","videoResolution","photoResolution","camera","useRef","photos","setPhotos","mode","setMode","confirmApi","contextHolder","useConfirm","useEffect","createElement","commonBack","signleBack","isSingle","showPreview","showVideo","some","item","confirm","code","map","id","Date","getTime","toString","cameraType","path","message","openViewShotWatermark","val","GestureHandlerRootView","SafeAreaProvider","ref","style","styles","enableZoomGesture","photoQualityBalance","photo","video","audio","SetUp","isMultiCam","onAspectRationChange","onScreenChange","onVolumeChange","onFishEyeOpen","minZoom","Footer","backPress","length","isBack","open","text","thumbnailPress","takePress","_camera$current","current","takePhoto","p","frontTime","watermark","savePress","rotatePress","ViewShotWatermark","at","value","photosList","PreViewContainer","SinglePre","uri","onBack","onSave","PreView","onDel","snapItem","isConfirm","photoList","filter","WaterMarkRender","_default","StyleSheet","create","flex","backgroundColor"],"sourceRoot":"../../../src","sources":["camera/Camera.tsx"],"mappings":"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","ignoreList":[]}
@@ -22,14 +22,17 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
22
22
 
23
23
  const SinglePre = ({
24
24
  uri,
25
+ resizeMode,
25
26
  onBack,
26
27
  onSave
27
28
  }) => {
28
29
  const inset = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
30
+ console.log('resizeMode', resizeMode);
29
31
  return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
30
32
  style: styles.container
31
33
  }, /*#__PURE__*/_react.default.createElement(_reactNative.Image, {
32
34
  style: styles.container,
35
+ resizeMode: resizeMode,
33
36
  source: {
34
37
  uri: (0, _utils.formatUri)(uri)
35
38
  }
@@ -54,8 +57,7 @@ const SinglePre = ({
54
57
  var _default = exports.default = SinglePre;
55
58
  const styles = exports.styles = _reactNative.StyleSheet.create({
56
59
  container: {
57
- flex: 1,
58
- backgroundColor: '#fff'
60
+ flex: 1
59
61
  },
60
62
  footer: {
61
63
  position: 'absolute',
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_react","_interopRequireDefault","_PreviewFooter","_components","_utils","_reactNativeSafeAreaContext","e","__esModule","default","SinglePre","uri","onBack","onSave","inset","useSafeAreaInsets","createElement","View","style","styles","container","Image","source","formatUri","footer","bottom","actions","Back","key","image","text","onPress","Save","_default","exports","StyleSheet","create","flex","backgroundColor","position","left","right","width","height"],"sourceRoot":"../../../../src","sources":["camera/preview/SinglePre.tsx"],"mappings":";;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,cAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,2BAAA,GAAAN,OAAA;AAAmE,SAAAE,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAbnE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAgBA,MAAMG,SAAgC,GAAGA,CAAC;EAAEC,GAAG;EAAEC,MAAM;EAAEC;AAAO,CAAC,KAAK;EACpE,MAAMC,KAAK,GAAG,IAAAC,6CAAiB,EAAC,CAAC;EACjC,oBACEd,MAAA,CAAAQ,OAAA,CAAAO,aAAA,CAACjB,YAAA,CAAAkB,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAC5BnB,MAAA,CAAAQ,OAAA,CAAAO,aAAA,CAACjB,YAAA,CAAAsB,KAAK;IAACH,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACE,MAAM,EAAE;MAAEX,GAAG,EAAE,IAAAY,gBAAS,EAACZ,GAAG;IAAE;EAAE,CAAE,CAAC,eACnEV,MAAA,CAAAQ,OAAA,CAAAO,aAAA,CAACjB,YAAA,CAAAkB,IAAI;IAACC,KAAK,EAAE,CAACC,MAAM,CAACK,MAAM,EAAE;MAAEC,MAAM,EAAEX,KAAK,CAACW,MAAM,GAAG;IAAG,CAAC;EAAE,gBAC1DxB,MAAA,CAAAQ,OAAA,CAAAO,aAAA,CAACb,cAAA,CAAAM,OAAa;IACZiB,OAAO,EAAE,cACPzB,MAAA,CAAAQ,OAAA,CAAAO,aAAA,CAACZ,WAAA,CAAAuB,IAAI;MACHC,GAAG,EAAC,MAAM;MACVV,KAAK,EAAEC,MAAM,CAACU,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAEnB;IAAO,CACjB,CAAC,eACFX,MAAA,CAAAQ,OAAA,CAAAO,aAAA,CAACZ,WAAA,CAAA4B,IAAI;MACHJ,GAAG,EAAC,MAAM;MACVV,KAAK,EAAEC,MAAM,CAACU,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAElB;IAAO,CACjB,CAAC;EACF,CACH,CACG,CACF,CAAC;AAEX,CAAC;AAAC,IAAAoB,QAAA,GAAAC,OAAA,CAAAzB,OAAA,GAEaC,SAAS;AAEjB,MAAMS,MAAM,GAAAe,OAAA,CAAAf,MAAA,GAAGgB,uBAAU,CAACC,MAAM,CAAC;EACtChB,SAAS,EAAE;IAAEiB,IAAI,EAAE,CAAC;IAAEC,eAAe,EAAE;EAAO,CAAC;EAC/Cd,MAAM,EAAE;IACNe,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRhB,MAAM,EAAE;EACV,CAAC;EACDI,KAAK,EAAE;IAAEa,KAAK,EAAE,EAAE;IAAEC,MAAM,EAAE;EAAG;AACjC,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_react","_interopRequireDefault","_PreviewFooter","_components","_utils","_reactNativeSafeAreaContext","e","__esModule","default","SinglePre","uri","resizeMode","onBack","onSave","inset","useSafeAreaInsets","console","log","createElement","View","style","styles","container","Image","source","formatUri","footer","bottom","actions","Back","key","image","text","onPress","Save","_default","exports","StyleSheet","create","flex","position","left","right","width","height"],"sourceRoot":"../../../../src","sources":["camera/preview/SinglePre.tsx"],"mappings":";;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,cAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,2BAAA,GAAAN,OAAA;AAAmE,SAAAE,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAbnE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAiBA,MAAMG,SAAgC,GAAGA,CAAC;EACxCC,GAAG;EACHC,UAAU;EACVC,MAAM;EACNC;AACF,CAAC,KAAK;EACJ,MAAMC,KAAK,GAAG,IAAAC,6CAAiB,EAAC,CAAC;EACjCC,OAAO,CAACC,GAAG,CAAC,YAAY,EAAEN,UAAU,CAAC;EACrC,oBACEX,MAAA,CAAAQ,OAAA,CAAAU,aAAA,CAACpB,YAAA,CAAAqB,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAC5BtB,MAAA,CAAAQ,OAAA,CAAAU,aAAA,CAACpB,YAAA,CAAAyB,KAAK;IACJH,KAAK,EAAEC,MAAM,CAACC,SAAU;IACxBX,UAAU,EAAEA,UAAW;IACvBa,MAAM,EAAE;MAAEd,GAAG,EAAE,IAAAe,gBAAS,EAACf,GAAG;IAAE;EAAE,CACjC,CAAC,eACFV,MAAA,CAAAQ,OAAA,CAAAU,aAAA,CAACpB,YAAA,CAAAqB,IAAI;IAACC,KAAK,EAAE,CAACC,MAAM,CAACK,MAAM,EAAE;MAAEC,MAAM,EAAEb,KAAK,CAACa,MAAM,GAAG;IAAG,CAAC;EAAE,gBAC1D3B,MAAA,CAAAQ,OAAA,CAAAU,aAAA,CAAChB,cAAA,CAAAM,OAAa;IACZoB,OAAO,EAAE,cACP5B,MAAA,CAAAQ,OAAA,CAAAU,aAAA,CAACf,WAAA,CAAA0B,IAAI;MACHC,GAAG,EAAC,MAAM;MACVV,KAAK,EAAEC,MAAM,CAACU,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAErB;IAAO,CACjB,CAAC,eACFZ,MAAA,CAAAQ,OAAA,CAAAU,aAAA,CAACf,WAAA,CAAA+B,IAAI;MACHJ,GAAG,EAAC,MAAM;MACVV,KAAK,EAAEC,MAAM,CAACU,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAEpB;IAAO,CACjB,CAAC;EACF,CACH,CACG,CACF,CAAC;AAEX,CAAC;AAAC,IAAAsB,QAAA,GAAAC,OAAA,CAAA5B,OAAA,GAEaC,SAAS;AAEjB,MAAMY,MAAM,GAAAe,OAAA,CAAAf,MAAA,GAAGgB,uBAAU,CAACC,MAAM,CAAC;EACtChB,SAAS,EAAE;IACTiB,IAAI,EAAE;EACR,CAAC;EAEDb,MAAM,EAAE;IACNc,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRf,MAAM,EAAE;EACV,CAAC;EACDI,KAAK,EAAE;IAAEY,KAAK,EAAE,EAAE;IAAEC,MAAM,EAAE;EAAG;AACjC,CAAC,CAAC","ignoreList":[]}
@@ -14,7 +14,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
14
14
  * @Author: 刘利军
15
15
  * @Date: 2024-12-02 11:52:31
16
16
  * @LastEditors: 刘利军
17
- * @LastEditTime: 2025-01-17 10:57:09
17
+ * @LastEditTime: 2025-01-21 11:10:20
18
18
  * @Description:
19
19
  * @PageName:
20
20
  */
@@ -24,31 +24,24 @@ const FlashOff = require('../../assets/tools/off.png');
24
24
  const FlashAuto = require('../../assets/tools/auto.png');
25
25
  const volumeOff = require('../../assets/tools/volumeOff.png');
26
26
  const volumeOn = require('../../assets/tools/volumeOn.png');
27
-
28
- // const four = require('../../assets/tools/4_3.png');
29
- // const sixteen = require('../../assets/tools/16_9.png');
30
-
31
- // const enlarge = require('../../assets/tools/enlarge.png');
32
- // const narrow = require('../../assets/tools/narrow.png');
27
+ const enlarge = require('../../assets/tools/enlarge.png');
28
+ const narrow = require('../../assets/tools/narrow.png');
33
29
  const defaultEyeImage = require('../../assets/tools/defaultEye.png');
34
30
  const defaultFishEyeImage = require('../../assets/tools/fishEye.png');
35
31
  let volume = false;
36
- // let screen = true;
37
-
32
+ let screen = true;
38
33
  const SetUp = ({
39
34
  isMultiCam,
40
35
  onChange,
41
- // onAspectRationChange,
42
- // onScreenChange,
36
+ onAspectRationChange,
37
+ onScreenChange,
43
38
  onVolumeChange,
44
39
  onFishEyeOpen
45
40
  }) => {
46
41
  const [flashImage, setFlashImage] = (0, _react.useState)(FlashOff);
47
- // const [aspectRatioImage, setAspectRatioImage] = useState(sixteen);
48
42
  const [volumeImage, setVolumeImage] = (0, _react.useState)(volumeOff);
49
43
  const [flashOpen, setFlashOpen] = (0, _react.useState)(false);
50
- // const [aspectRationOpen, setAspectRationOpen] = useState(false);
51
- // const [screenImage, setScreenImage] = useState(narrow);
44
+ const [screenImage, setScreenImage] = (0, _react.useState)(narrow);
52
45
  const [fishEyeOpen, setFishEyeOpen] = (0, _react.useState)(false);
53
46
  const [fishEyeImage, setFishEyeImage] = (0, _react.useState)(defaultEyeImage);
54
47
  const [openHeader, setOpenHeader] = (0, _react.useState)(true);
@@ -72,14 +65,6 @@ const SetUp = ({
72
65
  setOpenHeader(true);
73
66
  };
74
67
 
75
- // 宽高比切换
76
- // const aspectRatioChange = (type: number) => {
77
- // onAspectRationChange(type);
78
- // setAspectRatioImage(type === 4 ? four : sixteen);
79
- // setAspectRationOpen(false);
80
- // setOpenHeader(true);
81
- // };
82
-
83
68
  // 广角切换
84
69
  const fishEyeChange = type => {
85
70
  onFishEyeOpen(type);
@@ -133,6 +118,23 @@ const SetUp = ({
133
118
  }, /*#__PURE__*/_react.default.createElement(_reactNative.Image, {
134
119
  source: volumeImage,
135
120
  style: styles.toolImg
121
+ }))), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
122
+ style: styles.tool
123
+ }, /*#__PURE__*/_react.default.createElement(_reactNative.TouchableOpacity, {
124
+ style: styles.toolImg,
125
+ onPress: () => {
126
+ if (screen) {
127
+ setScreenImage(enlarge);
128
+ } else {
129
+ setScreenImage(narrow);
130
+ }
131
+ onScreenChange(screen ? 'contain' : 'cover');
132
+ onAspectRationChange(screen ? 4 : 16);
133
+ screen = !screen;
134
+ }
135
+ }, /*#__PURE__*/_react.default.createElement(_reactNative.Image, {
136
+ source: screenImage,
137
+ style: styles.toolImg
136
138
  }))), isMultiCam && /*#__PURE__*/_react.default.createElement(_reactNative.View, {
137
139
  style: styles.tool
138
140
  }, /*#__PURE__*/_react.default.createElement(_reactNative.TouchableOpacity, {
@@ -147,14 +149,10 @@ const SetUp = ({
147
149
  })), fishEyeOpen && /*#__PURE__*/_react.default.createElement(_reactNative.View, {
148
150
  style: styles.toolSetting
149
151
  }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
150
- onPress: () => {
151
- fishEyeChange('default');
152
- },
152
+ onPress: () => fishEyeChange('default'),
153
153
  style: styles.toolText
154
154
  }, "\u9ED8\u8BA4"), /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
155
- onPress: () => {
156
- fishEyeChange('fishEye');
157
- },
155
+ onPress: () => fishEyeChange('fishEye'),
158
156
  style: styles.toolText
159
157
  }, "\u5E7F\u89D2")))));
160
158
  };
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_react","_interopRequireWildcard","_utils","_reactNativeSafeAreaContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","FlashOn","FlashOff","FlashAuto","volumeOff","volumeOn","defaultEyeImage","defaultFishEyeImage","volume","SetUp","isMultiCam","onChange","onVolumeChange","onFishEyeOpen","flashImage","setFlashImage","useState","volumeImage","setVolumeImage","flashOpen","setFlashOpen","fishEyeOpen","setFishEyeOpen","fishEyeImage","setFishEyeImage","openHeader","setOpenHeader","insets","useSafeAreaInsets","falshChange","type","fishEyeChange","createElement","Fragment","View","style","styles","top","header","tools","tool","TouchableOpacity","toolImg","onPress","val","Image","source","toolSetting","Text","toolText","_default","exports","StyleSheet","create","text","color","absoluteFillObject","marginHorizontal","bottom","undefined","zIndex","display","alignItems","width","flexDirection","height","CONTROL_BUTTON_SIZE","marginBottom","marginLeft","fontWeight","headerLeft"],"sourceRoot":"../../../../src","sources":["camera/setup/SetUp.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_react","_interopRequireWildcard","_utils","_reactNativeSafeAreaContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","FlashOn","FlashOff","FlashAuto","volumeOff","volumeOn","enlarge","narrow","defaultEyeImage","defaultFishEyeImage","volume","screen","SetUp","isMultiCam","onChange","onAspectRationChange","onScreenChange","onVolumeChange","onFishEyeOpen","flashImage","setFlashImage","useState","volumeImage","setVolumeImage","flashOpen","setFlashOpen","screenImage","setScreenImage","fishEyeOpen","setFishEyeOpen","fishEyeImage","setFishEyeImage","openHeader","setOpenHeader","insets","useSafeAreaInsets","falshChange","type","fishEyeChange","createElement","Fragment","View","style","styles","top","header","tools","tool","TouchableOpacity","toolImg","onPress","val","Image","source","toolSetting","Text","toolText","_default","exports","StyleSheet","create","text","color","absoluteFillObject","marginHorizontal","bottom","undefined","zIndex","display","alignItems","width","flexDirection","height","CONTROL_BUTTON_SIZE","marginBottom","marginLeft","fontWeight","headerLeft"],"sourceRoot":"../../../../src","sources":["camera/setup/SetUp.tsx"],"mappings":";;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAEA,IAAAI,2BAAA,GAAAJ,OAAA;AAAmE,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAZnE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA,MAAMW,OAAO,GAAGzB,OAAO,CAAC,2BAA2B,CAAC;AACpD,MAAM0B,QAAQ,GAAG1B,OAAO,CAAC,4BAA4B,CAAC;AACtD,MAAM2B,SAAS,GAAG3B,OAAO,CAAC,6BAA6B,CAAC;AACxD,MAAM4B,SAAS,GAAG5B,OAAO,CAAC,kCAAkC,CAAC;AAC7D,MAAM6B,QAAQ,GAAG7B,OAAO,CAAC,iCAAiC,CAAC;AAE3D,MAAM8B,OAAO,GAAG9B,OAAO,CAAC,gCAAgC,CAAC;AACzD,MAAM+B,MAAM,GAAG/B,OAAO,CAAC,+BAA+B,CAAC;AACvD,MAAMgC,eAAe,GAAGhC,OAAO,CAAC,mCAAmC,CAAC;AACpE,MAAMiC,mBAAmB,GAAGjC,OAAO,CAAC,gCAAgC,CAAC;AAErE,IAAIkC,MAAM,GAAG,KAAK;AAClB,IAAIC,MAAM,GAAG,IAAI;AAEjB,MAAMC,KAOJ,GAAGA,CAAC;EACJC,UAAU;EACVC,QAAQ;EACRC,oBAAoB;EACpBC,cAAc;EACdC,cAAc;EACdC;AACF,CAAC,KAAK;EACJ,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAC,eAAQ,EAACnB,QAAQ,CAAC;EACtD,MAAM,CAACoB,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAF,eAAQ,EAACjB,SAAS,CAAC;EACzD,MAAM,CAACoB,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAJ,eAAQ,EAAC,KAAK,CAAC;EACjD,MAAM,CAACK,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAN,eAAQ,EAACd,MAAM,CAAC;EACtD,MAAM,CAACqB,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAR,eAAQ,EAAC,KAAK,CAAC;EACrD,MAAM,CAACS,YAAY,EAAEC,eAAe,CAAC,GAAG,IAAAV,eAAQ,EAACb,eAAe,CAAC;EACjE,MAAM,CAACwB,UAAU,EAAEC,aAAa,CAAC,GAAG,IAAAZ,eAAQ,EAAC,IAAI,CAAC;EAClD,MAAMa,MAAM,GAAG,IAAAC,6CAAiB,EAAC,CAAC;;EAElC;EACA,MAAMC,WAAW,GAAIC,IAAe,IAAK;IACvC,QAAQA,IAAI;MACV,KAAK,IAAI;QACPjB,aAAa,CAACnB,OAAO,CAAC;QACtB;MACF,KAAK,MAAM;QACTmB,aAAa,CAACjB,SAAS,CAAC;QACxB;MACF;QACEiB,aAAa,CAAClB,QAAQ,CAAC;QACvB;IACJ;IACAY,QAAQ,CAACuB,IAAI,CAAC;IACdZ,YAAY,CAAC,KAAK,CAAC;IACnBQ,aAAa,CAAC,IAAI,CAAC;EACrB,CAAC;;EAED;EACA,MAAMK,aAAa,GAAID,IAA2B,IAAK;IACrDnB,aAAa,CAACmB,IAAI,CAAC;IACnBN,eAAe,CAACM,IAAI,KAAK,SAAS,GAAG7B,eAAe,GAAGC,mBAAmB,CAAC;IAC3EoB,cAAc,CAAC,KAAK,CAAC;IACrBI,aAAa,CAAC,IAAI,CAAC;EACrB,CAAC;EAED,oBACExD,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAA9D,MAAA,CAAAU,OAAA,CAAAqD,QAAA,QACGR,UAAU,iBACTvD,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAE,CAACC,MAAM,CAACC,GAAG,EAAED,MAAM,CAACE,MAAM,EAAE;MAAED,GAAG,EAAEV,MAAM,CAACU,GAAG,GAAG;IAAG,CAAC;EAAE,CAE7D,CACP,eACDnE,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAE,CAACC,MAAM,CAACC,GAAG,EAAED,MAAM,CAACG,KAAK,EAAE;MAAEF,GAAG,EAAEV,MAAM,CAACU,GAAG,GAAG;IAAG,CAAC;EAAE,gBAChEnE,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACI;EAAK,gBACvBtE,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAyE,gBAAgB;IACfN,KAAK,EAAEC,MAAM,CAACM,OAAQ;IACtBC,OAAO,EAAEA,CAAA,KAAM;MACbjB,aAAa,CAAC,KAAK,CAAC;MACpBR,YAAY,CAAE0B,GAAG,IAAK,CAACA,GAAG,CAAC;IAC7B;EAAE,gBAEF1E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAA6E,KAAK;IAACC,MAAM,EAAElC,UAAW;IAACuB,KAAK,EAAEC,MAAM,CAACM;EAAQ,CAAE,CACnC,CAAC,EAClBzB,SAAS,iBACR/C,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACW;EAAY,gBAC9B7E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAgF,IAAI;IAACL,OAAO,EAAEA,CAAA,KAAMd,WAAW,CAAC,MAAM,CAAE;IAACM,KAAK,EAAEC,MAAM,CAACa;EAAS,GAAC,cAE5D,CAAC,eACP/E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAgF,IAAI;IAACL,OAAO,EAAEA,CAAA,KAAMd,WAAW,CAAC,IAAI,CAAE;IAACM,KAAK,EAAEC,MAAM,CAACa;EAAS,GAAC,cAE1D,CAAC,eACP/E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAgF,IAAI;IAACL,OAAO,EAAEA,CAAA,KAAMd,WAAW,CAAC,KAAK,CAAE;IAACM,KAAK,EAAEC,MAAM,CAACa;EAAS,GAAC,cAE3D,CACF,CAEJ,CAAC,eAEP/E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACI;EAAK,gBACvBtE,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAyE,gBAAgB;IACfN,KAAK,EAAEC,MAAM,CAACM,OAAQ;IACtBC,OAAO,EAAEA,CAAA,KAAM;MACb,IAAIxC,MAAM,EAAE;QACVa,cAAc,CAACnB,SAAS,CAAC;MAC3B,CAAC,MAAM;QACLmB,cAAc,CAAClB,QAAQ,CAAC;MAC1B;MACAK,MAAM,GAAG,CAACA,MAAM;MAChBO,cAAc,CAACP,MAAM,CAAC;IACxB;EAAE,gBAEFjC,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAA6E,KAAK;IAACC,MAAM,EAAE/B,WAAY;IAACoB,KAAK,EAAEC,MAAM,CAACM;EAAQ,CAAE,CACpC,CACd,CAAC,eAEPxE,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACI;EAAK,gBACvBtE,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAyE,gBAAgB;IACfN,KAAK,EAAEC,MAAM,CAACM,OAAQ;IACtBC,OAAO,EAAEA,CAAA,KAAM;MACb,IAAIvC,MAAM,EAAE;QACVgB,cAAc,CAACrB,OAAO,CAAC;MACzB,CAAC,MAAM;QACLqB,cAAc,CAACpB,MAAM,CAAC;MACxB;MACAS,cAAc,CAACL,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;MAC5CI,oBAAoB,CAACJ,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC;MACrCA,MAAM,GAAG,CAACA,MAAM;IAClB;EAAE,gBAEFlC,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAA6E,KAAK;IAACC,MAAM,EAAE3B,WAAY;IAACgB,KAAK,EAAEC,MAAM,CAACM;EAAQ,CAAE,CACpC,CACd,CAAC,EAENpC,UAAU,iBACTpC,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACI;EAAK,gBACvBtE,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAyE,gBAAgB;IACfN,KAAK,EAAEC,MAAM,CAACM,OAAQ;IACtBC,OAAO,EAAEA,CAAA,KAAM;MACbjB,aAAa,CAAC,KAAK,CAAC;MACpBJ,cAAc,CAAEsB,GAAG,IAAK,CAACA,GAAG,CAAC;IAC/B;EAAE,gBAEF1E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAA6E,KAAK;IAACC,MAAM,EAAEvB,YAAa;IAACY,KAAK,EAAEC,MAAM,CAACM;EAAQ,CAAE,CACrC,CAAC,EAClBrB,WAAW,iBACVnD,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAkE,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACW;EAAY,gBAC9B7E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAgF,IAAI;IACHL,OAAO,EAAEA,CAAA,KAAMZ,aAAa,CAAC,SAAS,CAAE;IACxCI,KAAK,EAAEC,MAAM,CAACa;EAAS,GACxB,cAEK,CAAC,eACP/E,MAAA,CAAAU,OAAA,CAAAoD,aAAA,CAAChE,YAAA,CAAAgF,IAAI;IACHL,OAAO,EAAEA,CAAA,KAAMZ,aAAa,CAAC,SAAS,CAAE;IACxCI,KAAK,EAAEC,MAAM,CAACa;EAAS,GACxB,cAEK,CACF,CAEJ,CAEJ,CACN,CAAC;AAEP,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAvE,OAAA,GAEayB,KAAK;AAEpB,MAAM+B,MAAM,GAAGgB,uBAAU,CAACC,MAAM,CAAC;EAC/BC,IAAI,EAAE;IAAEC,KAAK,EAAE;EAAO,CAAC;EACvBlB,GAAG,EAAE;IACH,GAAGe,uBAAU,CAACI,kBAAkB;IAChCC,gBAAgB,EAAE,EAAE;IACpBC,MAAM,EAAEC,SAAS;IACjBC,MAAM,EAAE;EACV,CAAC;EACDtB,MAAM,EAAE;IACNuB,OAAO,EAAE,MAAM;IACfC,UAAU,EAAE;EACd,CAAC;EACDvB,KAAK,EAAE;IACLsB,OAAO,EAAE,MAAM;IACfE,KAAK,EAAE;EACT,CAAC;EACDvB,IAAI,EAAE;IACJqB,OAAO,EAAE,MAAM;IACfG,aAAa,EAAE,KAAK;IACpBD,KAAK,EAAE,MAAM;IACbE,MAAM,EAAEC,0BAAmB,GAAG,CAAC;IAC/BJ,UAAU,EAAE,QAAQ;IACpBK,YAAY,EAAE;EAChB,CAAC;EACDzB,OAAO,EAAE;IACPqB,KAAK,EAAEG,0BAAmB,GAAG,CAAC;IAC9BD,MAAM,EAAE;EACV,CAAC;EACDlB,WAAW,EAAE;IACXc,OAAO,EAAE,MAAM;IACfG,aAAa,EAAE;EACjB,CAAC;EACDf,QAAQ,EAAE;IACRmB,UAAU,EAAE,CAAC;IACbC,UAAU,EAAE,KAAK;IACjBd,KAAK,EAAE;EACT,CAAC;EACDe,UAAU,EAAE;IACVT,OAAO,EAAE,MAAM;IACfG,aAAa,EAAE;EACjB;AACF,CAAC,CAAC","ignoreList":[]}
@@ -16,13 +16,14 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
16
16
  * @Author: 刘利军
17
17
  * @Date: 2024-12-25 16:56:42
18
18
  * @LastEditors: 刘利军
19
- * @LastEditTime: 2025-01-17 11:22:40
19
+ * @LastEditTime: 2024-12-30 13:07:33
20
20
  * @Description:
21
21
  * @PageName:
22
22
  */
23
23
 
24
24
  const ViewShotWatermark = ({
25
25
  data,
26
+ resizeMode,
26
27
  watermark,
27
28
  onChange
28
29
  }) => {
@@ -46,7 +47,7 @@ const ViewShotWatermark = ({
46
47
  uri: (0, _utils.formatUri)(data.path)
47
48
  },
48
49
  style: styles.container,
49
- resizeMode: "center",
50
+ resizeMode: resizeMode,
50
51
  onLoadEnd: () => {
51
52
  setTimeout(() => {
52
53
  autoSaveWatermark();
@@ -70,7 +71,7 @@ const styles = exports.styles = _reactNative.StyleSheet.create({
70
71
  right: 0,
71
72
  top: 0,
72
73
  bottom: 0,
73
- backgroundColor: '#fff',
74
+ backgroundColor: '#000',
74
75
  zIndex: _utils.MAX_ZINDEX
75
76
  },
76
77
  footer: {
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_react","_interopRequireWildcard","_reactNativeViewShot","_interopRequireDefault","_Render","_utils","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ViewShotWatermark","data","watermark","onChange","viewShotRef","useRef","autoSaveWatermark","_viewShotRef$current","_viewShotRef$current$","img","current","capture","path","createElement","Fragment","ref","style","styles","container","Image","source","uri","formatUri","resizeMode","onLoadEnd","setTimeout","zIndex","MAX_ZINDEX","View","footer","Text","text","_default","exports","StyleSheet","create","flex","position","left","right","top","bottom","backgroundColor","color","textAlign","fontSize","pxToDpWidth"],"sourceRoot":"../../../../src","sources":["camera/watermark/ViewShotWatermark.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_react","_interopRequireWildcard","_reactNativeViewShot","_interopRequireDefault","_Render","_utils","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ViewShotWatermark","data","resizeMode","watermark","onChange","viewShotRef","useRef","autoSaveWatermark","_viewShotRef$current","_viewShotRef$current$","img","current","capture","path","createElement","Fragment","ref","style","styles","container","Image","source","uri","formatUri","onLoadEnd","setTimeout","zIndex","MAX_ZINDEX","View","footer","Text","text","_default","exports","StyleSheet","create","flex","position","left","right","top","bottom","backgroundColor","color","textAlign","fontSize","pxToDpWidth"],"sourceRoot":"../../../../src","sources":["camera/watermark/ViewShotWatermark.tsx"],"mappings":"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","ignoreList":[]}
@@ -10,7 +10,7 @@ var _pxToDp = require("./px-to-dp");
10
10
  * @Author: 刘利军
11
11
  * @Date: 2024-12-25 13:51:40
12
12
  * @LastEditors: 刘利军
13
- * @LastEditTime: 2024-12-25 13:53:40
13
+ * @LastEditTime: 2025-01-21 11:04:47
14
14
  * @Description:
15
15
  * @PageName:
16
16
  */
@@ -19,9 +19,15 @@ const lastPx = v => (0, _pxToDp.pxToDpWidth)(v) / (_reactNative.Platform.OS ===
19
19
  exports.lastPx = lastPx;
20
20
  const getMeasure = async (ctx, content) => {
21
21
  const metrics = await ctx.measureText(content);
22
+ let height = 0;
23
+ if (metrics !== null && metrics !== void 0 && metrics.fontBoundingBoxAscent && metrics !== null && metrics !== void 0 && metrics.fontBoundingBoxDescent) {
24
+ height = metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent;
25
+ } else if (metrics !== null && metrics !== void 0 && metrics.actualBoundingBoxAscent && metrics !== null && metrics !== void 0 && metrics.actualBoundingBoxDescent) {
26
+ height = (metrics === null || metrics === void 0 ? void 0 : metrics.actualBoundingBoxAscent) + (metrics === null || metrics === void 0 ? void 0 : metrics.actualBoundingBoxDescent);
27
+ }
22
28
  return {
23
29
  width: metrics.width,
24
- height: metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent
30
+ height
25
31
  };
26
32
  };
27
33
  exports.getMeasure = getMeasure;
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_pxToDp","lastPx","v","pxToDpWidth","Platform","OS","PixelRatio","get","exports","getMeasure","ctx","content","metrics","measureText","width","height","fontBoundingBoxAscent","fontBoundingBoxDescent","getContentMeasure","sizes","index","length","element","push","defaultWidth","Math","ceil","max","map","size","defaultHeight"],"sourceRoot":"../../../src","sources":["utils/watermark.ts"],"mappings":";;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AATA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKO,MAAME,MAAM,GAAIC,CAAS,IAC9B,IAAAC,mBAAW,EAACD,CAAC,CAAC,IAAIE,qBAAQ,CAACC,EAAE,KAAK,KAAK,GAAGC,uBAAU,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAACC,OAAA,CAAAP,MAAA,GAAAA,MAAA;AAE3D,MAAMQ,UAAU,GAAG,MAAAA,CACxBC,GAA6B,EAC7BC,OAAe,KACZ;EACH,MAAMC,OAAO,GAAG,MAAMF,GAAG,CAACG,WAAW,CAACF,OAAO,CAAC;EAC9C,OAAO;IACLG,KAAK,EAAEF,OAAO,CAACE,KAAK;IACpBC,MAAM,EAAEH,OAAO,CAACI,qBAAqB,GAAGJ,OAAO,CAACK;EAClD,CAAC;AACH,CAAC;AAACT,OAAA,CAAAC,UAAA,GAAAA,UAAA;AAEK,MAAMS,iBAAiB,GAAG,MAAAA,CAC/BR,GAA6B,EAC7BC,OAAiB,KACd;EACH,IAAIQ,KAAiB,GAAG,EAAE;EAE1B,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGT,OAAO,CAACU,MAAM,EAAED,KAAK,EAAE,EAAE;IACnD,MAAME,OAAO,GAAGX,OAAO,CAACS,KAAK,CAAC;IAC9B,MAAMR,OAAO,GAAG,MAAMH,UAAU,CAACC,GAAG,EAAEY,OAAiB,CAAC;IACxDH,KAAK,CAACI,IAAI,CAAC,CAACX,OAAO,CAACE,KAAK,EAAEF,OAAO,CAACG,MAAM,CAAC,CAAC;EAC7C;EACA,MAAMS,YAAY,GAAGC,IAAI,CAACC,IAAI,CAC5BD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CACpD,CAAC;EACD,MAAMC,aAAa,GACjBL,IAAI,CAACC,IAAI,CAACD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CAAC,CAAC,GAC9DlB,OAAO,CAACU,MAAM;EAChB,OAAO;IAAEP,KAAK,EAAEU,YAAY;IAAET,MAAM,EAAEe;EAAc,CAAC;AACvD,CAAC;AAACtB,OAAA,CAAAU,iBAAA,GAAAA,iBAAA","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_pxToDp","lastPx","v","pxToDpWidth","Platform","OS","PixelRatio","get","exports","getMeasure","ctx","content","metrics","measureText","height","fontBoundingBoxAscent","fontBoundingBoxDescent","actualBoundingBoxAscent","actualBoundingBoxDescent","width","getContentMeasure","sizes","index","length","element","push","defaultWidth","Math","ceil","max","map","size","defaultHeight"],"sourceRoot":"../../../src","sources":["utils/watermark.ts"],"mappings":";;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AATA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKO,MAAME,MAAM,GAAIC,CAAS,IAC9B,IAAAC,mBAAW,EAACD,CAAC,CAAC,IAAIE,qBAAQ,CAACC,EAAE,KAAK,KAAK,GAAGC,uBAAU,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAACC,OAAA,CAAAP,MAAA,GAAAA,MAAA;AAE3D,MAAMQ,UAAU,GAAG,MAAAA,CACxBC,GAA6B,EAC7BC,OAAe,KACZ;EACH,MAAMC,OAAO,GAAG,MAAMF,GAAG,CAACG,WAAW,CAACF,OAAO,CAAC;EAC9C,IAAIG,MAAM,GAAG,CAAC;EACd,IAAIF,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEG,qBAAqB,IAAIH,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEI,sBAAsB,EAAE;IACrEF,MAAM,GAAGF,OAAO,CAACG,qBAAqB,GAAGH,OAAO,CAACI,sBAAsB;EACzE,CAAC,MAAM,IACLJ,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEK,uBAAuB,IAChCL,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEM,wBAAwB,EACjC;IACAJ,MAAM,GACJ,CAAAF,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEK,uBAAuB,KAAGL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,wBAAwB;EACxE;EACA,OAAO;IACLC,KAAK,EAAEP,OAAO,CAACO,KAAK;IACpBL;EACF,CAAC;AACH,CAAC;AAACN,OAAA,CAAAC,UAAA,GAAAA,UAAA;AAEK,MAAMW,iBAAiB,GAAG,MAAAA,CAC/BV,GAA6B,EAC7BC,OAAiB,KACd;EACH,IAAIU,KAAiB,GAAG,EAAE;EAE1B,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGX,OAAO,CAACY,MAAM,EAAED,KAAK,EAAE,EAAE;IACnD,MAAME,OAAO,GAAGb,OAAO,CAACW,KAAK,CAAC;IAC9B,MAAMV,OAAO,GAAG,MAAMH,UAAU,CAACC,GAAG,EAAEc,OAAiB,CAAC;IACxDH,KAAK,CAACI,IAAI,CAAC,CAACb,OAAO,CAACO,KAAK,EAAEP,OAAO,CAACE,MAAM,CAAC,CAAC;EAC7C;EACA,MAAMY,YAAY,GAAGC,IAAI,CAACC,IAAI,CAC5BD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CACpD,CAAC;EACD,MAAMC,aAAa,GACjBL,IAAI,CAACC,IAAI,CAACD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CAAC,CAAC,GAC9DpB,OAAO,CAACY,MAAM;EAChB,OAAO;IAAEJ,KAAK,EAAEO,YAAY;IAAEZ,MAAM,EAAEkB;EAAc,CAAC;AACvD,CAAC;AAACxB,OAAA,CAAAY,iBAAA,GAAAA,iBAAA","ignoreList":[]}
@@ -2,7 +2,7 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-02 13:48:40
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2025-01-20 14:18:36
5
+ * @LastEditTime: 2025-01-17 08:44:43
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
@@ -110,15 +110,17 @@ const Camera = ({
110
110
  video: showVideo(),
111
111
  audio: showVideo(),
112
112
  resizeMode: resizeMode
113
- }), /*#__PURE__*/React.createElement(SetUp, {
114
- isMultiCam: device === null || device === void 0 ? void 0 : device.isMultiCam,
113
+ }), /*#__PURE__*/React.createElement(SetUp
114
+ // isMultiCam={device?.isMultiCam}
115
+ , {
116
+ isMultiCam: false,
115
117
  onChange: val => flash = val,
116
118
  onAspectRationChange: setAspectRatio,
117
119
  onScreenChange: setResizeMode,
118
120
  onVolumeChange: val => enableShutterSound = val,
119
121
  onFishEyeOpen: val => {
120
122
  if (val === 'fishEye') {
121
- setZoom(0.5);
123
+ setZoom(device.minZoom);
122
124
  }
123
125
  if (val === 'default') {
124
126
  setZoom(device.neutralZoom);
@@ -181,6 +183,7 @@ const Camera = ({
181
183
  });
182
184
  }
183
185
  }), watermarkUriVis && /*#__PURE__*/React.createElement(ViewShotWatermark, {
186
+ resizeMode: resizeMode,
184
187
  data: photos.at(-1),
185
188
  watermark: data.watermark,
186
189
  onChange: value => {
@@ -200,6 +203,7 @@ const Camera = ({
200
203
  }), /*#__PURE__*/React.createElement(PreViewContainer, {
201
204
  visible: preVis
202
205
  }, isSingle() ? /*#__PURE__*/React.createElement(SinglePre, {
206
+ resizeMode: resizeMode,
203
207
  uri: (_photos$ = photos[0]) === null || _photos$ === void 0 ? void 0 : _photos$.path,
204
208
  onBack: () => signleBack(),
205
209
  onSave: () => confirm()
@@ -1 +1 @@
1
- {"version":3,"names":["StyleSheet","React","useEffect","useRef","useState","Camera","VisionCamera","useCameraDevice","useCameraFormat","SafeAreaProvider","NoCamera","Footer","SetUp","PreView","PreViewContainer","SinglePre","GestureHandlerRootView","useConfirm","ViewShotWatermark","WaterMarkRender","PhotoAspectRatio","enableShutterSound","flash","visible","data","back","onChange","_cameraMode$","_cameraMode$2","_photos$","cameraMode","dataRetainedMode","position","setPosition","type","isActive","setIsActive","preVis","setPreVis","watermarkUriVis","setWatermarkUriVis","device","physicalDevices","aspectRatio","setAspectRatio","resizeMode","setResizeMode","zoom","setZoom","neutralZoom","format","photoAspectRatio","videoAspectRatio","videoResolution","photoResolution","camera","photos","setPhotos","mode","setMode","confirmApi","contextHolder","createElement","commonBack","signleBack","isSingle","showPreview","showVideo","some","item","confirm","code","map","id","Date","getTime","toString","cameraType","path","message","openViewShotWatermark","val","ref","style","styles","enableZoomGesture","photoQualityBalance","photo","video","audio","isMultiCam","onAspectRationChange","onScreenChange","onVolumeChange","onFishEyeOpen","backPress","length","isBack","open","text","thumbnailPress","takePress","_camera$current","current","takePhoto","p","frontTime","watermark","savePress","rotatePress","at","value","photosList","uri","onBack","onSave","onDel","snapItem","isConfirm","photoList","filter","create","flex","backgroundColor"],"sourceRoot":"../../../src","sources":["camera/Camera.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["StyleSheet","React","useEffect","useRef","useState","Camera","VisionCamera","useCameraDevice","useCameraFormat","SafeAreaProvider","NoCamera","Footer","SetUp","PreView","PreViewContainer","SinglePre","GestureHandlerRootView","useConfirm","ViewShotWatermark","WaterMarkRender","PhotoAspectRatio","enableShutterSound","flash","visible","data","back","onChange","_cameraMode$","_cameraMode$2","_photos$","cameraMode","dataRetainedMode","position","setPosition","type","isActive","setIsActive","preVis","setPreVis","watermarkUriVis","setWatermarkUriVis","device","physicalDevices","aspectRatio","setAspectRatio","resizeMode","setResizeMode","zoom","setZoom","neutralZoom","format","photoAspectRatio","videoAspectRatio","videoResolution","photoResolution","camera","photos","setPhotos","mode","setMode","confirmApi","contextHolder","createElement","commonBack","signleBack","isSingle","showPreview","showVideo","some","item","confirm","code","map","id","Date","getTime","toString","cameraType","path","message","openViewShotWatermark","val","ref","style","styles","enableZoomGesture","photoQualityBalance","photo","video","audio","isMultiCam","onAspectRationChange","onScreenChange","onVolumeChange","onFishEyeOpen","minZoom","backPress","length","isBack","open","text","thumbnailPress","takePress","_camera$current","current","takePhoto","p","frontTime","watermark","savePress","rotatePress","at","value","photosList","uri","onBack","onSave","onDel","snapItem","isConfirm","photoList","filter","create","flex","backgroundColor"],"sourceRoot":"../../../src","sources":["camera/Camera.tsx"],"mappings":"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","ignoreList":[]}
@@ -14,14 +14,17 @@ import { formatUri } from '../../utils';
14
14
  import { useSafeAreaInsets } from 'react-native-safe-area-context';
15
15
  const SinglePre = ({
16
16
  uri,
17
+ resizeMode,
17
18
  onBack,
18
19
  onSave
19
20
  }) => {
20
21
  const inset = useSafeAreaInsets();
22
+ console.log('resizeMode', resizeMode);
21
23
  return /*#__PURE__*/React.createElement(View, {
22
24
  style: styles.container
23
25
  }, /*#__PURE__*/React.createElement(Image, {
24
26
  style: styles.container,
27
+ resizeMode: resizeMode,
25
28
  source: {
26
29
  uri: formatUri(uri)
27
30
  }
@@ -46,8 +49,7 @@ const SinglePre = ({
46
49
  export default SinglePre;
47
50
  export const styles = StyleSheet.create({
48
51
  container: {
49
- flex: 1,
50
- backgroundColor: '#fff'
52
+ flex: 1
51
53
  },
52
54
  footer: {
53
55
  position: 'absolute',
@@ -1 +1 @@
1
- {"version":3,"names":["Image","StyleSheet","View","React","PreviewFooter","Back","Save","formatUri","useSafeAreaInsets","SinglePre","uri","onBack","onSave","inset","createElement","style","styles","container","source","footer","bottom","actions","key","image","text","onPress","create","flex","backgroundColor","position","left","right","width","height"],"sourceRoot":"../../../../src","sources":["camera/preview/SinglePre.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,KAAK,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACtD,OAAOC,KAAK,MAAM,OAAO;AACzB,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,SAASC,IAAI,EAAEC,IAAI,QAAQ,kBAAkB;AAC7C,SAASC,SAAS,QAA8B,aAAa;AAC7D,SAASC,iBAAiB,QAAQ,gCAAgC;AAUlE,MAAMC,SAAgC,GAAGA,CAAC;EAAEC,GAAG;EAAEC,MAAM;EAAEC;AAAO,CAAC,KAAK;EACpE,MAAMC,KAAK,GAAGL,iBAAiB,CAAC,CAAC;EACjC,oBACEL,KAAA,CAAAW,aAAA,CAACZ,IAAI;IAACa,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAC5Bd,KAAA,CAAAW,aAAA,CAACd,KAAK;IAACe,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACC,MAAM,EAAE;MAAER,GAAG,EAAEH,SAAS,CAACG,GAAG;IAAE;EAAE,CAAE,CAAC,eACnEP,KAAA,CAAAW,aAAA,CAACZ,IAAI;IAACa,KAAK,EAAE,CAACC,MAAM,CAACG,MAAM,EAAE;MAAEC,MAAM,EAAEP,KAAK,CAACO,MAAM,GAAG;IAAG,CAAC;EAAE,gBAC1DjB,KAAA,CAAAW,aAAA,CAACV,aAAa;IACZiB,OAAO,EAAE,cACPlB,KAAA,CAAAW,aAAA,CAACT,IAAI;MACHiB,GAAG,EAAC,MAAM;MACVP,KAAK,EAAEC,MAAM,CAACO,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAEd;IAAO,CACjB,CAAC,eACFR,KAAA,CAAAW,aAAA,CAACR,IAAI;MACHgB,GAAG,EAAC,MAAM;MACVP,KAAK,EAAEC,MAAM,CAACO,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAEb;IAAO,CACjB,CAAC;EACF,CACH,CACG,CACF,CAAC;AAEX,CAAC;AAED,eAAeH,SAAS;AAExB,OAAO,MAAMO,MAAM,GAAGf,UAAU,CAACyB,MAAM,CAAC;EACtCT,SAAS,EAAE;IAAEU,IAAI,EAAE,CAAC;IAAEC,eAAe,EAAE;EAAO,CAAC;EAC/CT,MAAM,EAAE;IACNU,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRX,MAAM,EAAE;EACV,CAAC;EACDG,KAAK,EAAE;IAAES,KAAK,EAAE,EAAE;IAAEC,MAAM,EAAE;EAAG;AACjC,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["Image","StyleSheet","View","React","PreviewFooter","Back","Save","formatUri","useSafeAreaInsets","SinglePre","uri","resizeMode","onBack","onSave","inset","console","log","createElement","style","styles","container","source","footer","bottom","actions","key","image","text","onPress","create","flex","position","left","right","width","height"],"sourceRoot":"../../../../src","sources":["camera/preview/SinglePre.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,KAAK,EAAEC,UAAU,EAAEC,IAAI,QAA8B,cAAc;AAC5E,OAAOC,KAAK,MAAM,OAAO;AACzB,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,SAASC,IAAI,EAAEC,IAAI,QAAQ,kBAAkB;AAC7C,SAASC,SAAS,QAA8B,aAAa;AAC7D,SAASC,iBAAiB,QAAQ,gCAAgC;AAWlE,MAAMC,SAAgC,GAAGA,CAAC;EACxCC,GAAG;EACHC,UAAU;EACVC,MAAM;EACNC;AACF,CAAC,KAAK;EACJ,MAAMC,KAAK,GAAGN,iBAAiB,CAAC,CAAC;EACjCO,OAAO,CAACC,GAAG,CAAC,YAAY,EAAEL,UAAU,CAAC;EACrC,oBACER,KAAA,CAAAc,aAAA,CAACf,IAAI;IAACgB,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAC5BjB,KAAA,CAAAc,aAAA,CAACjB,KAAK;IACJkB,KAAK,EAAEC,MAAM,CAACC,SAAU;IACxBT,UAAU,EAAEA,UAAW;IACvBU,MAAM,EAAE;MAAEX,GAAG,EAAEH,SAAS,CAACG,GAAG;IAAE;EAAE,CACjC,CAAC,eACFP,KAAA,CAAAc,aAAA,CAACf,IAAI;IAACgB,KAAK,EAAE,CAACC,MAAM,CAACG,MAAM,EAAE;MAAEC,MAAM,EAAET,KAAK,CAACS,MAAM,GAAG;IAAG,CAAC;EAAE,gBAC1DpB,KAAA,CAAAc,aAAA,CAACb,aAAa;IACZoB,OAAO,EAAE,cACPrB,KAAA,CAAAc,aAAA,CAACZ,IAAI;MACHoB,GAAG,EAAC,MAAM;MACVP,KAAK,EAAEC,MAAM,CAACO,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAEhB;IAAO,CACjB,CAAC,eACFT,KAAA,CAAAc,aAAA,CAACX,IAAI;MACHmB,GAAG,EAAC,MAAM;MACVP,KAAK,EAAEC,MAAM,CAACO,KAAM;MACpBC,IAAI,EAAC,cAAI;MACTC,OAAO,EAAEf;IAAO,CACjB,CAAC;EACF,CACH,CACG,CACF,CAAC;AAEX,CAAC;AAED,eAAeJ,SAAS;AAExB,OAAO,MAAMU,MAAM,GAAGlB,UAAU,CAAC4B,MAAM,CAAC;EACtCT,SAAS,EAAE;IACTU,IAAI,EAAE;EACR,CAAC;EAEDR,MAAM,EAAE;IACNS,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRV,MAAM,EAAE;EACV,CAAC;EACDG,KAAK,EAAE;IAAEQ,KAAK,EAAE,EAAE;IAAEC,MAAM,EAAE;EAAG;AACjC,CAAC,CAAC","ignoreList":[]}
@@ -2,7 +2,7 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-02 11:52:31
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2025-01-17 10:57:09
5
+ * @LastEditTime: 2025-01-21 11:10:20
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
@@ -15,31 +15,24 @@ const FlashOff = require('../../assets/tools/off.png');
15
15
  const FlashAuto = require('../../assets/tools/auto.png');
16
16
  const volumeOff = require('../../assets/tools/volumeOff.png');
17
17
  const volumeOn = require('../../assets/tools/volumeOn.png');
18
-
19
- // const four = require('../../assets/tools/4_3.png');
20
- // const sixteen = require('../../assets/tools/16_9.png');
21
-
22
- // const enlarge = require('../../assets/tools/enlarge.png');
23
- // const narrow = require('../../assets/tools/narrow.png');
18
+ const enlarge = require('../../assets/tools/enlarge.png');
19
+ const narrow = require('../../assets/tools/narrow.png');
24
20
  const defaultEyeImage = require('../../assets/tools/defaultEye.png');
25
21
  const defaultFishEyeImage = require('../../assets/tools/fishEye.png');
26
22
  let volume = false;
27
- // let screen = true;
28
-
23
+ let screen = true;
29
24
  const SetUp = ({
30
25
  isMultiCam,
31
26
  onChange,
32
- // onAspectRationChange,
33
- // onScreenChange,
27
+ onAspectRationChange,
28
+ onScreenChange,
34
29
  onVolumeChange,
35
30
  onFishEyeOpen
36
31
  }) => {
37
32
  const [flashImage, setFlashImage] = useState(FlashOff);
38
- // const [aspectRatioImage, setAspectRatioImage] = useState(sixteen);
39
33
  const [volumeImage, setVolumeImage] = useState(volumeOff);
40
34
  const [flashOpen, setFlashOpen] = useState(false);
41
- // const [aspectRationOpen, setAspectRationOpen] = useState(false);
42
- // const [screenImage, setScreenImage] = useState(narrow);
35
+ const [screenImage, setScreenImage] = useState(narrow);
43
36
  const [fishEyeOpen, setFishEyeOpen] = useState(false);
44
37
  const [fishEyeImage, setFishEyeImage] = useState(defaultEyeImage);
45
38
  const [openHeader, setOpenHeader] = useState(true);
@@ -63,14 +56,6 @@ const SetUp = ({
63
56
  setOpenHeader(true);
64
57
  };
65
58
 
66
- // 宽高比切换
67
- // const aspectRatioChange = (type: number) => {
68
- // onAspectRationChange(type);
69
- // setAspectRatioImage(type === 4 ? four : sixteen);
70
- // setAspectRationOpen(false);
71
- // setOpenHeader(true);
72
- // };
73
-
74
59
  // 广角切换
75
60
  const fishEyeChange = type => {
76
61
  onFishEyeOpen(type);
@@ -124,6 +109,23 @@ const SetUp = ({
124
109
  }, /*#__PURE__*/React.createElement(Image, {
125
110
  source: volumeImage,
126
111
  style: styles.toolImg
112
+ }))), /*#__PURE__*/React.createElement(View, {
113
+ style: styles.tool
114
+ }, /*#__PURE__*/React.createElement(TouchableOpacity, {
115
+ style: styles.toolImg,
116
+ onPress: () => {
117
+ if (screen) {
118
+ setScreenImage(enlarge);
119
+ } else {
120
+ setScreenImage(narrow);
121
+ }
122
+ onScreenChange(screen ? 'contain' : 'cover');
123
+ onAspectRationChange(screen ? 4 : 16);
124
+ screen = !screen;
125
+ }
126
+ }, /*#__PURE__*/React.createElement(Image, {
127
+ source: screenImage,
128
+ style: styles.toolImg
127
129
  }))), isMultiCam && /*#__PURE__*/React.createElement(View, {
128
130
  style: styles.tool
129
131
  }, /*#__PURE__*/React.createElement(TouchableOpacity, {
@@ -138,14 +140,10 @@ const SetUp = ({
138
140
  })), fishEyeOpen && /*#__PURE__*/React.createElement(View, {
139
141
  style: styles.toolSetting
140
142
  }, /*#__PURE__*/React.createElement(Text, {
141
- onPress: () => {
142
- fishEyeChange('default');
143
- },
143
+ onPress: () => fishEyeChange('default'),
144
144
  style: styles.toolText
145
145
  }, "\u9ED8\u8BA4"), /*#__PURE__*/React.createElement(Text, {
146
- onPress: () => {
147
- fishEyeChange('fishEye');
148
- },
146
+ onPress: () => fishEyeChange('fishEye'),
149
147
  style: styles.toolText
150
148
  }, "\u5E7F\u89D2")))));
151
149
  };
@@ -1 +1 @@
1
- {"version":3,"names":["Image","StyleSheet","Text","TouchableOpacity","View","React","useState","CONTROL_BUTTON_SIZE","useSafeAreaInsets","FlashOn","require","FlashOff","FlashAuto","volumeOff","volumeOn","defaultEyeImage","defaultFishEyeImage","volume","SetUp","isMultiCam","onChange","onVolumeChange","onFishEyeOpen","flashImage","setFlashImage","volumeImage","setVolumeImage","flashOpen","setFlashOpen","fishEyeOpen","setFishEyeOpen","fishEyeImage","setFishEyeImage","openHeader","setOpenHeader","insets","falshChange","type","fishEyeChange","createElement","Fragment","style","styles","top","header","tools","tool","toolImg","onPress","val","source","toolSetting","toolText","create","text","color","absoluteFillObject","marginHorizontal","bottom","undefined","zIndex","display","alignItems","width","flexDirection","height","marginBottom","marginLeft","fontWeight","headerLeft"],"sourceRoot":"../../../../src","sources":["camera/setup/SetUp.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,KAAK,EAAEC,UAAU,EAAEC,IAAI,EAAEC,gBAAgB,EAAEC,IAAI,QAAQ,cAAc;AAC9E,OAAOC,KAAK,IAAIC,QAAQ,QAAQ,OAAO;AACvC,SAASC,mBAAmB,QAAQ,aAAa;AAEjD,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,MAAMC,OAAO,GAAGC,OAAO,CAAC,2BAA2B,CAAC;AACpD,MAAMC,QAAQ,GAAGD,OAAO,CAAC,4BAA4B,CAAC;AACtD,MAAME,SAAS,GAAGF,OAAO,CAAC,6BAA6B,CAAC;AACxD,MAAMG,SAAS,GAAGH,OAAO,CAAC,kCAAkC,CAAC;AAC7D,MAAMI,QAAQ,GAAGJ,OAAO,CAAC,iCAAiC,CAAC;;AAE3D;AACA;;AAEA;AACA;AACA,MAAMK,eAAe,GAAGL,OAAO,CAAC,mCAAmC,CAAC;AACpE,MAAMM,mBAAmB,GAAGN,OAAO,CAAC,gCAAgC,CAAC;AAErE,IAAIO,MAAM,GAAG,KAAK;AAClB;;AAEA,MAAMC,KAOJ,GAAGA,CAAC;EACJC,UAAU;EACVC,QAAQ;EACR;EACA;EACAC,cAAc;EACdC;AACF,CAAC,KAAK;EACJ,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAGlB,QAAQ,CAACK,QAAQ,CAAC;EACtD;EACA,MAAM,CAACc,WAAW,EAAEC,cAAc,CAAC,GAAGpB,QAAQ,CAACO,SAAS,CAAC;EACzD,MAAM,CAACc,SAAS,EAAEC,YAAY,CAAC,GAAGtB,QAAQ,CAAC,KAAK,CAAC;EACjD;EACA;EACA,MAAM,CAACuB,WAAW,EAAEC,cAAc,CAAC,GAAGxB,QAAQ,CAAC,KAAK,CAAC;EACrD,MAAM,CAACyB,YAAY,EAAEC,eAAe,CAAC,GAAG1B,QAAQ,CAACS,eAAe,CAAC;EACjE,MAAM,CAACkB,UAAU,EAAEC,aAAa,CAAC,GAAG5B,QAAQ,CAAC,IAAI,CAAC;EAClD,MAAM6B,MAAM,GAAG3B,iBAAiB,CAAC,CAAC;;EAElC;EACA,MAAM4B,WAAW,GAAIC,IAAe,IAAK;IACvC,QAAQA,IAAI;MACV,KAAK,IAAI;QACPb,aAAa,CAACf,OAAO,CAAC;QACtB;MACF,KAAK,MAAM;QACTe,aAAa,CAACZ,SAAS,CAAC;QACxB;MACF;QACEY,aAAa,CAACb,QAAQ,CAAC;QACvB;IACJ;IACAS,QAAQ,CAACiB,IAAI,CAAC;IACdT,YAAY,CAAC,KAAK,CAAC;IACnBM,aAAa,CAAC,IAAI,CAAC;EACrB,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA;EACA,MAAMI,aAAa,GAAID,IAA2B,IAAK;IACrDf,aAAa,CAACe,IAAI,CAAC;IACnBL,eAAe,CAACK,IAAI,KAAK,SAAS,GAAGtB,eAAe,GAAGC,mBAAmB,CAAC;IAC3Ec,cAAc,CAAC,KAAK,CAAC;IACrBI,aAAa,CAAC,IAAI,CAAC;EACrB,CAAC;EAED,oBACE7B,KAAA,CAAAkC,aAAA,CAAAlC,KAAA,CAAAmC,QAAA,QACGP,UAAU,iBACT5B,KAAA,CAAAkC,aAAA,CAACnC,IAAI;IAACqC,KAAK,EAAE,CAACC,MAAM,CAACC,GAAG,EAAED,MAAM,CAACE,MAAM,EAAE;MAAED,GAAG,EAAER,MAAM,CAACQ,GAAG,GAAG;IAAG,CAAC;EAAE,CAE7D,CACP,eACDtC,KAAA,CAAAkC,aAAA,CAACnC,IAAI;IAACqC,KAAK,EAAE,CAACC,MAAM,CAACC,GAAG,EAAED,MAAM,CAACG,KAAK,EAAE;MAAEF,GAAG,EAAER,MAAM,CAACQ,GAAG,GAAG;IAAG,CAAC;EAAE,gBAChEtC,KAAA,CAAAkC,aAAA,CAACnC,IAAI;IAACqC,KAAK,EAAEC,MAAM,CAACI;EAAK,gBACvBzC,KAAA,CAAAkC,aAAA,CAACpC,gBAAgB;IACfsC,KAAK,EAAEC,MAAM,CAACK,OAAQ;IACtBC,OAAO,EAAEA,CAAA,KAAM;MACbd,aAAa,CAAC,KAAK,CAAC;MACpBN,YAAY,CAAEqB,GAAG,IAAK,CAACA,GAAG,CAAC;IAC7B;EAAE,gBAEF5C,KAAA,CAAAkC,aAAA,CAACvC,KAAK;IAACkD,MAAM,EAAE3B,UAAW;IAACkB,KAAK,EAAEC,MAAM,CAACK;EAAQ,CAAE,CACnC,CAAC,EAClBpB,SAAS,iBACRtB,KAAA,CAAAkC,aAAA,CAACnC,IAAI;IAACqC,KAAK,EAAEC,MAAM,CAACS;EAAY,gBAC9B9C,KAAA,CAAAkC,aAAA,CAACrC,IAAI;IAAC8C,OAAO,EAAEA,CAAA,KAAMZ,WAAW,CAAC,MAAM,CAAE;IAACK,KAAK,EAAEC,MAAM,CAACU;EAAS,GAAC,cAE5D,CAAC,eACP/C,KAAA,CAAAkC,aAAA,CAACrC,IAAI;IAAC8C,OAAO,EAAEA,CAAA,KAAMZ,WAAW,CAAC,IAAI,CAAE;IAACK,KAAK,EAAEC,MAAM,CAACU;EAAS,GAAC,cAE1D,CAAC,eACP/C,KAAA,CAAAkC,aAAA,CAACrC,IAAI;IAAC8C,OAAO,EAAEA,CAAA,KAAMZ,WAAW,CAAC,KAAK,CAAE;IAACK,KAAK,EAAEC,MAAM,CAACU;EAAS,GAAC,cAE3D,CACF,CAEJ,CAAC,eAEP/C,KAAA,CAAAkC,aAAA,CAACnC,IAAI;IAACqC,KAAK,EAAEC,MAAM,CAACI;EAAK,gBACvBzC,KAAA,CAAAkC,aAAA,CAACpC,gBAAgB;IACfsC,KAAK,EAAEC,MAAM,CAACK,OAAQ;IACtBC,OAAO,EAAEA,CAAA,KAAM;MACb,IAAI/B,MAAM,EAAE;QACVS,cAAc,CAACb,SAAS,CAAC;MAC3B,CAAC,MAAM;QACLa,cAAc,CAACZ,QAAQ,CAAC;MAC1B;MACAG,MAAM,GAAG,CAACA,MAAM;MAChBI,cAAc,CAACJ,MAAM,CAAC;IACxB;EAAE,gBAEFZ,KAAA,CAAAkC,aAAA,CAACvC,KAAK;IAACkD,MAAM,EAAEzB,WAAY;IAACgB,KAAK,EAAEC,MAAM,CAACK;EAAQ,CAAE,CACpC,CACd,CAAC,EA+CN5B,UAAU,iBACTd,KAAA,CAAAkC,aAAA,CAACnC,IAAI;IAACqC,KAAK,EAAEC,MAAM,CAACI;EAAK,gBACvBzC,KAAA,CAAAkC,aAAA,CAACpC,gBAAgB;IACfsC,KAAK,EAAEC,MAAM,CAACK,OAAQ;IACtBC,OAAO,EAAEA,CAAA,KAAM;MACbd,aAAa,CAAC,KAAK,CAAC;MACpBJ,cAAc,CAAEmB,GAAG,IAAK,CAACA,GAAG,CAAC;IAC/B;EAAE,gBAEF5C,KAAA,CAAAkC,aAAA,CAACvC,KAAK;IAACkD,MAAM,EAAEnB,YAAa;IAACU,KAAK,EAAEC,MAAM,CAACK;EAAQ,CAAE,CACrC,CAAC,EAClBlB,WAAW,iBACVxB,KAAA,CAAAkC,aAAA,CAACnC,IAAI;IAACqC,KAAK,EAAEC,MAAM,CAACS;EAAY,gBAC9B9C,KAAA,CAAAkC,aAAA,CAACrC,IAAI;IACH8C,OAAO,EAAEA,CAAA,KAAM;MACbV,aAAa,CAAC,SAAS,CAAC;IAC1B,CAAE;IACFG,KAAK,EAAEC,MAAM,CAACU;EAAS,GACxB,cAEK,CAAC,eACP/C,KAAA,CAAAkC,aAAA,CAACrC,IAAI;IACH8C,OAAO,EAAEA,CAAA,KAAM;MACbV,aAAa,CAAC,SAAS,CAAC;IAC1B,CAAE;IACFG,KAAK,EAAEC,MAAM,CAACU;EAAS,GACxB,cAEK,CACF,CAEJ,CAEJ,CACN,CAAC;AAEP,CAAC;AAED,eAAelC,KAAK;AAEpB,MAAMwB,MAAM,GAAGzC,UAAU,CAACoD,MAAM,CAAC;EAC/BC,IAAI,EAAE;IAAEC,KAAK,EAAE;EAAO,CAAC;EACvBZ,GAAG,EAAE;IACH,GAAG1C,UAAU,CAACuD,kBAAkB;IAChCC,gBAAgB,EAAE,EAAE;IACpBC,MAAM,EAAEC,SAAS;IACjBC,MAAM,EAAE;EACV,CAAC;EACDhB,MAAM,EAAE;IACNiB,OAAO,EAAE,MAAM;IACfC,UAAU,EAAE;EACd,CAAC;EACDjB,KAAK,EAAE;IACLgB,OAAO,EAAE,MAAM;IACfE,KAAK,EAAE;EACT,CAAC;EACDjB,IAAI,EAAE;IACJe,OAAO,EAAE,MAAM;IACfG,aAAa,EAAE,KAAK;IACpBD,KAAK,EAAE,MAAM;IACbE,MAAM,EAAE1D,mBAAmB,GAAG,CAAC;IAC/BuD,UAAU,EAAE,QAAQ;IACpBI,YAAY,EAAE;EAChB,CAAC;EACDnB,OAAO,EAAE;IACPgB,KAAK,EAAExD,mBAAmB,GAAG,CAAC;IAC9B0D,MAAM,EAAE;EACV,CAAC;EACDd,WAAW,EAAE;IACXU,OAAO,EAAE,MAAM;IACfG,aAAa,EAAE;EACjB,CAAC;EACDZ,QAAQ,EAAE;IACRe,UAAU,EAAE,CAAC;IACbC,UAAU,EAAE,KAAK;IACjBb,KAAK,EAAE;EACT,CAAC;EACDc,UAAU,EAAE;IACVR,OAAO,EAAE,MAAM;IACfG,aAAa,EAAE;EACjB;AACF,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["Image","StyleSheet","Text","TouchableOpacity","View","React","useState","CONTROL_BUTTON_SIZE","useSafeAreaInsets","FlashOn","require","FlashOff","FlashAuto","volumeOff","volumeOn","enlarge","narrow","defaultEyeImage","defaultFishEyeImage","volume","screen","SetUp","isMultiCam","onChange","onAspectRationChange","onScreenChange","onVolumeChange","onFishEyeOpen","flashImage","setFlashImage","volumeImage","setVolumeImage","flashOpen","setFlashOpen","screenImage","setScreenImage","fishEyeOpen","setFishEyeOpen","fishEyeImage","setFishEyeImage","openHeader","setOpenHeader","insets","falshChange","type","fishEyeChange","createElement","Fragment","style","styles","top","header","tools","tool","toolImg","onPress","val","source","toolSetting","toolText","create","text","color","absoluteFillObject","marginHorizontal","bottom","undefined","zIndex","display","alignItems","width","flexDirection","height","marginBottom","marginLeft","fontWeight","headerLeft"],"sourceRoot":"../../../../src","sources":["camera/setup/SetUp.tsx"],"mappings":"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","ignoreList":[]}
@@ -2,7 +2,7 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-25 16:56:42
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2025-01-17 11:22:40
5
+ * @LastEditTime: 2024-12-30 13:07:33
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
@@ -13,6 +13,7 @@ import WaterMarkRender from './Render';
13
13
  import { formatUri, MAX_ZINDEX, pxToDpWidth } from '../../utils';
14
14
  const ViewShotWatermark = ({
15
15
  data,
16
+ resizeMode,
16
17
  watermark,
17
18
  onChange
18
19
  }) => {
@@ -36,7 +37,7 @@ const ViewShotWatermark = ({
36
37
  uri: formatUri(data.path)
37
38
  },
38
39
  style: styles.container,
39
- resizeMode: "center",
40
+ resizeMode: resizeMode,
40
41
  onLoadEnd: () => {
41
42
  setTimeout(() => {
42
43
  autoSaveWatermark();
@@ -60,7 +61,7 @@ export const styles = StyleSheet.create({
60
61
  right: 0,
61
62
  top: 0,
62
63
  bottom: 0,
63
- backgroundColor: '#fff',
64
+ backgroundColor: '#000',
64
65
  zIndex: MAX_ZINDEX
65
66
  },
66
67
  footer: {
@@ -1 +1 @@
1
- {"version":3,"names":["Image","StyleSheet","Text","View","React","useRef","ViewShot","WaterMarkRender","formatUri","MAX_ZINDEX","pxToDpWidth","ViewShotWatermark","data","watermark","onChange","viewShotRef","autoSaveWatermark","_viewShotRef$current","_viewShotRef$current$","img","current","capture","call","path","createElement","Fragment","ref","style","styles","container","source","uri","resizeMode","onLoadEnd","setTimeout","zIndex","footer","text","create","flex","position","left","right","top","bottom","backgroundColor","color","textAlign","fontSize"],"sourceRoot":"../../../../src","sources":["camera/watermark/ViewShotWatermark.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,KAAK,EAAEC,UAAU,EAAEC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AAC5D,OAAOC,KAAK,IAAIC,MAAM,QAAQ,OAAO;AACrC,OAAOC,QAAQ,MAAM,wBAAwB;AAC7C,OAAOC,eAAe,MAAM,UAAU;AACtC,SACEC,SAAS,EACTC,UAAU,EACVC,WAAW,QAGN,aAAa;AAEpB,MAAMC,iBAIJ,GAAGA,CAAC;EAAEC,IAAI;EAAEC,SAAS;EAAEC;AAAS,CAAC,KAAK;EACtC,MAAMC,WAAW,GAAGV,MAAM,CAAW,IAAI,CAAC;EAC1C,IAAI,CAACO,IAAI,IAAI,CAACC,SAAS,EAAE;IACvB,OAAO,IAAI;EACb;EAEA,MAAMG,iBAAiB,GAAG,MAAAA,CAAA,KAAY;IAAA,IAAAC,oBAAA,EAAAC,qBAAA;IACpC,MAAMC,GAAG,GAAG,QAAAF,oBAAA,GAAMF,WAAW,CAACK,OAAO,cAAAH,oBAAA,gBAAAC,qBAAA,GAAnBD,oBAAA,CAAqBI,OAAO,cAAAH,qBAAA,uBAA5BA,qBAAA,CAAAI,IAAA,CAAAL,oBAA+B,CAAC;IAClDH,QAAQ,CAAC;MAAE,GAAGF,IAAI;MAAEW,IAAI,EAAEJ,GAAG,IAAIP,IAAI,CAACW;IAAK,CAAC,CAAC;EAC/C,CAAC;EACD,oBACEnB,KAAA,CAAAoB,aAAA,CAAApB,KAAA,CAAAqB,QAAA,qBACErB,KAAA,CAAAoB,aAAA,CAAClB,QAAQ;IAACoB,GAAG,EAAEX,WAAY;IAACY,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAClDzB,KAAA,CAAAoB,aAAA,CAACxB,KAAK;IACJ8B,MAAM,EAAE;MAAEC,GAAG,EAAEvB,SAAS,CAACI,IAAI,CAACW,IAAI;IAAE,CAAE;IACtCI,KAAK,EAAEC,MAAM,CAACC,SAAU;IACxBG,UAAU,EAAC,QAAQ;IACnBC,SAAS,EAAEA,CAAA,KAAM;MACfC,UAAU,CAAC,MAAM;QACflB,iBAAiB,CAAC,CAAC;MACrB,CAAC,EAAE,GAAG,CAAC;IACT;EAAE,CACH,CAAC,eACFZ,KAAA,CAAAoB,aAAA,CAACjB,eAAe;IAACK,IAAI,EAAEC,SAAU;IAACsB,MAAM,EAAE1B,UAAU,GAAG;EAAE,CAAE,CACnD,CAAC,eACXL,KAAA,CAAAoB,aAAA,CAACrB,IAAI;IAACwB,KAAK,EAAEC,MAAM,CAACQ;EAAO,gBACzBhC,KAAA,CAAAoB,aAAA,CAACtB,IAAI;IAACyB,KAAK,EAAEC,MAAM,CAACS;EAAK,GAAC,uBAAY,CAClC,CACN,CAAC;AAEP,CAAC;AAED,eAAe1B,iBAAiB;AAEhC,OAAO,MAAMiB,MAAM,GAAG3B,UAAU,CAACqC,MAAM,CAAC;EACtCT,SAAS,EAAE;IACTU,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRC,GAAG,EAAE,CAAC;IACNC,MAAM,EAAE,CAAC;IACTC,eAAe,EAAE,MAAM;IACvBV,MAAM,EAAE1B;EACV,CAAC;EACD2B,MAAM,EAAE;IACNI,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRE,MAAM,EAAE,EAAE;IACVT,MAAM,EAAE1B,UAAU,GAAG;EACvB,CAAC;EACD4B,IAAI,EAAE;IACJS,KAAK,EAAE,MAAM;IACbC,SAAS,EAAE,QAAQ;IACnBC,QAAQ,EAAEtC,WAAW,CAAC,EAAE;EAC1B;AACF,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["Image","StyleSheet","Text","View","React","useRef","ViewShot","WaterMarkRender","formatUri","MAX_ZINDEX","pxToDpWidth","ViewShotWatermark","data","resizeMode","watermark","onChange","viewShotRef","autoSaveWatermark","_viewShotRef$current","_viewShotRef$current$","img","current","capture","call","path","createElement","Fragment","ref","style","styles","container","source","uri","onLoadEnd","setTimeout","zIndex","footer","text","create","flex","position","left","right","top","bottom","backgroundColor","color","textAlign","fontSize"],"sourceRoot":"../../../../src","sources":["camera/watermark/ViewShotWatermark.tsx"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SACEA,KAAK,EACLC,UAAU,EACVC,IAAI,EACJC,IAAI,QAEC,cAAc;AACrB,OAAOC,KAAK,IAAIC,MAAM,QAAQ,OAAO;AACrC,OAAOC,QAAQ,MAAM,wBAAwB;AAC7C,OAAOC,eAAe,MAAM,UAAU;AACtC,SACEC,SAAS,EACTC,UAAU,EACVC,WAAW,QAGN,aAAa;AAEpB,MAAMC,iBAKJ,GAAGA,CAAC;EAAEC,IAAI;EAAEC,UAAU;EAAEC,SAAS;EAAEC;AAAS,CAAC,KAAK;EAClD,MAAMC,WAAW,GAAGX,MAAM,CAAW,IAAI,CAAC;EAC1C,IAAI,CAACO,IAAI,IAAI,CAACE,SAAS,EAAE;IACvB,OAAO,IAAI;EACb;EAEA,MAAMG,iBAAiB,GAAG,MAAAA,CAAA,KAAY;IAAA,IAAAC,oBAAA,EAAAC,qBAAA;IACpC,MAAMC,GAAG,GAAG,QAAAF,oBAAA,GAAMF,WAAW,CAACK,OAAO,cAAAH,oBAAA,gBAAAC,qBAAA,GAAnBD,oBAAA,CAAqBI,OAAO,cAAAH,qBAAA,uBAA5BA,qBAAA,CAAAI,IAAA,CAAAL,oBAA+B,CAAC;IAClDH,QAAQ,CAAC;MAAE,GAAGH,IAAI;MAAEY,IAAI,EAAEJ,GAAG,IAAIR,IAAI,CAACY;IAAK,CAAC,CAAC;EAC/C,CAAC;EACD,oBACEpB,KAAA,CAAAqB,aAAA,CAAArB,KAAA,CAAAsB,QAAA,qBACEtB,KAAA,CAAAqB,aAAA,CAACnB,QAAQ;IAACqB,GAAG,EAAEX,WAAY;IAACY,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAClD1B,KAAA,CAAAqB,aAAA,CAACzB,KAAK;IACJ+B,MAAM,EAAE;MAAEC,GAAG,EAAExB,SAAS,CAACI,IAAI,CAACY,IAAI;IAAE,CAAE;IACtCI,KAAK,EAAEC,MAAM,CAACC,SAAU;IACxBjB,UAAU,EAAEA,UAAW;IACvBoB,SAAS,EAAEA,CAAA,KAAM;MACfC,UAAU,CAAC,MAAM;QACfjB,iBAAiB,CAAC,CAAC;MACrB,CAAC,EAAE,GAAG,CAAC;IACT;EAAE,CACH,CAAC,eACFb,KAAA,CAAAqB,aAAA,CAAClB,eAAe;IAACK,IAAI,EAAEE,SAAU;IAACqB,MAAM,EAAE1B,UAAU,GAAG;EAAE,CAAE,CACnD,CAAC,eACXL,KAAA,CAAAqB,aAAA,CAACtB,IAAI;IAACyB,KAAK,EAAEC,MAAM,CAACO;EAAO,gBACzBhC,KAAA,CAAAqB,aAAA,CAACvB,IAAI;IAAC0B,KAAK,EAAEC,MAAM,CAACQ;EAAK,GAAC,uBAAY,CAClC,CACN,CAAC;AAEP,CAAC;AAED,eAAe1B,iBAAiB;AAEhC,OAAO,MAAMkB,MAAM,GAAG5B,UAAU,CAACqC,MAAM,CAAC;EACtCR,SAAS,EAAE;IACTS,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRC,GAAG,EAAE,CAAC;IACNC,MAAM,EAAE,CAAC;IACTC,eAAe,EAAE,MAAM;IACvBV,MAAM,EAAE1B;EACV,CAAC;EACD2B,MAAM,EAAE;IACNI,QAAQ,EAAE,UAAU;IACpBC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRE,MAAM,EAAE,EAAE;IACVT,MAAM,EAAE1B,UAAU,GAAG;EACvB,CAAC;EACD4B,IAAI,EAAE;IACJS,KAAK,EAAE,MAAM;IACbC,SAAS,EAAE,QAAQ;IACnBC,QAAQ,EAAEtC,WAAW,CAAC,EAAE;EAC1B;AACF,CAAC,CAAC","ignoreList":[]}
@@ -2,7 +2,7 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-25 13:51:40
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2024-12-25 13:53:40
5
+ * @LastEditTime: 2025-01-21 11:04:47
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
@@ -11,9 +11,15 @@ import { pxToDpWidth } from './px-to-dp';
11
11
  export const lastPx = v => pxToDpWidth(v) / (Platform.OS === 'ios' ? PixelRatio.get() : 1);
12
12
  export const getMeasure = async (ctx, content) => {
13
13
  const metrics = await ctx.measureText(content);
14
+ let height = 0;
15
+ if (metrics !== null && metrics !== void 0 && metrics.fontBoundingBoxAscent && metrics !== null && metrics !== void 0 && metrics.fontBoundingBoxDescent) {
16
+ height = metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent;
17
+ } else if (metrics !== null && metrics !== void 0 && metrics.actualBoundingBoxAscent && metrics !== null && metrics !== void 0 && metrics.actualBoundingBoxDescent) {
18
+ height = (metrics === null || metrics === void 0 ? void 0 : metrics.actualBoundingBoxAscent) + (metrics === null || metrics === void 0 ? void 0 : metrics.actualBoundingBoxDescent);
19
+ }
14
20
  return {
15
21
  width: metrics.width,
16
- height: metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent
22
+ height
17
23
  };
18
24
  };
19
25
  export const getContentMeasure = async (ctx, content) => {
@@ -1 +1 @@
1
- {"version":3,"names":["PixelRatio","Platform","pxToDpWidth","lastPx","v","OS","get","getMeasure","ctx","content","metrics","measureText","width","height","fontBoundingBoxAscent","fontBoundingBoxDescent","getContentMeasure","sizes","index","length","element","push","defaultWidth","Math","ceil","max","map","size","defaultHeight"],"sourceRoot":"../../../src","sources":["utils/watermark.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,UAAU,EAAEC,QAAQ,QAAQ,cAAc;AACnD,SAASC,WAAW,QAAQ,YAAY;AAGxC,OAAO,MAAMC,MAAM,GAAIC,CAAS,IAC9BF,WAAW,CAACE,CAAC,CAAC,IAAIH,QAAQ,CAACI,EAAE,KAAK,KAAK,GAAGL,UAAU,CAACM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAEjE,OAAO,MAAMC,UAAU,GAAG,MAAAA,CACxBC,GAA6B,EAC7BC,OAAe,KACZ;EACH,MAAMC,OAAO,GAAG,MAAMF,GAAG,CAACG,WAAW,CAACF,OAAO,CAAC;EAC9C,OAAO;IACLG,KAAK,EAAEF,OAAO,CAACE,KAAK;IACpBC,MAAM,EAAEH,OAAO,CAACI,qBAAqB,GAAGJ,OAAO,CAACK;EAClD,CAAC;AACH,CAAC;AAED,OAAO,MAAMC,iBAAiB,GAAG,MAAAA,CAC/BR,GAA6B,EAC7BC,OAAiB,KACd;EACH,IAAIQ,KAAiB,GAAG,EAAE;EAE1B,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGT,OAAO,CAACU,MAAM,EAAED,KAAK,EAAE,EAAE;IACnD,MAAME,OAAO,GAAGX,OAAO,CAACS,KAAK,CAAC;IAC9B,MAAMR,OAAO,GAAG,MAAMH,UAAU,CAACC,GAAG,EAAEY,OAAiB,CAAC;IACxDH,KAAK,CAACI,IAAI,CAAC,CAACX,OAAO,CAACE,KAAK,EAAEF,OAAO,CAACG,MAAM,CAAC,CAAC;EAC7C;EACA,MAAMS,YAAY,GAAGC,IAAI,CAACC,IAAI,CAC5BD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CACpD,CAAC;EACD,MAAMC,aAAa,GACjBL,IAAI,CAACC,IAAI,CAACD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CAAC,CAAC,GAC9DlB,OAAO,CAACU,MAAM;EAChB,OAAO;IAAEP,KAAK,EAAEU,YAAY;IAAET,MAAM,EAAEe;EAAc,CAAC;AACvD,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["PixelRatio","Platform","pxToDpWidth","lastPx","v","OS","get","getMeasure","ctx","content","metrics","measureText","height","fontBoundingBoxAscent","fontBoundingBoxDescent","actualBoundingBoxAscent","actualBoundingBoxDescent","width","getContentMeasure","sizes","index","length","element","push","defaultWidth","Math","ceil","max","map","size","defaultHeight"],"sourceRoot":"../../../src","sources":["utils/watermark.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,UAAU,EAAEC,QAAQ,QAAQ,cAAc;AACnD,SAASC,WAAW,QAAQ,YAAY;AAGxC,OAAO,MAAMC,MAAM,GAAIC,CAAS,IAC9BF,WAAW,CAACE,CAAC,CAAC,IAAIH,QAAQ,CAACI,EAAE,KAAK,KAAK,GAAGL,UAAU,CAACM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;AAEjE,OAAO,MAAMC,UAAU,GAAG,MAAAA,CACxBC,GAA6B,EAC7BC,OAAe,KACZ;EACH,MAAMC,OAAO,GAAG,MAAMF,GAAG,CAACG,WAAW,CAACF,OAAO,CAAC;EAC9C,IAAIG,MAAM,GAAG,CAAC;EACd,IAAIF,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEG,qBAAqB,IAAIH,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEI,sBAAsB,EAAE;IACrEF,MAAM,GAAGF,OAAO,CAACG,qBAAqB,GAAGH,OAAO,CAACI,sBAAsB;EACzE,CAAC,MAAM,IACLJ,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEK,uBAAuB,IAChCL,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEM,wBAAwB,EACjC;IACAJ,MAAM,GACJ,CAAAF,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEK,uBAAuB,KAAGL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,wBAAwB;EACxE;EACA,OAAO;IACLC,KAAK,EAAEP,OAAO,CAACO,KAAK;IACpBL;EACF,CAAC;AACH,CAAC;AAED,OAAO,MAAMM,iBAAiB,GAAG,MAAAA,CAC/BV,GAA6B,EAC7BC,OAAiB,KACd;EACH,IAAIU,KAAiB,GAAG,EAAE;EAE1B,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGX,OAAO,CAACY,MAAM,EAAED,KAAK,EAAE,EAAE;IACnD,MAAME,OAAO,GAAGb,OAAO,CAACW,KAAK,CAAC;IAC9B,MAAMV,OAAO,GAAG,MAAMH,UAAU,CAACC,GAAG,EAAEc,OAAiB,CAAC;IACxDH,KAAK,CAACI,IAAI,CAAC,CAACb,OAAO,CAACO,KAAK,EAAEP,OAAO,CAACE,MAAM,CAAC,CAAC;EAC7C;EACA,MAAMY,YAAY,GAAGC,IAAI,CAACC,IAAI,CAC5BD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CACpD,CAAC;EACD,MAAMC,aAAa,GACjBL,IAAI,CAACC,IAAI,CAACD,IAAI,CAACE,GAAG,CAAC,GAAGR,KAAK,CAACS,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAAC,CAAC,CAAW,CAAC,CAAC,CAAC,GAC9DpB,OAAO,CAACY,MAAM;EAChB,OAAO;IAAEJ,KAAK,EAAEO,YAAY;IAAEZ,MAAM,EAAEkB;EAAc,CAAC;AACvD,CAAC","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"Camera.d.ts","sourceRoot":"","sources":["../../../../src/camera/Camera.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAS3D,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,WAAW,EAIjB,MAAM,UAAU,CAAC;AAQlB,eAAO,MAAM,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAGrD,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACtC,CAkOA,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"Camera.d.ts","sourceRoot":"","sources":["../../../../src/camera/Camera.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAS3D,OAAO,EACL,KAAK,UAAU,EAEf,KAAK,WAAW,EAIjB,MAAM,UAAU,CAAC;AAQlB,eAAO,MAAM,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAGrD,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CACtC,CAqOA,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -1,7 +1,9 @@
1
+ import { type ImageResizeMode } from 'react-native';
1
2
  import React from 'react';
2
3
  import { type CustomPhotoFile } from '../../utils';
3
4
  export interface SingleProps extends CommonProps {
4
5
  uri: string;
6
+ resizeMode?: ImageResizeMode | undefined;
5
7
  }
6
8
  export interface CommonProps {
7
9
  onBack?: () => void;
@@ -13,7 +15,6 @@ export default SinglePre;
13
15
  export declare const styles: {
14
16
  container: {
15
17
  flex: number;
16
- backgroundColor: string;
17
18
  };
18
19
  footer: {
19
20
  position: "absolute";
@@ -1 +1 @@
1
- {"version":3,"file":"SinglePre.d.ts","sourceRoot":"","sources":["../../../../../src/camera/preview/SinglePre.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9D,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,GAAG,EAAE,MAAM,CAAC;CACb;AACD,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAClE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AACD,QAAA,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAyBpC,CAAC;AAEF,eAAe,SAAS,CAAC;AAEzB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;CASjB,CAAC"}
1
+ {"version":3,"file":"SinglePre.d.ts","sourceRoot":"","sources":["../../../../../src/camera/preview/SinglePre.tsx"],"names":[],"mappings":"AAQA,OAAO,EAA2B,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9D,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;CAC1C;AACD,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAClE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AACD,QAAA,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAmCpC,CAAC;AAEF,eAAe,SAAS,CAAC;AAEzB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;CAYjB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"SetUp.d.ts","sourceRoot":"","sources":["../../../../../src/camera/setup/SetUp.tsx"],"names":[],"mappings":"AASA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAoB7C,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;IACnC,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,KAAK,IAAI,CAAC;IAC/D,aAAa,EAAE,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,KAAK,IAAI,CAAC;CACrD,CAwLA,CAAC;AAEF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"SetUp.d.ts","sourceRoot":"","sources":["../../../../../src/camera/setup/SetUp.tsx"],"names":[],"mappings":"AASA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAiB7C,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;IACnC,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,KAAK,IAAI,CAAC;IAC/D,aAAa,EAAE,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,KAAK,IAAI,CAAC;CACrD,CA+IA,CAAC;AAEF,eAAe,KAAK,CAAC"}
@@ -1,7 +1,9 @@
1
+ import { type ImageResizeMode } from 'react-native';
1
2
  import React from 'react';
2
3
  import { type CustomPhotoFile, type WatermarkType } from '../../utils';
3
4
  declare const ViewShotWatermark: React.FC<{
4
5
  data?: CustomPhotoFile;
6
+ resizeMode?: ImageResizeMode;
5
7
  watermark?: WatermarkType;
6
8
  onChange: (photo: CustomPhotoFile) => void;
7
9
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"ViewShotWatermark.d.ts","sourceRoot":"","sources":["../../../../../src/camera/watermark/ViewShotWatermark.tsx"],"names":[],"mappings":"AASA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAGtC,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAErB,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IAChC,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;CAC5C,CA8BA,CAAC;AAEF,eAAe,iBAAiB,CAAC;AAEjC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;CAuBjB,CAAC"}
1
+ {"version":3,"file":"ViewShotWatermark.d.ts","sourceRoot":"","sources":["../../../../../src/camera/watermark/ViewShotWatermark.tsx"],"names":[],"mappings":"AAQA,OAAO,EAKL,KAAK,eAAe,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAiB,MAAM,OAAO,CAAC;AAGtC,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AAErB,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IAChC,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;CAC5C,CA8BA,CAAC;AAEF,eAAe,iBAAiB,CAAC;AAEjC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;CAuBjB,CAAC"}
@@ -2,7 +2,7 @@ import type { CanvasRenderingContext2D } from 'react-native-canvas';
2
2
  export declare const lastPx: (v: number) => number;
3
3
  export declare const getMeasure: (ctx: CanvasRenderingContext2D, content: string) => Promise<{
4
4
  width: any;
5
- height: any;
5
+ height: number;
6
6
  }>;
7
7
  export declare const getContentMeasure: (ctx: CanvasRenderingContext2D, content: string[]) => Promise<{
8
8
  width: number;
@@ -1 +1 @@
1
- {"version":3,"file":"watermark.d.ts","sourceRoot":"","sources":["../../../../src/utils/watermark.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAEpE,eAAO,MAAM,MAAM,MAAO,MAAM,WACiC,CAAC;AAElE,eAAO,MAAM,UAAU,QAChB,wBAAwB,WACpB,MAAM;;;EAOhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,QACvB,wBAAwB,WACpB,MAAM,EAAE;;;EAgBlB,CAAC"}
1
+ {"version":3,"file":"watermark.d.ts","sourceRoot":"","sources":["../../../../src/utils/watermark.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAEpE,eAAO,MAAM,MAAM,MAAO,MAAM,WACiC,CAAC;AAElE,eAAO,MAAM,UAAU,QAChB,wBAAwB,WACpB,MAAM;;;EAiBhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,QACvB,wBAAwB,WACpB,MAAM,EAAE;;;EAgBlB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unif/react-native-camera",
3
- "version": "1.1.6",
3
+ "version": "1.1.8",
4
4
  "description": "camera",
5
5
  "main": "lib/commonjs/index",
6
6
  "module": "lib/module/index",
@@ -2,7 +2,7 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-02 13:48:40
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2025-01-20 14:18:36
5
+ * @LastEditTime: 2025-01-17 08:44:43
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
@@ -141,14 +141,15 @@ const Camera: React.FC<{
141
141
  />
142
142
 
143
143
  <SetUp
144
- isMultiCam={device?.isMultiCam}
144
+ // isMultiCam={device?.isMultiCam}
145
+ isMultiCam={false}
145
146
  onChange={(val) => (flash = val)}
146
147
  onAspectRationChange={setAspectRatio}
147
148
  onScreenChange={setResizeMode}
148
149
  onVolumeChange={(val) => (enableShutterSound = val)}
149
150
  onFishEyeOpen={(val) => {
150
151
  if (val === 'fishEye') {
151
- setZoom(0.5);
152
+ setZoom(device.minZoom);
152
153
  }
153
154
  if (val === 'default') {
154
155
  setZoom(device.neutralZoom);
@@ -217,6 +218,7 @@ const Camera: React.FC<{
217
218
 
218
219
  {watermarkUriVis && (
219
220
  <ViewShotWatermark
221
+ resizeMode={resizeMode}
220
222
  data={photos.at(-1)}
221
223
  watermark={data.watermark}
222
224
  onChange={(value) => {
@@ -239,6 +241,7 @@ const Camera: React.FC<{
239
241
  <PreViewContainer visible={preVis}>
240
242
  {isSingle() ? (
241
243
  <SinglePre
244
+ resizeMode={resizeMode}
242
245
  uri={photos[0]?.path as string}
243
246
  onBack={() => signleBack()}
244
247
  onSave={() => confirm()}
@@ -6,7 +6,7 @@
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
9
- import { Image, StyleSheet, View } from 'react-native';
9
+ import { Image, StyleSheet, View, type ImageResizeMode } from 'react-native';
10
10
  import React from 'react';
11
11
  import PreviewFooter from './PreviewFooter';
12
12
  import { Back, Save } from '../../components';
@@ -15,17 +15,28 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
15
15
 
16
16
  export interface SingleProps extends CommonProps {
17
17
  uri: string;
18
+ resizeMode?: ImageResizeMode | undefined;
18
19
  }
19
20
  export interface CommonProps {
20
21
  onBack?: () => void;
21
22
  onDel?: (photo?: CustomPhotoFile) => Promise<boolean> | undefined;
22
23
  onSave?: () => void;
23
24
  }
24
- const SinglePre: React.FC<SingleProps> = ({ uri, onBack, onSave }) => {
25
+ const SinglePre: React.FC<SingleProps> = ({
26
+ uri,
27
+ resizeMode,
28
+ onBack,
29
+ onSave,
30
+ }) => {
25
31
  const inset = useSafeAreaInsets();
32
+ console.log('resizeMode', resizeMode);
26
33
  return (
27
34
  <View style={styles.container}>
28
- <Image style={styles.container} source={{ uri: formatUri(uri) }} />
35
+ <Image
36
+ style={styles.container}
37
+ resizeMode={resizeMode}
38
+ source={{ uri: formatUri(uri) }}
39
+ />
29
40
  <View style={[styles.footer, { bottom: inset.bottom + 16 }]}>
30
41
  <PreviewFooter
31
42
  actions={[
@@ -51,7 +62,10 @@ const SinglePre: React.FC<SingleProps> = ({ uri, onBack, onSave }) => {
51
62
  export default SinglePre;
52
63
 
53
64
  export const styles = StyleSheet.create({
54
- container: { flex: 1, backgroundColor: '#fff' },
65
+ container: {
66
+ flex: 1,
67
+ },
68
+
55
69
  footer: {
56
70
  position: 'absolute',
57
71
  left: 0,
@@ -2,7 +2,7 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-02 11:52:31
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2025-01-17 10:57:09
5
+ * @LastEditTime: 2025-01-21 11:10:20
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
@@ -18,16 +18,13 @@ const FlashAuto = require('../../assets/tools/auto.png');
18
18
  const volumeOff = require('../../assets/tools/volumeOff.png');
19
19
  const volumeOn = require('../../assets/tools/volumeOn.png');
20
20
 
21
- // const four = require('../../assets/tools/4_3.png');
22
- // const sixteen = require('../../assets/tools/16_9.png');
23
-
24
- // const enlarge = require('../../assets/tools/enlarge.png');
25
- // const narrow = require('../../assets/tools/narrow.png');
21
+ const enlarge = require('../../assets/tools/enlarge.png');
22
+ const narrow = require('../../assets/tools/narrow.png');
26
23
  const defaultEyeImage = require('../../assets/tools/defaultEye.png');
27
24
  const defaultFishEyeImage = require('../../assets/tools/fishEye.png');
28
25
 
29
26
  let volume = false;
30
- // let screen = true;
27
+ let screen = true;
31
28
 
32
29
  const SetUp: React.FC<{
33
30
  isMultiCam: boolean;
@@ -39,17 +36,15 @@ const SetUp: React.FC<{
39
36
  }> = ({
40
37
  isMultiCam,
41
38
  onChange,
42
- // onAspectRationChange,
43
- // onScreenChange,
39
+ onAspectRationChange,
40
+ onScreenChange,
44
41
  onVolumeChange,
45
42
  onFishEyeOpen,
46
43
  }) => {
47
44
  const [flashImage, setFlashImage] = useState(FlashOff);
48
- // const [aspectRatioImage, setAspectRatioImage] = useState(sixteen);
49
45
  const [volumeImage, setVolumeImage] = useState(volumeOff);
50
46
  const [flashOpen, setFlashOpen] = useState(false);
51
- // const [aspectRationOpen, setAspectRationOpen] = useState(false);
52
- // const [screenImage, setScreenImage] = useState(narrow);
47
+ const [screenImage, setScreenImage] = useState(narrow);
53
48
  const [fishEyeOpen, setFishEyeOpen] = useState(false);
54
49
  const [fishEyeImage, setFishEyeImage] = useState(defaultEyeImage);
55
50
  const [openHeader, setOpenHeader] = useState(true);
@@ -73,14 +68,6 @@ const SetUp: React.FC<{
73
68
  setOpenHeader(true);
74
69
  };
75
70
 
76
- // 宽高比切换
77
- // const aspectRatioChange = (type: number) => {
78
- // onAspectRationChange(type);
79
- // setAspectRatioImage(type === 4 ? four : sixteen);
80
- // setAspectRationOpen(false);
81
- // setOpenHeader(true);
82
- // };
83
-
84
71
  // 广角切换
85
72
  const fishEyeChange = (type: 'default' | 'fishEye') => {
86
73
  onFishEyeOpen(type);
@@ -139,34 +126,6 @@ const SetUp: React.FC<{
139
126
  </TouchableOpacity>
140
127
  </View>
141
128
 
142
- {/* <View style={styles.tool}>
143
- <TouchableOpacity
144
- style={styles.toolImg}
145
- onPress={() => {
146
- setOpenHeader(false);
147
- setAspectRationOpen((val) => !val);
148
- }}
149
- >
150
- <Image source={aspectRatioImage} style={styles.toolImg} />
151
- </TouchableOpacity>
152
- {aspectRationOpen && (
153
- <View style={styles.toolSetting}>
154
- <Text
155
- onPress={() => aspectRatioChange(4)}
156
- style={styles.toolText}
157
- >
158
- 4:3
159
- </Text>
160
- <Text
161
- onPress={() => aspectRatioChange(16)}
162
- style={styles.toolText}
163
- >
164
- 16:9
165
- </Text>
166
- </View>
167
- )}
168
- </View>
169
-
170
129
  <View style={styles.tool}>
171
130
  <TouchableOpacity
172
131
  style={styles.toolImg}
@@ -177,12 +136,13 @@ const SetUp: React.FC<{
177
136
  setScreenImage(narrow);
178
137
  }
179
138
  onScreenChange(screen ? 'contain' : 'cover');
139
+ onAspectRationChange(screen ? 4 : 16);
180
140
  screen = !screen;
181
141
  }}
182
142
  >
183
143
  <Image source={screenImage} style={styles.toolImg} />
184
144
  </TouchableOpacity>
185
- </View> */}
145
+ </View>
186
146
 
187
147
  {isMultiCam && (
188
148
  <View style={styles.tool}>
@@ -198,17 +158,13 @@ const SetUp: React.FC<{
198
158
  {fishEyeOpen && (
199
159
  <View style={styles.toolSetting}>
200
160
  <Text
201
- onPress={() => {
202
- fishEyeChange('default');
203
- }}
161
+ onPress={() => fishEyeChange('default')}
204
162
  style={styles.toolText}
205
163
  >
206
164
  默认
207
165
  </Text>
208
166
  <Text
209
- onPress={() => {
210
- fishEyeChange('fishEye');
211
- }}
167
+ onPress={() => fishEyeChange('fishEye')}
212
168
  style={styles.toolText}
213
169
  >
214
170
  广角
@@ -2,11 +2,17 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-25 16:56:42
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2025-01-17 11:22:40
5
+ * @LastEditTime: 2024-12-30 13:07:33
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
9
- import { Image, StyleSheet, Text, View } from 'react-native';
9
+ import {
10
+ Image,
11
+ StyleSheet,
12
+ Text,
13
+ View,
14
+ type ImageResizeMode,
15
+ } from 'react-native';
10
16
  import React, { useRef } from 'react';
11
17
  import ViewShot from 'react-native-view-shot';
12
18
  import WaterMarkRender from './Render';
@@ -20,9 +26,10 @@ import {
20
26
 
21
27
  const ViewShotWatermark: React.FC<{
22
28
  data?: CustomPhotoFile;
29
+ resizeMode?: ImageResizeMode;
23
30
  watermark?: WatermarkType;
24
31
  onChange: (photo: CustomPhotoFile) => void;
25
- }> = ({ data, watermark, onChange }) => {
32
+ }> = ({ data, resizeMode, watermark, onChange }) => {
26
33
  const viewShotRef = useRef<ViewShot>(null);
27
34
  if (!data || !watermark) {
28
35
  return null;
@@ -38,7 +45,7 @@ const ViewShotWatermark: React.FC<{
38
45
  <Image
39
46
  source={{ uri: formatUri(data.path) }}
40
47
  style={styles.container}
41
- resizeMode="center"
48
+ resizeMode={resizeMode}
42
49
  onLoadEnd={() => {
43
50
  setTimeout(() => {
44
51
  autoSaveWatermark();
@@ -64,7 +71,7 @@ export const styles = StyleSheet.create({
64
71
  right: 0,
65
72
  top: 0,
66
73
  bottom: 0,
67
- backgroundColor: '#fff',
74
+ backgroundColor: '#000',
68
75
  zIndex: MAX_ZINDEX,
69
76
  },
70
77
  footer: {
@@ -2,7 +2,7 @@
2
2
  * @Author: 刘利军
3
3
  * @Date: 2024-12-25 13:51:40
4
4
  * @LastEditors: 刘利军
5
- * @LastEditTime: 2024-12-25 13:53:40
5
+ * @LastEditTime: 2025-01-21 11:04:47
6
6
  * @Description:
7
7
  * @PageName:
8
8
  */
@@ -18,9 +18,19 @@ export const getMeasure = async (
18
18
  content: string
19
19
  ) => {
20
20
  const metrics = await ctx.measureText(content);
21
+ let height = 0;
22
+ if (metrics?.fontBoundingBoxAscent && metrics?.fontBoundingBoxDescent) {
23
+ height = metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent;
24
+ } else if (
25
+ metrics?.actualBoundingBoxAscent &&
26
+ metrics?.actualBoundingBoxDescent
27
+ ) {
28
+ height =
29
+ metrics?.actualBoundingBoxAscent + metrics?.actualBoundingBoxDescent;
30
+ }
21
31
  return {
22
32
  width: metrics.width,
23
- height: metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent,
33
+ height,
24
34
  };
25
35
  };
26
36
 
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file