From b7ea3c031871d822069ed7d079776d99aeaf297f Mon Sep 17 00:00:00 2001 From: jaywcjlove <398188662@qq.com> Date: Tue, 14 Jul 2020 22:53:43 +0800 Subject: [PATCH] chore: Modify the class name: Alipay => RNAlipay --- README.md | 3 +- index.js | 10 ++-- ios/Alipay.h | 5 -- ios/RNAlipay.h | 9 ++++ ios/{Alipay.m => RNAlipay.m} | 8 +-- ios/{Alipay.podspec => RNAlipay.podspec} | 15 +++--- .../project.pbxproj | 50 +++++++++++-------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 0 package.json | 3 +- 10 files changed, 61 insertions(+), 44 deletions(-) delete mode 100644 ios/Alipay.h create mode 100644 ios/RNAlipay.h rename ios/{Alipay.m => RNAlipay.m} (97%) rename ios/{Alipay.podspec => RNAlipay.podspec} (60%) rename ios/{Alipay.xcodeproj => RNAlipay.xcodeproj}/project.pbxproj (85%) rename ios/{Alipay.xcworkspace => RNAlipay.xcworkspace}/contents.xcworkspacedata (70%) rename ios/{Alipay.xcworkspace => RNAlipay.xcworkspace}/xcshareddata/IDEWorkspaceChecks.plist (100%) diff --git a/README.md b/README.md index bb9dd54..7b3d059 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ 4. 调试请注意 支付宝接入应用必须 `已审核通过` 状态。 5. 支付宝开放平台-管理中心，签约 `APP支付` 和 `APP支付宝登录` 功能。 6. 适用于 `react-native >= 0.60+` 低版本未测试。 +7. AlipaySDK 15.7.7 已更新到最新的支付宝 SDK 版本。 ## 安装依赖 @@ -203,7 +204,7 @@ Alipay.alipay(payInfo, (res)=>console.log(res)) 当前工程基于 [@brodybits/create-react-native-module](https://github.com/brodybits/create-react-native-module) 初始化。 ```bash -npx create-react-native-module --package-identifier com.uiwjs --generate-example Alipay --example-react-native-version 0.62.2 --module-name react-native-uiwjs-alipay --github-account uiwjs --author-name "Kenny Wong" --author-email "wowohoo@qq.com" +npx create-react-native-module --package-identifier com.uiwjs --object-class-name RNAlipay --generate-example Alipay --example-react-native-version 0.63.0 --module-name @uiw/react-native-alipay --github-account uiwjs --author-name "Kenny Wong" --author-email "wowohoo@qq.com" ``` ## 相关连接 diff --git a/index.js b/index.js index e73399e..37bce7e 100644 --- a/index.js +++ b/index.js @@ -7,7 +7,7 @@ export default class Alipay { * @returns result 支付宝回调结果 https://docs.open.alipay.com/204/105301 */ static alipay(orderInfo) { - return NativeModules.Alipay.alipay(orderInfo); + return NativeModules.RNAlipay.alipay(orderInfo); } /** @@ -16,7 +16,7 @@ export default class Alipay { * @returns result 支付宝回调结果 详情见 https://opendocs.alipay.com/open/218/105325 */ static authInfo(authInfoStr) { - return NativeModules.Alipay.authInfo(authInfoStr) + return NativeModules.RNAlipay.authInfo(authInfoStr) } /** @@ -24,7 +24,7 @@ export default class Alipay { * @return 当前版本字符串 */ static getVersion() { - return NativeModules.Alipay.getVersion() + return NativeModules.RNAlipay.getVersion() } /** @@ -33,7 +33,7 @@ export default class Alipay { */ static setAlipayScheme(scheme) { if (Platform.OS === 'ios') { - NativeModules.Alipay.setAlipayScheme(scheme); + NativeModules.RNAlipay.setAlipayScheme(scheme); } } @@ -43,7 +43,7 @@ export default class Alipay { */ static setAlipaySandbox(isSandBox) { if (Platform.OS === 'android') { - NativeModules.Alipay.setAlipaySandbox(isSandBox); + NativeModules.RNAlipay.setAlipaySandbox(isSandBox); } } } diff --git a/ios/Alipay.h b/ios/Alipay.h deleted file mode 100644 index 4c33297..0000000 --- a/ios/Alipay.h +++ /dev/null @@ -1,5 +0,0 @@ -#import - -@interface Alipay : NSObject - -@end diff --git a/ios/RNAlipay.h b/ios/RNAlipay.h new file mode 100644 index 0000000..434e144 --- /dev/null +++ b/ios/RNAlipay.h @@ -0,0 +1,9 @@ +#if __has_include("RCTBridgeModule.h") +#import "RCTBridgeModule.h" +#else +#import +#endif + +@interface RNAlipay : NSObject + +@end diff --git a/ios/Alipay.m b/ios/RNAlipay.m similarity index 97% rename from ios/Alipay.m rename to ios/RNAlipay.m index 9f8ed81..128e497 100644 --- a/ios/Alipay.m +++ b/ios/RNAlipay.m @@ -1,16 +1,15 @@ -#import "Alipay.h" +#import "RNAlipay.h" #import -@interface Alipay () +@interface RNAlipay () @property (nonatomic, copy) RCTPromiseResolveBlock payOrderResolve; @end -@implementation Alipay +@implementation RNAlipay { NSString *alipayScheme; - RCTResponseSenderBlock alipayCallBack; } RCT_EXPORT_MODULE() @@ -84,6 +83,7 @@ RCT_EXPORT_MODULE() return NO; } + RCT_EXPORT_METHOD(setAlipayScheme:(NSString *)scheme) { alipayScheme = scheme; } diff --git a/ios/Alipay.podspec b/ios/RNAlipay.podspec similarity index 60% rename from ios/Alipay.podspec rename to ios/RNAlipay.podspec index c0f7ea3..2ea7b3e 100644 --- a/ios/Alipay.podspec +++ b/ios/RNAlipay.podspec @@ -1,24 +1,25 @@ require "json" -package = JSON.parse(File.read(File.join(__dir__, "..", "package.json"))) +package = JSON.parse(File.read(File.join(__dir__, '..', "package.json"))) Pod::Spec.new do |s| - s.name = "Alipay" + s.name = "RNAlipay" s.version = package["version"] s.summary = package["description"] s.description = <<-DESC - Alipay SDK for React Native + Alipay SDK for React Native DESC - s.homepage = "https://github.com/uiwjs/react-native-alipay" + s.homepage = package['repository']['url'] # brief license entry: - s.license = "MIT" + s.license = package["license"] + s.author = { package["author"]["name"] => package["author"]["email"] } # optional - use expanded license entry instead: # s.license = { :type => "MIT", :file => "LICENSE" } - s.authors = { "Kenny Wong" => "wowohoo@qq.com" } s.platforms = { :ios => "9.0" } s.source = { :git => "https://github.com/uiwjs/react-native-alipay.git", :tag => "#{s.version}" } - s.source_files = "ios/**/*.{h,c,m,swift}" + s.source_files = "**/*.{h,c,m,swift}" + # s.source_files = "**/*.{h,m}" s.requires_arc = true s.dependency "React" diff --git a/ios/Alipay.xcodeproj/project.pbxproj b/ios/RNAlipay.xcodeproj/project.pbxproj similarity index 85% rename from ios/Alipay.xcodeproj/project.pbxproj rename to ios/RNAlipay.xcodeproj/project.pbxproj index 21f444f..4a8ffea 100644 --- a/ios/Alipay.xcodeproj/project.pbxproj +++ b/ios/RNAlipay.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - B954DB6F24B48377005C7268 /* AlipaySDK in Frameworks */ = {isa = PBXBuildFile; fileRef = B954DB6E24B48377005C7268 /* AlipaySDK */; }; + B9EB6BD424BDF5E6001A2514 /* AlipaySDK in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB6BCF24BDF342001A2514 /* AlipaySDK */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -23,9 +23,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 134814201AA4EA6300B7C361 /* libAlipay.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAlipay.a; sourceTree = BUILT_PRODUCTS_DIR; }; - B954DB6C24B48352005C7268 /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = ""; }; - B954DB6E24B48377005C7268 /* AlipaySDK */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = AlipaySDK; path = AlipaySDK.framework/AlipaySDK; sourceTree = ""; }; + 134814201AA4EA6300B7C361 /* libRNAlipay.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNAlipay.a; sourceTree = BUILT_PRODUCTS_DIR; }; + B9EB6BCD24BDF163001A2514 /* AlipaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlipaySDK.framework; sourceTree = ""; }; + B9EB6BCF24BDF342001A2514 /* AlipaySDK */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = AlipaySDK; path = AlipaySDK.framework/AlipaySDK; sourceTree = ""; }; + B9EB6BD524BDF691001A2514 /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -33,7 +34,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B954DB6F24B48377005C7268 /* AlipaySDK in Frameworks */, + B9EB6BD424BDF5E6001A2514 /* AlipaySDK in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -43,7 +44,7 @@ 134814211AA4EA7D00B7C361 /* Products */ = { isa = PBXGroup; children = ( - 134814201AA4EA6300B7C361 /* libAlipay.a */, + 134814201AA4EA6300B7C361 /* libRNAlipay.a */, ); name = Products; sourceTree = ""; @@ -52,15 +53,16 @@ isa = PBXGroup; children = ( 134814211AA4EA7D00B7C361 /* Products */, - B954DB6B24B48352005C7268 /* Frameworks */, + B9EB6BCC24BDF163001A2514 /* Frameworks */, ); sourceTree = ""; }; - B954DB6B24B48352005C7268 /* Frameworks */ = { + B9EB6BCC24BDF163001A2514 /* Frameworks */ = { isa = PBXGroup; children = ( - B954DB6E24B48377005C7268 /* AlipaySDK */, - B954DB6C24B48352005C7268 /* AlipaySDK.bundle */, + B9EB6BD524BDF691001A2514 /* AlipaySDK.bundle */, + B9EB6BCF24BDF342001A2514 /* AlipaySDK */, + B9EB6BCD24BDF163001A2514 /* AlipaySDK.framework */, ); name = Frameworks; sourceTree = ""; @@ -68,9 +70,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 58B511DA1A9E6C8500147676 /* Alipay */ = { + 58B511DA1A9E6C8500147676 /* RNAlipay */ = { isa = PBXNativeTarget; - buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "Alipay" */; + buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNAlipay" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, 58B511D81A9E6C8500147676 /* Frameworks */, @@ -80,9 +82,9 @@ ); dependencies = ( ); - name = Alipay; + name = RNAlipay; productName = RCTDataManager; - productReference = 134814201AA4EA6300B7C361 /* libAlipay.a */; + productReference = 134814201AA4EA6300B7C361 /* libRNAlipay.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -99,7 +101,7 @@ }; }; }; - buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "Alipay" */; + buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNAlipay" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; @@ -112,7 +114,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 58B511DA1A9E6C8500147676 /* Alipay */, + 58B511DA1A9E6C8500147676 /* RNAlipay */, ); }; /* End PBXProject section */ @@ -242,6 +244,10 @@ 58B511F01A9E6C8500147676 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, @@ -250,7 +256,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = Alipay; + PRODUCT_NAME = RNAlipay; SKIP_INSTALL = YES; }; name = Debug; @@ -258,6 +264,10 @@ 58B511F11A9E6C8500147676 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, @@ -266,7 +276,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = Alipay; + PRODUCT_NAME = RNAlipay; SKIP_INSTALL = YES; }; name = Release; @@ -274,7 +284,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "Alipay" */ = { + 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNAlipay" */ = { isa = XCConfigurationList; buildConfigurations = ( 58B511ED1A9E6C8500147676 /* Debug */, @@ -283,7 +293,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "Alipay" */ = { + 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNAlipay" */ = { isa = XCConfigurationList; buildConfigurations = ( 58B511F01A9E6C8500147676 /* Debug */, diff --git a/ios/Alipay.xcworkspace/contents.xcworkspacedata b/ios/RNAlipay.xcworkspace/contents.xcworkspacedata similarity index 70% rename from ios/Alipay.xcworkspace/contents.xcworkspacedata rename to ios/RNAlipay.xcworkspace/contents.xcworkspacedata index fb6e0c1..a48836d 100644 --- a/ios/Alipay.xcworkspace/contents.xcworkspacedata +++ b/ios/RNAlipay.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "group:RNAlipay.xcodeproj"> diff --git a/ios/Alipay.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/RNAlipay.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from ios/Alipay.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to ios/RNAlipay.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/package.json b/package.json index 161086b..2f93726 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "name": "@uiw/react-native-alipay", "version": "2.0.6", - "description": "基于 React Native 的宝支付插件，支持Android/iOS。", + "description": "基于 React Native 的支付宝插件，支持Android/iOS。", "main": "index.js", "files": [ "README.md", "android", "index.js", + "index.d.ts", "ios", "react-native-alipay.podspec" ],