react-native-trustdevice 1.1.4 → 1.1.5

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,16 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-5:12
+ADDED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-4:12
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-4:12
 	package
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:3:11-36
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:11-69
+		ADDED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:11-69
 uses-sdk
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -1,18 +1,8 @@
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.android.tools.build:gradle:4.1.3")
-    }
-}
-
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'com.trustdevice'  // 添加这一行,AGP8.0+需要namespace
+
     compileSdkVersion 34
      
     defaultConfig {

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.trustdevice">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
   

package/android/src/main/java/com/trustdevice/utils/TDUniRiskUtils.java

@@ -13,6 +13,7 @@ public class TDUniRiskUtils {
     static final String KEY_APPKEY = "appKey";
     static final String KEY_APPNAME = "appName";
     static final String KEY_COUNTRY = "country";
+    static final String KEY_DATACENTER = "dataCenter";
     static final String KEY_CHANNEL = "channel";
     static final String KEY_DEBUG = "debug";
     static final String KEY_TIME_LIMIT = "timeLimit";
@@ -71,6 +72,12 @@ public class TDUniRiskUtils {
                 builder.country(country.toUpperCase());
             }
         }
+        if (configMap.containsKey(KEY_DATACENTER)) {
+            String dataCenter = (String) configMap.get(KEY_DATACENTER);
+            if (!TextUtils.isEmpty(dataCenter)) {
+                builder.country(dataCenter.toUpperCase());
+            }
+        }
         // if (configMap.containsKey(KEY_URL)) {
         //     String url = (String) configMap.get(KEY_URL);
         //     if (!TextUtils.isEmpty(url)) {
@@ -232,6 +239,12 @@ public class TDUniRiskUtils {
                 builder.country(country.toUpperCase());
             }
         }
+        if (configMap.containsKey(KEY_DATACENTER)) {
+            String dataCenter = (String) configMap.get(KEY_DATACENTER);
+            if (!TextUtils.isEmpty(dataCenter)) {
+                builder.country(dataCenter.toUpperCase());
+            }
+        }
         if (configMap.containsKey(KEY_DEBUG)) {
             Object debug = configMap.get(KEY_DEBUG);
             if (debug != null) {

package/ios/TrustDevice.m

@@ -27,7 +27,22 @@ RCT_REMAP_METHOD(getSDKVersion,
 RCT_EXPORT_METHOD(initWithOptions:(NSDictionary*)options)
 {
   NSMutableDictionary* mutableOptions = [options mutableCopy];
-  mutableOptions[@"allowd"] = options[@"debug"];
+    
+  // 1. 判断 debug 是否为空（nil 或 NSNull）
+  id debugValue = options[@"debug"];
+  if (debugValue && debugValue != [NSNull null]) {
+      mutableOptions[@"allowd"] = debugValue;  // 原逻辑保留
+  } else {
+      // debug 为空时，可能设置默认值或不设置
+      mutableOptions[@"allowd"] = @(NO); // 示例默认 false
+  }
+  
+  // 2. 增加 dataCenter 赋值给 country
+  id dataCenter = options[@"dataCenter"];
+  if (dataCenter && dataCenter != [NSNull null]) {
+      mutableOptions[@"country"] = dataCenter;
+  }
+  
   TDMobRiskManager_t *manager = [TDMobRiskManager sharedManager];
   manager->initWithOptions([mutableOptions copy]);
 }

package/ios/TrustDeviceSe.m

@@ -27,7 +27,22 @@ RCT_REMAP_METHOD(getSDKVersion,
 RCT_EXPORT_METHOD(initWithOptions:(NSDictionary*)options)
 {
   NSMutableDictionary* mutableOptions = [options mutableCopy];
-  mutableOptions[@"allowd"] = options[@"debug"];
+    
+    // 1. 判断 debug 是否为空（nil 或 NSNull）
+    id debugValue = options[@"debug"];
+    if (debugValue && debugValue != [NSNull null]) {
+        mutableOptions[@"allowd"] = debugValue;  // 原逻辑保留
+    } else {
+        // debug 为空时，可能设置默认值或不设置
+        mutableOptions[@"allowd"] = @(NO); // 示例默认 false
+    }
+    
+    // 2. 增加 dataCenter 赋值给 country
+    id dataCenter = options[@"dataCenter"];
+    if (dataCenter && dataCenter != [NSNull null]) {
+        mutableOptions[@"country"] = dataCenter;
+    }
+
   TDDeviceManager_t *manager = [TDDeviceManager sharedManager];
   manager->initWithOptions([mutableOptions copy]);
 }

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "react-native-trustdevice",
-  "version": "1.1.4",
+  "publishConfig": {
+    "access": "public"
+  },
+  "version": "1.1.5",
   "description": "React Native TrustDevice component",
   "main": "index.js",
   "react-native": "index.js",
@@ -25,9 +28,10 @@
      "index.d.ts",
      "react-native-trustdevice.podspec"
    ],
+   
   "homepage": "https://trustdecision.com",
   "peerDependencies": { 
     "react": "*",
     "react-native": "*"
   }
-}
+}

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Oct 28 10:00:11 CST 2025
-gradle.version=8.10

package/android/.gradle/nb-cache/trust/6BEC0066B99297FC163AB3C2D5CC7668CDC2525F18622C2FFD1FE9D77756146A

@@ -1 +0,0 @@
-78098113B327001A7ADBB2DD53260281F0DC0024D59151B959C636AEF9B80944

package/android/build/.transforms/5932fa5b98f0003ce689cad35520f6df/results.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/.transforms/ff2232c43c8cccbad5f33e76433cddb2/results.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/generated/source/buildConfig/debug/com/trustdevice/BuildConfig.java

@@ -1,10 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.trustdevice;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.trustdevice";
-  public static final String BUILD_TYPE = "debug";
-}

package/android/build/intermediates/packaged_manifests/debug/output-metadata.json

@@ -1,18 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "PACKAGED_MANIFESTS",
-    "kind": "Directory"
-  },
-  "applicationId": "com.trustdevice",
-  "variantName": "debug",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "outputFile": "../../merged_manifest/debug/AndroidManifest.xml"
-    }
-  ],
-  "elementType": "File"
-}