Merge pull request #8 from finogeeks/fix/sdk-init

chore: 更新项目 demo

Author: Elric-pp

.editorconfig

@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf

.flowconfig

@@ -8,10 +8,6 @@
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*
 
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-node_modules/warning/.*
-
 ; Flow doesn't support platforms
 .*/Libraries/Utilities/LoadingView.js
 
@@ -27,8 +23,7 @@ node_modules/react-native/flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
+exact_by_default=true
 
 module.file_ext=.js
 module.file_ext=.json
@@ -44,10 +39,6 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
 [lints]
 sketchy-null-number=warn
 sketchy-null-mixed=warn
@@ -56,10 +47,8 @@ untyped-type-import=warn
 nonstrict-import=warn
 deprecated-type=warn
 unsafe-getters-setters=warn
-inexact-spread=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
-deprecated-utility=error
 
 [strict]
 deprecated-type
@@ -71,4 +60,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.113.0
+^0.149.0

.gitattributes

@@ -1,3 +1,3 @@
-*.pbxproj -text
-*.* linguist-language=javascript
-
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

.prettierrc.js

@@ -3,4 +3,5 @@ module.exports = {
   jsxBracketSameLine: true,
   singleQuote: true,
   trailingComma: 'all',
+  arrowParens: 'avoid',
 };

App.js

@@ -8,17 +8,17 @@
  * https://github.com/facebook/react-native
  */
 
