@react-native-hero/alipay 0.0.5 → 0.0.7

package/android/src/main/java/com/github/reactnativehero/alipay/RNTAlipayModule.kt

@@ -17,7 +17,7 @@ class RNTAlipayModule(private val reactContext: ReactApplicationContext) : React
 
             val response = Arguments.createMap()
 
-            val alipay = AuthTask(currentActivity)
+            val alipay = AuthTask(reactContext.currentActivity)
             // 执行到这会阻塞，直到从支付宝返回当前 App 才会继续往下执行
             val result = alipay.authV2(options.getString("authString"), true)
 
@@ -43,7 +43,7 @@ class RNTAlipayModule(private val reactContext: ReactApplicationContext) : React
 
             val response = Arguments.createMap()
 
-            val alipay = PayTask(currentActivity)
+            val alipay = PayTask(reactContext.currentActivity)
             // 执行到这会阻塞，直到从支付宝返回当前 App 才会继续往下执行
             val result = alipay.payV2(options.getString("orderString"), true)
 

package/ios/RNTAlipay/RNTAlipay.m

@@ -7,7 +7,12 @@
 
 + (BOOL)handleOpenURL:(UIApplication *)application openURL:(NSURL *)url
 options:(NSDictionary<NSString*, id> *)options {
-    return [url.host isEqualToString:@"safepay"];
+    if ([url.host isEqualToString:@"safepay"]) {
+        [[AlipaySDK defaultService] processOrderWithPaymentResult:url standbyCallback:nil];
+        [[AlipaySDK defaultService] processAuth_V2Result:url standbyCallback:nil];
+        return YES;
+    }
+    return NO;
 }
 
 + (BOOL)requiresMainQueueSetup {
@@ -15,7 +20,7 @@ options:(NSDictionary<NSString*, id> *)options {
 }
 
 - (dispatch_queue_t)methodQueue {
-    return dispatch_queue_create("com.github.reactnativehero.alipay", DISPATCH_QUEUE_SERIAL);
+    return dispatch_get_main_queue();
 }
 
 RCT_EXPORT_MODULE(RNTAlipay);
@@ -26,25 +31,25 @@ RCT_EXPORT_METHOD(auth:(NSDictionary*)options
     
     NSString *authInfo = [RCTConvert NSString:options[@"authString"]];
     NSString *appScheme = [RCTConvert NSString:options[@"appScheme"]];
-    
+
     [[AlipaySDK defaultService] auth_V2WithInfo:authInfo fromScheme:appScheme callback:^(NSDictionary *resultDic) {
-            
-            NSMutableDictionary *response = [[NSMutableDictionary alloc] init];
-            
-            NSString *resultStatus = resultDic[@"resultStatus"] ?: @"1";
-            
-            if ([resultStatus isEqualToString:@("9000")]) {
-                response[@"code"] = 0;
-                response[@"msg"] = @("success");
-                response[@"data"] = resultDic[@"result"] ?: @"";
-            }
-            else {
-                response[@"code"] = @([resultStatus intValue]);
-                response[@"msg"] = resultDic[@"memo"] ?: @"";
-            }
-            
-            resolve(response);
-            
+        
+        NSMutableDictionary *response = [[NSMutableDictionary alloc] init];
+        
+        NSString *resultStatus = resultDic[@"resultStatus"] ?: @"1";
+
+        if ([resultStatus isEqualToString:@("9000")]) {
+            response[@"code"] = @(0);
+            response[@"msg"] = @("success");
+            response[@"data"] = resultDic[@"result"] ?: @"";
+        }
+        else {
+            response[@"code"] = @([resultStatus intValue]);
+            response[@"msg"] = resultDic[@"memo"] ?: @"";
+        }
+        
+        resolve(response);
+        
     }];
     
 }
@@ -55,7 +60,7 @@ RCT_EXPORT_METHOD(pay:(NSDictionary*)options
     
     NSString *orderInfo = [RCTConvert NSString:options[@"orderString"]];
     NSString *appScheme = [RCTConvert NSString:options[@"appScheme"]];
-    
+
     [[AlipaySDK defaultService] payOrder:orderInfo fromScheme:appScheme callback:^(NSDictionary *resultDic) {
 
         NSMutableDictionary *response = [[NSMutableDictionary alloc] init];
@@ -63,7 +68,7 @@ RCT_EXPORT_METHOD(pay:(NSDictionary*)options
         NSString *resultStatus = resultDic[@"resultStatus"] ?: @"1";
         
         if ([resultStatus isEqualToString:@("9000")]) {
-            response[@"code"] = 0;
+            response[@"code"] = @(0);
             response[@"msg"] = @("success");
             response[@"data"] = resultDic[@"result"] ?: @"";
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-hero/alipay",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "react native alipay",
   "main": "index.js",
   "scripts": {

package/android/build/.transforms/540d2733fa01935409edd526093bc262/results.bin

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

package/android/build/.transforms/540d2733fa01935409edd526093bc262/transformed/out/AndroidManifest.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.reactnativehero.alipay" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="33" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-</manifest>

package/android/build/.transforms/540d2733fa01935409edd526093bc262/transformed/out/META-INF/com/android/build/gradle/aar-metadata.properties

@@ -1,4 +0,0 @@
-aarFormatVersion=1.0
-aarMetadataVersion=1.0
-minCompileSdk=1
-minAndroidGradlePluginVersion=1.0.0