@unif/react-native-hms-scan 0.6.2 → 2.0.0

package/android/src/main/java/com/unif/reactnativehmsscan/HmsScanView.kt

@@ -2,6 +2,7 @@ package com.unif.reactnativehmsscan
 
 import android.app.Activity
 import android.content.Context
+import android.content.pm.PackageManager
 import android.os.Bundle
 import android.widget.FrameLayout
 import com.facebook.react.bridge.Arguments
@@ -42,14 +43,12 @@ class HmsScanView(
   private var paused: Boolean = false
   private var torch: Boolean = false
   private var actualTorchOn: Boolean = false
-  private var torchAvailable: Boolean = false
+  private var lowLight: Boolean? = null
 
   // True while this view is between onAttachedToWindow and onDetachedFromWindow.
   private var attached: Boolean = false
-
-  init {
-    themedReactContext.addLifecycleEventListener(this)
-  }
+  private var listening: Boolean = false
+  private var lastTorchState: Triple<Boolean, Boolean, Boolean?>? = null
 
   // ── Props (called from the ViewManager) ───────────────────────────────────
 
@@ -81,6 +80,10 @@ class HmsScanView(
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
     attached = true
+    if (!listening) {
+      listening = true
+      themedReactContext.addLifecycleEventListener(this)
+    }
     if (remoteView == null) {
       buildRemoteView()
     }
@@ -91,6 +94,7 @@ class HmsScanView(
     super.onDetachedFromWindow()
     attached = false
     teardownRemoteView()
+    removeLifecycleListener()
   }
 
   // ── Host (Activity) lifecycle ─────────────────────────────────────────────
@@ -109,7 +113,14 @@ class HmsScanView(
 
   override fun onHostDestroy() {
     teardownRemoteView()
-    themedReactContext.removeLifecycleEventListener(this)
+    removeLifecycleListener()
+  }
+
+  private fun removeLifecycleListener() {
+    if (listening) {
+      listening = false
+      themedReactContext.removeLifecycleEventListener(this)
+    }
   }
 
   // ── RemoteView build / teardown ───────────────────────────────────────────
@@ -142,9 +153,15 @@ class HmsScanView(
 
       val view = builder.build()
 
-      view.setOnResultCallback(OnResultCallback { result -> onScanResult(result) })
+      view.setOnResultCallback(
+        OnResultCallback { result ->
+          if (remoteView === view && !paused) onScanResult(result)
+        },
+      )
       view.setOnLightVisibleCallback(
-        OnLightVisibleCallBack { visible -> onTorchVisible(visible) },
+        OnLightVisibleCallBack { visible ->
+          if (remoteView === view) onTorchVisible(visible)
+        },
       )
 
       // onCreate must run after build() and before addView (per HMS docs/demo).
@@ -172,6 +189,8 @@ class HmsScanView(
 
   private fun teardownRemoteView() {
     val view = remoteView ?: return
+    // Invalidate callbacks before the SDK starts its asynchronous teardown.
+    remoteView = null
     try {
       view.onPause()
       view.onStop()
@@ -180,8 +199,9 @@ class HmsScanView(
       // Defensive: never let teardown crash the host.
     }
     removeView(view)
-    remoteView = null
     actualTorchOn = false
+    lowLight = null
+    lastTorchState = null
   }
 
   /** Rebuild the RemoteView in place to honour a changed build-time prop. */
@@ -207,15 +227,17 @@ class HmsScanView(
 
   private fun applyTorch() {
     val view = remoteView ?: return
+    var commandFailed = false
     try {
       // switchLight() toggles; only flip when the current state differs from target.
       if (view.lightStatus != torch) {
-        view.switchLight()
+        commandFailed = !view.switchLight()
       }
     } catch (_: Throwable) {
-      // Ignore: device may have no flash.
+      commandFailed = true
     }
-    emitTorchStatus(view)
+    // A rejected command must acknowledge even an unchanged state so JS can retry.
+    emitTorchState(view, force = commandFailed)
   }
 
   /** Resolve the hosting Activity required by RemoteView.Builder.setContext(). */
@@ -226,8 +248,14 @@ class HmsScanView(
   private fun onScanResult(result: Array<HmsScan?>?) {
     // Drop empty callbacks (continuous mode can fire with nothing useful).
     if (result == null || result.isEmpty()) return
-    val json = HmsScanResultMapper.toJson(result)
-    // toJson skips value-less hits; avoid emitting an empty "[]" event.
+    val json =
+      try {
+        HmsScanResultMapper.toJson(result)
+      } catch (error: InvalidScanResponse) {
+        emitError("E_INVALID_RESPONSE", error.message ?: "Invalid scan result")
+        return
+      }
+    // A batch containing only null vendor entries has no result to emit.
     if (json == "[]") return
     emitEvent(
       "topScanResult",
@@ -238,12 +266,15 @@ class HmsScanView(
   }
 
   private fun onTorchVisible(visible: Boolean) {
-    torchAvailable = visible
+    lowLight = visible
     val view = remoteView ?: return
-    emitTorchStatus(view)
+    emitTorchState(view)
   }
 
-  private fun emitTorchStatus(view: RemoteView) {
+  private fun emitTorchState(
+    view: RemoteView,
+    force: Boolean = false,
+  ) {
     val on =
       try {
         view.lightStatus
@@ -251,10 +282,17 @@ class HmsScanView(
         actualTorchOn
       }
     actualTorchOn = on
+    val available = context.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)
+    val state = Triple(on, available, lowLight)
+    if (!force && lastTorchState == state) return
+    lastTorchState = state
     emitEvent(
-      "topTorchStatus",
+      "topTorchState",
       Arguments.createMap().apply {
-        putBoolean("available", torchAvailable)
+        putBoolean("available", available)
+        putBoolean("hasAvailable", true)
+        putBoolean("lowLight", lowLight ?: false)
+        putBoolean("hasLowLight", lowLight != null)
         putBoolean("on", on)
       },
     )

package/android/src/main/java/com/unif/reactnativehmsscan/HmsScanViewManager.kt

@@ -66,7 +66,7 @@ class HmsScanViewManager :
     mapOf(
       "topScanResult" to mapOf("registrationName" to "onScanResult"),
       "topScanError" to mapOf("registrationName" to "onScanError"),
-      "topTorchStatus" to mapOf("registrationName" to "onTorchStatus"),
+      "topTorchState" to mapOf("registrationName" to "onTorchState"),
     )
 
   companion object {

package/ios/HmsScanModule.mm

@@ -11,18 +11,18 @@
 
 #import <ScanKitFrameWork/ScanKitFrameWork.h>
 
-// Error codes mirror HmsScanErrorCode in src/types.ts.
+// Native codes are normalized to ScanFailure at the public capability boundary.
 static NSString *const kErrImageLoadFailed = @"E_IMAGE_LOAD_FAILED";
 static NSString *const kErrDecodeFailed = @"E_DECODE_FAILED";
 
 @implementation HmsScanModule
 
-// Export under the JS-visible name "HmsScan" (TurboModuleRegistry.getEnforcing<Spec>('HmsScan')).
+// Export under the JS-visible TurboModule name "HmsScan".
 RCT_EXPORT_MODULE(HmsScan)
 
 #pragma mark - Permission status mapping
 
-// AVAuthorizationStatus -> our CameraPermissionStatus string.
+// AVAuthorizationStatus -> our ScanCameraPermission string.
 // authorized -> granted; notDetermined -> undetermined; denied/restricted -> blocked.
 + (NSString *)stringForAuthorizationStatus:(AVAuthorizationStatus)status {
   switch (status) {
@@ -34,7 +34,7 @@ RCT_EXPORT_MODULE(HmsScan)
   case AVAuthorizationStatusRestricted:
     return @"blocked";
   default:
-    return @"undetermined";
+    return @"unknown";
   }
 }
 
@@ -66,45 +66,18 @@ RCT_EXPORT_MODULE(HmsScan)
 
 #pragma mark - Image loading
 
-// Load a UIImage from a local URI: file:// , an absolute/relative file path,
-// or a data: URI. Remote URLs and Photos (ph:// / assets-library://) are not
-// supported here -> returns nil so the caller rejects E_IMAGE_LOAD_FAILED.
+// Read only the local file prepared by the caller.
 + (nullable UIImage *)imageForURI:(NSString *)uri {
   if (uri.length == 0) {
     return nil;
   }
 
   NSURL *url = [NSURL URLWithString:uri];
-  NSString *scheme = url.scheme.lowercaseString;
-
-  // data: URI (base64 or otherwise) -> decode bytes directly.
-  if ([scheme isEqualToString:@"data"]) {
-    NSData *data = [NSData dataWithContentsOfURL:url];
-    return data ? [UIImage imageWithData:data] : nil;
-  }
-
-  // file:// URI -> use its filesystem path.
-  if ([scheme isEqualToString:@"file"]) {
+  if (url.isFileURL) {
     NSString *path = url.path;
     return path ? [UIImage imageWithContentsOfFile:path] : nil;
   }
 
-  // No scheme (or a Windows-like drive letter is irrelevant on iOS): treat the
-  // whole string as a filesystem path. Also strip a leading file path that may
-  // have arrived percent-encoded.
-  if (scheme == nil || scheme.length == 0) {
-    UIImage *image = [UIImage imageWithContentsOfFile:uri];
-    if (image == nil) {
-      NSString *decoded = [uri stringByRemovingPercentEncoding];
-      if (decoded != nil && ![decoded isEqualToString:uri]) {
-        image = [UIImage imageWithContentsOfFile:decoded];
-      }
-    }
-    return image;
-  }
-
-  // ph:// , assets-library:// , http(s):// , content:// (Android-only) etc. are
-  // intentionally unsupported on iOS in this bridge.
   return nil;
 }
 
@@ -114,11 +87,13 @@ RCT_EXPORT_MODULE(HmsScan)
          formatsCsv:(NSString *)formatsCsv
             resolve:(RCTPromiseResolveBlock)resolve
              reject:(RCTPromiseRejectBlock)reject {
+  if ([HmsScanResultMapper unsupportedFormatInCsv:formatsCsv] != nil) {
+    reject(@"E_UNSUPPORTED_FORMAT", @"iOS ScanKit 不支持请求的码制", nil);
+    return;
+  }
   UIImage *image = [HmsScanModule imageForURI:uri];
   if (image == nil) {
-    reject(kErrImageLoadFailed,
-           [NSString stringWithFormat:@"无法从 URI 加载图片（仅支持 file:// / 绝对路径 / data:）：%@", uri ?: @"(nil)"],
-           nil);
+    reject(kErrImageLoadFailed, [NSString stringWithFormat:@"无法读取本地图片文件：%@", uri ?: @"(nil)"], nil);
     return;
   }
 
@@ -133,7 +108,8 @@ RCT_EXPORT_MODULE(HmsScan)
     // JS parseResultsJson handles the empty case.
     resolve(json);
   } @catch (NSException *exception) {
-    reject(kErrDecodeFailed, exception.reason ?: @"HUAWEI Scan Kit 解码图片时发生异常", nil);
+    reject([exception.name isEqualToString:@"HmsInvalidResponse"] ? @"E_INVALID_RESPONSE" : kErrDecodeFailed,
+           exception.reason ?: @"HUAWEI Scan Kit 解码图片时发生异常", nil);
   }
 }
 

package/ios/HmsScanResultMapper.h

@@ -18,8 +18,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface HmsScanResultMapper : NSObject
++ (nullable NSString *)unsupportedFormatInCsv:(NSString *)csv;
 
-/// Parse a comma-separated list of our BarcodeFormat strings into the
+/// Parse a comma-separated list of our ScanFormat strings into the
 /// `HmsScanOptions.scanFormatType` bitmask (HMSScanFormatTypeCode OR-ed).
 /// An empty/whitespace-only string means "all formats".
 + (unsigned int)scanFormatTypeFromCsv:(nullable NSString *)csv;
@@ -30,11 +31,11 @@ NS_ASSUME_NONNULL_BEGIN
 + (nullable NSDictionary *)scanResultFromHuaweiDict:(nullable NSDictionary *)dict;
 
 /// Map an array of HUAWEI result dictionaries into an array of ScanResult
-/// dictionaries (dropping entries without a usable value).
+/// dictionaries. Invalid required fields raise HmsInvalidResponse.
 + (NSArray<NSDictionary *> *)scanResultsFromHuaweiArray:(nullable NSArray *)array;
 
 /// Serialize an array of ScanResult dictionaries to a JSON string.
-/// Never returns nil: on failure it returns "[]".
+/// Invalid input or serialization failures raise HmsInvalidResponse.
 + (NSString *)jsonStringFromScanResults:(nullable NSArray<NSDictionary *> *)results;
 
 /// Convenience: HUAWEI multi-decode array -> ScanResult[] JSON string.

package/ios/HmsScanResultMapper.mm

@@ -6,6 +6,7 @@
 #import "HmsScanResultMapper.h"
 
 #import <ScanKitFrameWork/ScanKitFrameWork.h>
+#include <cmath>
 
 // NOTE on naming collisions: HMSScanFormatTypeCode (in HmsScanFormat.h) declares
 // *global, unscoped* enum constants named QR_CODE, EAN_13, DATA_MATRIX, etc.
@@ -17,7 +18,7 @@
 
 #pragma mark - CSV -> scanFormatType bitmask
 
-// Maps one of our BarcodeFormat tokens to the matching HMSScanFormatTypeCode bit.
+// Maps one of our ScanFormat tokens to the matching HMSScanFormatTypeCode bit.
 // Returns 0 for tokens HUAWEI iOS does not support (e.g. MULTI_FUNCTIONAL) or
 // UNKNOWN, so they contribute nothing to the OR-ed mask.
 + (unsigned int)bitForFormatToken:(NSString *)token {
@@ -53,6 +54,16 @@
   return bit ? (unsigned int)bit.unsignedIntValue : 0u;
 }
 
++ (nullable NSString *)unsupportedFormatInCsv:(NSString *)csv {
+  if (csv.length == 0)
+    return nil;
+  for (NSString *token in [csv componentsSeparatedByString:@","]) {
+    if ([self bitForFormatToken:token] == 0u)
+      return token;
+  }
+  return nil;
+}
+
 + (unsigned int)scanFormatTypeFromCsv:(NSString *)csv {
   NSString *trimmed = [csv stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
   if (trimmed.length == 0) {
@@ -63,12 +74,10 @@
   for (NSString *token in [trimmed componentsSeparatedByString:@","]) {
     mask |= [self bitForFormatToken:token];
   }
-  // If nothing resolved (e.g. only MULTI_FUNCTIONAL/UNKNOWN was requested),
-  // fall back to ALL so we still attempt a decode rather than scanning nothing.
-  return mask == 0u ? (unsigned int)ALL : mask;
+  return mask; // Unsupported tokens are rejected by the capability boundary.
 }
 
-#pragma mark - formatValue -> our BarcodeFormat string
+#pragma mark - formatValue -> our ScanFormat string
 
 // HUAWEI's `formatValue` is documented as the HMSScanFormatTypeCode integer.
 // We tolerate it being delivered as an NSNumber (bit value) OR an NSString
@@ -207,9 +216,6 @@
     if ([v isKindOfClass:[NSNumber class]]) {
       return (NSNumber *)v;
     }
-    if ([v isKindOfClass:[NSString class]]) {
-      return @([(NSString *)v doubleValue]);
-    }
   }
   return nil;
 }
@@ -228,7 +234,7 @@
     NSDictionary *p = (NSDictionary *)element;
     NSNumber *x = [self numberFromPointDict:p keys:@[ @"posX", @"x", @"X" ]];
     NSNumber *y = [self numberFromPointDict:p keys:@[ @"posY", @"y", @"Y" ]];
-    if (x != nil && y != nil) {
+    if (x != nil && y != nil && std::isfinite(x.doubleValue) && std::isfinite(y.doubleValue)) {
       [points addObject:@{@"x" : x, @"y" : y}];
     }
   }
@@ -241,7 +247,7 @@
   // Primary key is `text`; tolerate a couple of alternates defensively.
   for (NSString *key in @[ @"text", @"originalValue", @"showText", @"value" ]) {
     id v = dict[key];
-    if ([v isKindOfClass:[NSString class]] && ((NSString *)v).length > 0) {
+    if ([v isKindOfClass:[NSString class]] && v != nil) {
       return (NSString *)v;
     }
   }
@@ -255,7 +261,7 @@
 
   NSString *value = [self valueFromHuaweiDict:dict];
   if (value == nil) {
-    return nil; // no usable decoded text -> drop
+    return nil;
   }
 
   NSMutableDictionary *out = [NSMutableDictionary dictionary];
@@ -277,12 +283,16 @@
 
 + (NSArray<NSDictionary *> *)scanResultsFromHuaweiArray:(NSArray *)array {
   NSMutableArray<NSDictionary *> *results = [NSMutableArray array];
+  if (array != nil && ![array isKindOfClass:[NSArray class]]) {
+    [NSException raise:@"HmsInvalidResponse" format:@"ScanKit returned a non-array result"];
+  }
   if ([array isKindOfClass:[NSArray class]]) {
     for (id element in array) {
       NSDictionary *mapped = [self scanResultFromHuaweiDict:element];
-      if (mapped != nil) {
-        [results addObject:mapped];
+      if (mapped == nil) {
+        [NSException raise:@"HmsInvalidResponse" format:@"ScanKit returned an invalid result"];
       }
+      [results addObject:mapped];
     }
   }
   return [results copy];
@@ -291,17 +301,19 @@
 #pragma mark - JSON
 
 + (NSString *)jsonStringFromScanResults:(NSArray<NSDictionary *> *)results {
-  NSArray *safe = [results isKindOfClass:[NSArray class]] ? results : @[];
-  if (![NSJSONSerialization isValidJSONObject:safe]) {
-    return @"[]";
+  if (![results isKindOfClass:[NSArray class]] || ![NSJSONSerialization isValidJSONObject:results]) {
+    [NSException raise:@"HmsInvalidResponse" format:@"ScanKit result cannot be serialized"];
   }
   NSError *error = nil;
-  NSData *data = [NSJSONSerialization dataWithJSONObject:safe options:0 error:&error];
+  NSData *data = [NSJSONSerialization dataWithJSONObject:results options:0 error:&error];
   if (data == nil || error != nil) {
-    return @"[]";
+    [NSException raise:@"HmsInvalidResponse" format:@"ScanKit result cannot be serialized"];
   }
   NSString *json = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  return json ?: @"[]";
+  if (json == nil) {
+    [NSException raise:@"HmsInvalidResponse" format:@"ScanKit result cannot be encoded as UTF-8"];
+  }
+  return json;
 }
 
 + (NSString *)jsonStringFromHuaweiArray:(NSArray *)array {

package/ios/HmsScanView.h

@@ -5,7 +5,7 @@
 //  Fabric component registered under the name "HmsScanView". Hosts HUAWEI Scan
 //  Kit's HmsCustomScanViewController as an embedded child view controller and
 //  bridges its delegate callbacks to the codegen events
-//  (onScanResult / onScanError / onTorchStatus).
+//  (onScanResult / onScanError / onTorchState).
 //
 
 #import <React/RCTViewComponentView.h>