@unif/react-native-hms-scan 0.1.0 → 0.2.1

package/ios/HmsScanView.mm

@@ -7,6 +7,7 @@
 #import "HmsScanResultMapper.h"
 
 #import <React/RCTConversions.h>
+#import <React/UIView+React.h>
 
 #import <react/renderer/components/ReactNativeHmsScanSpec/ComponentDescriptors.h>
 #import <react/renderer/components/ReactNativeHmsScanSpec/EventEmitters.h>
@@ -37,21 +38,19 @@ using namespace facebook::react;
 
 #pragma mark - Codegen wiring
 
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
++ (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<HmsScanViewComponentDescriptor>();
 }
 
-- (instancetype)initWithFrame:(CGRect)frame
-{
+- (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const HmsScanViewProps>();
     _props = defaultProps;
 
-    _appliedContinuous = YES;  // matches WithDefault<boolean, true>
+    _appliedContinuous = YES; // matches WithDefault<boolean, true>
     _appliedPaused = NO;
     _appliedTorch = NO;
-    _appliedFormatsCsv = @"";  // matches WithDefault<string, ''> (= all formats)
+    _appliedFormatsCsv = @""; // matches WithDefault<string, ''> (= all formats)
     _hasAppliedOnce = NO;
     _childAttached = NO;
 
@@ -62,20 +61,17 @@ using namespace facebook::react;
 
 #pragma mark - Scan view controller lifecycle
 
-- (void)buildScanViewControllerWithCsv:(NSString *)csv
-{
+- (void)buildScanViewControllerWithCsv:(NSString *)csv {
   // (Re)create the VC. HmsCustomScanViewController takes its format set at init
   // via HmsScanOptions and exposes no setter to change it later, so a formatsCsv
   // change requires rebuilding the controller.
   [self teardownScanViewController];
 
   unsigned int formatType = [HmsScanResultMapper scanFormatTypeFromCsv:csv];
-  HmsScanOptions *options =
-      [[HmsScanOptions alloc] initWithScanFormatType:formatType Photo:NO];
+  HmsScanOptions *options = [[HmsScanOptions alloc] initWithScanFormatType:formatType Photo:NO];
 
-  HmsCustomScanViewController *vc =
-      [[HmsCustomScanViewController alloc] initCustomizedScanWithFormatType:options];
-  vc.backButtonHidden = YES;            // we render our own chrome from JS
+  HmsCustomScanViewController *vc = [[HmsCustomScanViewController alloc] initCustomizedScanWithFormatType:options];
+  vc.backButtonHidden = YES; // we render our own chrome from JS
   vc.customizedScanDelegate = self;
   vc.continuouslyScan = _appliedContinuous;
 
@@ -101,8 +97,7 @@ using namespace facebook::react;
   }
 }
 
-- (void)teardownScanViewController
-{
+- (void)teardownScanViewController {
   if (_scanVC == nil) {
     return;
   }
@@ -114,14 +109,13 @@ using namespace facebook::react;
   _scanVC = nil;
 }
 
-- (void)attachChildViewController
-{
+- (void)attachChildViewController {
   if (_scanVC == nil || _childAttached) {
     return;
   }
   UIViewController *parent = [self reactViewController];
   if (parent == nil) {
-    return;  // try again on next didMoveToWindow
+    return; // try again on next didMoveToWindow
   }
   [parent addChildViewController:_scanVC];
   // The view is already in our hierarchy (set as contentView); just notify.
@@ -129,8 +123,7 @@ using namespace facebook::react;
   _childAttached = YES;
 }
 
-- (void)detachChildViewController
-{
+- (void)detachChildViewController {
   if (_scanVC == nil || !_childAttached) {
     return;
   }
@@ -139,8 +132,7 @@ using namespace facebook::react;
   _childAttached = NO;
 }
 
-- (void)didMoveToWindow
-{
+- (void)didMoveToWindow {
   [super didMoveToWindow];
   if (self.window != nil) {
     [self attachChildViewController];
@@ -151,8 +143,7 @@ using namespace facebook::react;
 
 #pragma mark - Props
 
-- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
-{
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps {
   const auto &newViewProps = *std::static_pointer_cast<HmsScanViewProps const>(props);
 
   NSString *newCsv = [NSString stringWithUTF8String:newViewProps.formatsCsv.c_str()];
@@ -205,8 +196,7 @@ using namespace facebook::react;
 // torch directly through AVFoundation as a best-effort convenience. This is NOT
 // guaranteed to stay in sync with HUAWEI's built-in torch button, and may be a
 // no-op if HUAWEI holds an exclusive lock on the capture device's configuration.
-- (void)applyTorch:(BOOL)on
-{
+- (void)applyTorch:(BOOL)on {
   BOOL available = NO;
   BOOL torchOn = [self setTorchHardwareOn:on available:&available];
   [self emitTorchStatusAvailable:available on:torchOn];
@@ -215,8 +205,7 @@ using namespace facebook::react;
 // Mutates the capture device's torch. Returns the resulting on-state and writes
 // hardware availability into `available`. Does NOT emit any event (so it can be
 // reused on teardown/recycle without firing onTorchStatus on a stale emitter).
-- (BOOL)setTorchHardwareOn:(BOOL)on available:(BOOL *)available
-{
+- (BOOL)setTorchHardwareOn:(BOOL)on available:(BOOL *)available {
   AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
   BOOL isAvailable = (device != nil && device.hasTorch && device.isTorchAvailable);
   if (available != NULL) {
@@ -246,8 +235,7 @@ using namespace facebook::react;
 
 // Called by HUAWEI on every decode (repeatedly in continuous mode). `resultDic`
 // is a single result dictionary; we wrap it into the contract's top-level array.
-- (void)customizedScanDelegateForResult:(NSDictionary *)resultDic
-{
+- (void)customizedScanDelegateForResult:(NSDictionary *)resultDic {
   NSDictionary *mapped = [HmsScanResultMapper scanResultFromHuaweiDict:resultDic];
   if (mapped == nil) {
     // Decoded payload had no usable value; surface as a soft error event.
@@ -260,8 +248,7 @@ using namespace facebook::react;
 
 #pragma mark - Event emitters
 
-- (void)emitScanResultJson:(NSString *)json
-{
+- (void)emitScanResultJson:(NSString *)json {
   if (!_eventEmitter) {
     return;
   }
@@ -272,8 +259,7 @@ using namespace facebook::react;
       });
 }
 
-- (void)emitScanErrorWithCode:(NSString *)code message:(NSString *)message
-{
+- (void)emitScanErrorWithCode:(NSString *)code message:(NSString *)message {
   if (!_eventEmitter) {
     return;
   }
@@ -284,8 +270,7 @@ using namespace facebook::react;
       });
 }
 
-- (void)emitTorchStatusAvailable:(BOOL)available on:(BOOL)on
-{
+- (void)emitTorchStatusAvailable:(BOOL)available on:(BOOL)on {
   if (!_eventEmitter) {
     return;
   }
@@ -298,8 +283,7 @@ using namespace facebook::react;
 
 #pragma mark - Cleanup
 
-- (void)prepareForRecycle
-{
+- (void)prepareForRecycle {
   // Reset imperative state so a recycled view re-applies props cleanly.
   // Turn the torch off WITHOUT emitting (the emitter is being torn down).
   [self setTorchHardwareOn:NO available:NULL];
@@ -312,8 +296,7 @@ using namespace facebook::react;
   [super prepareForRecycle];
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
   if (_scanVC != nil) {
     _scanVC.customizedScanDelegate = nil;
   }

package/lib/module/index.js

@@ -1,7 +1,8 @@
 "use strict";
 
-// @unif/react-native-hms-scan —— 华为 HMS 统一扫码服务 RN bridge
-// 能力：定制视图扫码（底层 <HmsScanView> + 成品 <Scanner> 扫一扫页）+ 图片识别（decodeImage）。
+// @unif/react-native-hms-scan —— 华为 HMS 统一扫码服务 RN bridge(Fabric 新架构)
+// 能力：定制视图扫码（底层 <HmsScanView> + 成品 <Scanner> 扫一扫页）+ 图片识别（decodeImage）+ 相机权限。
+// 0.2.1：package.json#files 补 scripts/，修 pod install 缺 prepare-scankit-xcframework.sh（podspec prepare_command 调用）。
 
 // ── 类型与常量 ──
 export { ALL_BARCODE_FORMATS, HmsScanError } from "./types.js";

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["ALL_BARCODE_FORMATS","HmsScanError","coerceFormat","coerceContentType","formatsToCsv","HmsScanView","decodeImage","getCameraPermissionStatus","requestCameraPermission","Scanner"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA;AACA;;AAEA;AACA,SACEA,mBAAmB,EACnBC,YAAY,QACP,YAAS;AAYhB;AACA,SAASC,YAAY,EAAEC,iBAAiB,EAAEC,YAAY,QAAQ,aAAU;;AAExE;AACA,SAASC,WAAW,QAAQ,kBAAe;AAG3C;AACA,SAASC,WAAW,QAAQ,kBAAe;;AAE3C;AACA,SAASC,yBAAyB,EAAEC,uBAAuB,QAAQ,kBAAe;;AAElF;AACA,SAASC,OAAO,QAAQ,sBAAmB","ignoreList":[]}
+{"version":3,"names":["ALL_BARCODE_FORMATS","HmsScanError","coerceFormat","coerceContentType","formatsToCsv","HmsScanView","decodeImage","getCameraPermissionStatus","requestCameraPermission","Scanner"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA;AACA;AACA;;AAEA;AACA,SACEA,mBAAmB,EACnBC,YAAY,QACP,YAAS;AAYhB;AACA,SAASC,YAAY,EAAEC,iBAAiB,EAAEC,YAAY,QAAQ,aAAU;;AAExE;AACA,SAASC,WAAW,QAAQ,kBAAe;AAG3C;AACA,SAASC,WAAW,QAAQ,kBAAe;;AAE3C;AACA,SAASC,yBAAyB,EAAEC,uBAAuB,QAAQ,kBAAe;;AAElF;AACA,SAASC,OAAO,QAAQ,sBAAmB","ignoreList":[]}

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,mBAAmB,EACnB,YAAY,GACb,MAAM,SAAS,CAAC;AACjB,YAAY,EACV,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,WAAW,GACZ,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGzE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAGnF,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EACnB,YAAY,GACb,MAAM,SAAS,CAAC;AACjB,YAAY,EACV,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,WAAW,GACZ,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGzE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAGnF,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unif/react-native-hms-scan",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "华为 HMS 统一扫码服务 React Native bridge：定制视图扫码 + 图片识别 (Scan SDK-Plus / ScanKitFrameWork，@unif 私有)",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -24,6 +24,7 @@
     "ios",
     "*.podspec",
     "react-native.config.js",
+    "scripts",
     "!ios/build",
     "!android/build",
     "!android/gradle",
@@ -64,7 +65,7 @@
   "bugs": {
     "url": "https://github.com/unif-design/react-native-hms-scan/issues"
   },
-  "homepage": "https://github.com/unif-design/react-native-hms-scan#readme",
+  "homepage": "https://unif-design.github.io/react-native-hms-scan/",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
@@ -72,15 +73,16 @@
     "@commitlint/config-conventional": "^20.5.0",
     "@eslint/js": "^9.39.0",
     "@gorhom/bottom-sheet": "^5.2.14",
-    "@react-native/babel-preset": "0.85.0",
+    "@react-native/babel-preset": "0.85.3",
     "@react-native/eslint-config": "0.85.0",
-    "@react-native/jest-preset": "0.85.0",
+    "@react-native/jest-preset": "0.85.3",
+    "@release-it/conventional-changelog": "^11.0.0",
     "@sbaiahmed1/react-native-blur": "^4.6.2",
     "@testing-library/react-native": "^13.3.3",
     "@types/jest": "^29.5.0",
     "@types/react": "^19.2.0",
     "@types/react-test-renderer": "^19",
-    "@unif/react-native-design": "^0.4.35",
+    "@unif/react-native-design": "0.5.1",
     "commitlint": "^20.5.0",
     "del-cli": "^7.0.0",
     "eslint": "^9.39.4",
@@ -89,7 +91,7 @@
     "jest": "^29.7.0",
     "prettier": "^3.8.1",
     "react": "19.2.3",
-    "react-native": "0.85.0",
+    "react-native": "0.85.3",
     "react-native-builder-bob": "^0.41.0",
     "react-native-gesture-handler": "^2.21.0",
     "react-native-reanimated": "^4.0.0",
@@ -98,6 +100,8 @@
     "react-native-svg": "^15.15.5",
     "react-native-worklets": "*",
     "react-test-renderer": "19.2.3",
+    "release-it": "^20.0.1",
+    "turbo": "^2.8.21",
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.20.0"
   },
@@ -115,7 +119,8 @@
     "react-native-worklets": "*"
   },
   "workspaces": [
-    "example"
+    "example",
+    "website"
   ],
   "packageManager": "yarn@4.11.0",
   "codegenConfig": {
@@ -144,6 +149,28 @@
       ]
     ]
   },
+  "release-it": {
+    "git": {
+      "commitMessage": "chore: release ${version} [skip ci]",
+      "tagName": "v${version}",
+      "requireCommits": true
+    },
+    "npm": {
+      "publish": true,
+      "skipChecks": true
+    },
+    "github": {
+      "release": true
+    },
+    "plugins": {
+      "@release-it/conventional-changelog": {
+        "preset": {
+          "name": "angular"
+        },
+        "infile": "CHANGELOG.md"
+      }
+    }
+  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"

package/scripts/prepare-scankit-xcframework.sh

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+#
+# 生成含 arm64-simulator 切片的 ScanKitFrameWork.xcframework(+ 资源 bundle)。
+#
+# 背景:华为官方 ScanKitFrameWork 1.1.2 是 2020 年前的老式 fat framework
+# (arm64 = 真机 / x86_64 = Intel 模拟器,LC_VERSION_MIN_IPHONEOS 标记),
+# 不含 arm64-simulator 切片。Apple Silicon(M 芯片)的 iOS 模拟器是 arm64-sim,
+# 会因缺这一片而链接失败(旧 podspec 只能 EXCLUDED_ARCHS 排掉、导致模拟器编不过)。
+#
+# 这里用 Apple 官方 vtool 把真机 arm64 改写成 simulator 平台、补出 arm64-sim,
+# 再 lipo 合并 x86_64,最后 xcodebuild -create-xcframework 打成 xcframework
+# (device 片 / simulator 片分目录,fat binary 不允许同 arch 共存)。
+#
+# vtool 转出来的 sim 片仅用于编译/链接(CI、模拟器跑通);真机仍走 device 片。
+# 模拟器上真去调摄像头硬件会崩,但模拟器本无扫码硬件场景,不影响。
+#
+# 由 ReactNativeHmsScan.podspec 的 prepare_command 在 pod install 时调用。
+# 产物 ios/vendor/ 不入 git —— 按需生成(已生成则跳过)。
+#
+set -euo pipefail
+
+OUT_DIR="ios/vendor"
+XCFW="$OUT_DIR/ScanKitFrameWork.xcframework"
+BUNDLE="$OUT_DIR/ScanKitFrameWorkBundle.bundle"
+
+# 华为官方 Scan SDK-Plus iOS 工具包(scansdk-ios-tool 1.1.0.305)。
+# URL 取自 ScanKitFrameWork 的 CocoaPods spec(source.http),带 10 年签名有效期。
+ZIP_URL="https://contentcenter-vali-drcn.dbankcdn.cn/pvt_2/DeveloperAlliance_package_901_9/eb/v3/FoQltlwsS0Ge-TitlHPL3A/scansdk-ios-tool-1.1.0.305.zip?HW-CC-KV=V1&HW-CC-Date=20230321T064901Z&HW-CC-Expire=315360000&HW-CC-Sign=C23A0122B070535FDFA38C56BA62E25E6BE66582D963B8C7F5DDF4FCA5C34CFF"
+
+# 只在 macOS 生成(需 lipo / vtool / xcodebuild);Android 等平台的 pod install 直接跳过。
+if [ "$(uname)" != "Darwin" ]; then
+  echo "[scankit] 非 macOS,跳过 xcframework 生成"
+  exit 0
+fi
+
+# 已生成且两个平台切片齐全 → 跳过(避免每次 pod install 重复下载几十 MB)。
+if [ -d "$XCFW/ios-arm64" ] && [ -d "$XCFW/ios-arm64_x86_64-simulator" ] && [ -d "$BUNDLE" ]; then
+  echo "[scankit] xcframework 已存在,跳过"
+  exit 0
+fi
+
+echo "[scankit] 下载华为 Scan SDK ..."
+TMP="$(mktemp -d)"
+trap 'rm -rf "$TMP"' EXIT
+curl -fsSL "$ZIP_URL" -o "$TMP/sdk.zip"
+unzip -q "$TMP/sdk.zip" -d "$TMP/sdk"
+
+SRC_FW="$(find "$TMP/sdk" -type d -name 'ScanKitFrameWork.framework' | head -1)"
+SRC_BUNDLE="$(find "$TMP/sdk" -type d -name 'ScanKitFrameWorkBundle.bundle' | head -1)"
+if [ -z "$SRC_FW" ]; then
+  echo "[scankit] ✗ 解压后未找到 ScanKitFrameWork.framework" >&2
+  exit 1
+fi
+BIN="$SRC_FW/ScanKitFrameWork"
+
+echo "[scankit] 拆片 + vtool 补 arm64-simulator + 组 xcframework ..."
+mkdir -p "$TMP/device" "$TMP/sim"
+
+# device:真机 arm64
+cp -R "$SRC_FW" "$TMP/device/ScanKitFrameWork.framework"
+lipo "$BIN" -thin arm64 -output "$TMP/device/ScanKitFrameWork.framework/ScanKitFrameWork"
+
+# simulator:arm64(真机片经 vtool 改写成 simulator 平台 7)+ x86_64(原 Intel 模拟器片)
+cp -R "$SRC_FW" "$TMP/sim/ScanKitFrameWork.framework"
+lipo "$BIN" -thin arm64 -output "$TMP/a64d"
+vtool -arch arm64 -set-build-version 7 13.5 13.5 -replace -output "$TMP/a64s" "$TMP/a64d"
+lipo "$BIN" -thin x86_64 -output "$TMP/x86"
+lipo -create "$TMP/a64s" "$TMP/x86" -output "$TMP/sim/ScanKitFrameWork.framework/ScanKitFrameWork"
+
+mkdir -p "$OUT_DIR"
+rm -rf "$XCFW"
+xcodebuild -create-xcframework \
+  -framework "$TMP/device/ScanKitFrameWork.framework" \
+  -framework "$TMP/sim/ScanKitFrameWork.framework" \
+  -output "$XCFW"
+
+# 资源 bundle(扫码 UI 资源),原由 ScanKitFrameWork pod 带,现随 vendored 一起放。
+if [ -n "$SRC_BUNDLE" ]; then
+  rm -rf "$BUNDLE"
+  cp -R "$SRC_BUNDLE" "$BUNDLE"
+fi
+
+echo "[scankit] ✓ 生成 $XCFW(+ bundle)"

package/src/index.tsx

@@ -1,5 +1,6 @@
-// @unif/react-native-hms-scan —— 华为 HMS 统一扫码服务 RN bridge
-// 能力：定制视图扫码（底层 <HmsScanView> + 成品 <Scanner> 扫一扫页）+ 图片识别（decodeImage）。
+// @unif/react-native-hms-scan —— 华为 HMS 统一扫码服务 RN bridge(Fabric 新架构)
+// 能力：定制视图扫码（底层 <HmsScanView> + 成品 <Scanner> 扫一扫页）+ 图片识别（decodeImage）+ 相机权限。
+// 0.2.1：package.json#files 补 scripts/，修 pod install 缺 prepare-scankit-xcframework.sh（podspec prepare_command 调用）。
 
 // ── 类型与常量 ──
 export {