Merge pull request #55 from finogeeks/feat/dev

Feat/dev
finogeeks · Apr 12, 2024 · c8f31ac · c8f31ac
2 parents 24d5d7a + a8c12d6
commit c8f31ac
Show file tree

Hide file tree

Showing 10 changed files with 6,640 additions and 2,587 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -104,8 +104,8 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:"+REACT_NATIVE_VERSION  // From node_modules
-    implementation 'com.finogeeks.lib:finapplet:2.43.1-fix20240110v01'
-    implementation 'com.finogeeks.mop:plugins:2.43.1-fix20240110v01'
+    implementation 'com.finogeeks.lib:finapplet:2.43.11'
+    implementation 'com.finogeeks.mop:plugins:2.43.11'
 }
 
 def configureReactNativePom(def pom) {

diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.finogeeks.mop.rnsdk.FINMopSDKPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;

diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -1,4 +1,6 @@
 rootProject.name = 'example'
+include ':react-native-mopsdk'
+project(':react-native-mopsdk').projectDir = new File(rootProject.projectDir, '../../android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -12,6 +12,9 @@ target 'example' do
     :hermes_enabled => false
   )
 
+  #pod 'react-native-mopsdk', :path => '../node_modules/react-native-mopsdk'
+
+
   target 'exampleTests' do
     inherit! :complete
     # Pods for testing

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -10,7 +10,9 @@ PODS:
     - React-Core (= 0.67.4)
     - React-jsi (= 0.67.4)
     - ReactCommon/turbomodule/core (= 0.67.4)
-  - FinApplet (2.37.11)
+  - FinApplet (2.43.11)
+  - FinAppletExt (2.43.11):
+    - FinApplet (= 2.43.11)
   - Flipper (0.99.0):
     - Flipper-Folly (~> 2.6)
     - Flipper-RSocket (~> 1.4)
@@ -273,8 +275,9 @@ PODS:
   - React-jsinspector (0.67.4)
   - React-logger (0.67.4):
     - glog
-  - react-native-mopsdk (1.0.3):
-    - FinApplet (= 2.37.11)
+  - react-native-mopsdk (2.0.5):
+    - FinApplet (= 2.43.11)
+    - FinAppletExt (= 2.43.11)
     - React
   - React-perflogger (0.67.4)
   - React-RCTActionSheet (0.67.4):
@@ -406,6 +409,7 @@ SPEC REPOS:
   trunk:
     - CocoaAsyncSocket
     - FinApplet
+    - FinAppletExt
     - Flipper
     - Flipper-Boost-iOSX
     - Flipper-DoubleConversion
@@ -490,7 +494,8 @@ SPEC CHECKSUMS:
   DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: f7b0632c6437e312acf6349288d9aa4cb6d59030
   FBReactNativeSpec: 0f4e1f4cfeace095694436e7c7fcc5bf4b03a0ff
-  FinApplet: a79adb6841bd6090da812f5e5881d3d358aaf1b5
+  FinApplet: 963d24e7e7882df995787fc36e4f3e8821c06a3d
+  FinAppletExt: 00a9dd55133104599c67f55e0fa202fb045edc8f
   Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733
   Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
   Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
@@ -516,7 +521,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: cbdf37cebdc4f5d8b3d0bf5ccaa6147fd9de9f3d
   React-jsinspector: f4775ea9118cbe1f72b834f0f842baa7a99508d8
   React-logger: a1f028f6d8639a3f364ef80419e5e862e1115250
-  react-native-mopsdk: c31f8a61fbb33d204f472a73377523928251e8bd
+  react-native-mopsdk: ad1f182842c2eff9c7ab5ecc1827c63c4760fd54
   React-perflogger: 0afaf2f01a47fd0fc368a93bfbb5bd3b26db6e7f
   React-RCTActionSheet: 59f35c4029e0b532fc42114241a06e170b7431a2
   React-RCTAnimation: aae4f4bed122e78bdab72f7118d291d70a932ce2
@@ -532,6 +537,6 @@ SPEC CHECKSUMS:
   Yoga: d6b6a80659aa3e91aaba01d0012e7edcbedcbecd
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 50795087df91fcdd29fc726d1d49bcd6e1802e41
+PODFILE CHECKSUM: d60fe46f661afc87dd4ae3f36921ef502819c412
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3
diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj
@@ -383,12 +383,14 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-example-exampleTests/Pods-example-exampleTests-frameworks.sh",
 				"${PODS_ROOT}/FinApplet/FinApplet.framework",
+				"${PODS_ROOT}/FinAppletExt/FinAppletExt.framework",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FinApplet.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FinAppletExt.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
 			);
@@ -463,12 +465,14 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-frameworks.sh",
 				"${PODS_ROOT}/FinApplet/FinApplet.framework",
+				"${PODS_ROOT}/FinAppletExt/FinAppletExt.framework",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FinApplet.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FinAppletExt.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
 			);
@@ -666,7 +670,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.mop.rnexample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.finogeeks.finclip.demo;
 				PRODUCT_NAME = example;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;

diff --git a/example/ios/example/Info.plist b/example/ios/example/Info.plist
@@ -24,40 +24,40 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-  
-  <key>NSAppTransportSecurity</key>
-  <dict>
-    <key>NSAllowsArbitraryLoads</key>
-    <true/>
-  </dict>
-  <key>NSBluetoothPeripheralUsageDescription</key>
-  <string>是否允许【FinApplet】使用蓝牙？</string>
-  <key>NSCalendarsUsageDescription</key>
-  <string>是否允许【FinApplet】使用日历？</string>
-  <key>NSCameraUsageDescription</key>
-  <string>是否允许【FinApplet】使用你的相机？</string>
-  <key>NSContactsUsageDescription</key>
-  <string>开启同步通讯录信息，可智能补全客户资料。如果系统提示确认权限，请点击“好”。</string>
-  <key>NSLocationAlwaysUsageDescription</key>
-  <string>我们需要通过您的地理位置信息获取您周边的相关数据</string>
-  <key>NSLocationWhenInUseUsageDescription</key>
-  <string>我们需要通过您的地理位置信息获取您周边的相关数据</string>
-  <key>NSMicrophoneUsageDescription</key>
-  <string>是否允许【FinApplet】使用你的麦克风？</string>
-  <key>NSPhotoLibraryUsageDescription</key>
-  <string>是否允许【FinApplet】使用语相册？</string>
-  <key>UILaunchStoryboardName</key>
-  <string>LaunchScreen</string>
-  <key>UIRequiredDeviceCapabilities</key>
-  <array>
-    <string>armv7</string>
-  </array>
-  <key>UISupportedInterfaceOrientations</key>
-  <array>
-    <string>UIInterfaceOrientationPortrait</string>
-    <string>UIInterfaceOrientationLandscapeLeft</string>
-    <string>UIInterfaceOrientationLandscapeRight</string>
-  </array>
-  <key>UIViewControllerBasedStatusBarAppearance</key>
-  <false/></dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>是否允许【FinApplet】使用蓝牙？</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>是否允许【FinApplet】使用日历？</string>
+	<key>NSCameraUsageDescription</key>
+	<string>是否允许【FinApplet】使用你的相机？</string>
+	<key>NSContactsUsageDescription</key>
+	<string>开启同步通讯录信息，可智能补全客户资料。如果系统提示确认权限，请点击“好”。</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>我们需要通过您的地理位置信息获取您周边的相关数据</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>我们需要通过您的地理位置信息获取您周边的相关数据</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>是否允许【FinApplet】使用你的麦克风？</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>是否允许【FinApplet】使用语相册？</string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
 </plist>