-import React, { Component } from 'react';
-import { Platform, StyleSheet, Text, View, Button } from 'react-native';
+import React, {Component} from 'react';
+import {Platform, StyleSheet, Text, View, Button} from 'react-native';
 import MopSDK from 'react-native-mopsdk';
 const onPressOpenCanvasApplet = () => {
-  MopSDK.openApplet('5ea03fa563cb900001d73863', '', '', (data) => { });
+  MopSDK.openApplet('5ea03fa563cb900001d73863', '', '', data => {});
 };
 const onPressOpenDemoApplet = () => {
-  MopSDK.openApplet('5ea0401463cb900001d73865', '', '', (data) => { });
+  MopSDK.openApplet('5ea0401463cb900001d73865', '', '', data => {});
 };
 const onPressOpenProfileApplet = () => {
-  MopSDK.openApplet('5ea0412663cb900001d73867', '', '', (data) => { });
+  MopSDK.openApplet('5ea0412663cb900001d73867', '', '', data => {});
 };
 export default class App extends Component<{}> {
   state = {
@@ -30,10 +30,10 @@ export default class App extends Component<{}> {
       {
         appkey: '22LyZEib0gLTQdU3MUauASlb4KFRNRajt4RmY6UDSucA',
         secret: 'c5cc7a8c14a2b04a',
-        apiServer: 'https://mp.finogeeks.com',
+        apiServer: 'https://api.finclip.com',
         apiPrefix: '/api/v1/mop',
       },
-      (data) => {
+      data => {
         console.log('message;', data);
         const s = JSON.stringify(data);
         this.setState({

Readme.md

@@ -24,30 +24,30 @@ System:
     Memory: 93.87 MB / 16.00 GB
     Shell: 3.2.57 - /bin/bash
   Binaries:
-    Node: 10.20.1 - ~/.nvm/versions/node/v10.20.1/bin/node
+    Node: 16.4.0 - ~/.nvm/versions/node/v10.20.1/bin/node
     Yarn: 1.22.4 - ~/.nvm/versions/node/v10.20.1/bin/yarn
-    npm: 6.14.4 - ~/.nvm/versions/node/v10.20.1/bin/npm
+    npm: 7.18.1 - ~/.nvm/versions/node/v10.20.1/bin/npm
     Watchman: Not Found
   Managers:
-    CocoaPods: 1.9.1 - /usr/local/bin/pod
+    CocoaPods: 1.10.1 - /usr/local/bin/pod
   SDKs:
     iOS SDK:
-      Platforms: iOS 13.4, DriverKit 19.0, macOS 10.15, tvOS 13.4, watchOS 6.2
+      Platforms: iOS 14.4, DriverKit 20.2, macOS 11.1, tvOS 14.3, watchOS 7.2
     Android SDK:
-      API Levels: 26, 28, 29
-      Build Tools: 28.0.3, 29.0.2, 29.0.3, 30.0.0
-      System Images: android-26 | Google Play Intel x86 Atom
-      Android NDK: Not Found
+      API Levels: 22, 23, 24, 25, 26, 27, 28, 29, 30
+      Build Tools: 23.0.2, 23.0.3, 25.0.0, 26.0.2, 27.0.0, 27.0.3, 28.0.3, 29.0.2, 30.0.2
+      System Images: android-28 | Google APIs Intel x86 Atom, android-30 | Google APIs Intel x86 Atom
+      Android NDK: 21.3.6528147
   IDEs:
-    Android Studio: 3.6 AI-192.7142.36.36.6241897
-    Xcode: 11.4/11E146 - /usr/bin/xcodebuild
+    Android Studio: 4.0 AI-193.6911.18.40.6626763
+    Xcode: 12.4/12D4e - /usr/bin/xcodebuild
   Languages:
     Java: 10.0.1 - /Library/Java/JavaVirtualMachines/jdk-10.0.1.jdk/Contents/Home/bin/javac
     Python: 2.7.16 - /usr/bin/python
   npmPackages:
     @react-native-community/cli: Not Found
-    react: 16.11.0 => 16.11.0 
-    react-native: 0.62.2 => 0.62.2 
+    react: 17.0.2 => 17.0.2
+    react-native: 0.65.1 => 0.65.1
   npmGlobalPackages:
     *react-native*: Not Found
 
@@ -79,22 +79,44 @@ react-native init mopdemo
 1. 引入小程序引擎插件。在 package.json 文件中引入小程序 ReactNative 插件
 
 ```javascript
-"react-native-mopsdk": "^1.0.1"
+"react-native-mopsdk": "^1.0.2"
 ```
 
-2. 在 main.dart 文件中增加以下小程序引擎初始化方法。 Mop.instance.initialize 这里需要用到 sdkkey 和 secret。可以直接在[https://mp.finogeeks.com](https://mp.finogeeks.com) 免费注册获取。注册使用方法可以参考 [接入指引](https://mp.finogeeks.com/mop/document/introduce/access/mechanism.html)
+android 在 build.gradle 添加 maven 配置
+
+```bash
+  maven {
+      url "https://gradle.finogeeks.club/repository/applet/"
+      credentials {
+          username "applet"
+          password "123321"
+      }
+  }
+```
+
+iOS 需要重新 pod install
+
+2. 在 App.js 文件中增加以下小程序引擎初始化方法。 Mop.instance.initialize 这里需要用到 sdkkey 和 secret。可以直接在[https://mp.finogeeks.com](https://mp.finogeeks.com) 免费注册获取。注册使用方法可以参考 [接入指引](https://mp.finogeeks.com/mop/document/introduce/access/mechanism.html)
 
 ```javascript
 import MopSDK from 'react-native-mopsdk';
 // 1. mop初始化
-MopSDK.initialize({
-    appkey: '22LyZEib0gLTQdU3MUauASlb4KFRNRajt4RmY6UDSucA',
-    secret: '4a915e447bcbd439',
-    apiServer: 'https://mp.finogeeks.com',
-    apiPrefix: '/api/v1/mop'
-  }, (data) => {
-    console.log('message;', data);
-  });
+ MopSDK.initialize(
+      {
+        appkey: '22LyZEib0gLTQdU3MUauASlb4KFRNRajt4RmY6UDSucA',
+        secret: 'c5cc7a8c14a2b04a',
+        apiServer: 'https://api.finclip.com',
+        apiPrefix: '/api/v1/mop',
+      },
+      data => {
+        console.log('message;', data);
+        const s = JSON.stringify(data);
+        this.setState({
+          status: 'native callback received',
+          message: s,
+        });
+      },
+    );
 ```
 
 3. 打开小程序

android/app/BUCK

@@ -35,12 +35,12 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "com.example",
+    package = "com.finogeeks.mop.rnexample",
 )
 
 android_resource(
     name = "res",
-    package = "com.example",
+    package = "com.finogeeks.mop.rnexample",
     res = "src/main/res",
 )
 

android/app/build.gradle

@@ -20,7 +20,7 @@ import com.android.build.OutputFile
  *   // default. Can be overridden with ENTRY_FILE environment variable.
  *   entryFile: "index.android.js",
  *
- *   // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
+ *   // https://reactnative.dev/docs/performance#enable-the-ram-format
  *   bundleCommand: "ram-bundle",
  *
  *   // whether to bundle JS and assets in debug mode
@@ -121,12 +121,9 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    ndkVersion rootProject.ext.ndkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+    compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
         applicationId "com.finogeeks.mop.rnexample"
@@ -157,35 +154,24 @@ android {
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
-            // see https://facebook.github.io/react-native/docs/signed-apk-android.
+            // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 
-    packagingOptions {
-        pickFirst "lib/armeabi-v7a/libc++_shared.so"
-        pickFirst "lib/arm64-v8a/libc++_shared.so"
-        pickFirst "lib/x86/libc++_shared.so"
-        pickFirst "lib/x86_64/libc++_shared.so"
-        // libsdkcore.so是被加固过的，不能被压缩，否则加载动态库时会报错
-        doNotStrip "*/x86/libsdkcore.so"
-        doNotStrip "*/x86_64/libsdkcore.so"
-        doNotStrip "*/armeabi-v7a/libsdkcore.so"
-        doNotStrip "*/arm64-v8a/libsdkcore.so"
-    }
-
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
             }
 
         }
@@ -205,6 +191,7 @@ dependencies {
 
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
     }
 
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
@@ -223,7 +210,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

android/app/src/debug/AndroidManifest.xml

@@ -4,5 +4,10 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
 </manifest>

…java/com/example/ReactNativeFlipper.java …java/com/mopdemo/ReactNativeFlipper.javaandroid/app/src/debug/java/com/example/ReactNativeFlipper.java renamed to android/app/src/debug/java/com/mopdemo/ReactNativeFlipper.java android/app/src/debug/java/com/example/ReactNativeFlipper.java renamed to android/app/src/debug/java/com/mopdemo/ReactNativeFlipper.java

@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.example;
+package com.finogeeks.mop.rnexample;
 
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;