fix conflict

master
wanghualei 2022-01-06 15:14:32 +08:00
commit 84bbb30798
4 changed files with 118 additions and 34 deletions

13
.github/workflows/issue.yml vendored 100644
View File

@ -0,0 +1,13 @@
name: Notify
on:
issues:
types: [opened]
issue_comment:
types: [created]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Notify
run: curl --location --request POST 'https://api.finogeeks.club/api/v1/finstore/webhooks/61b331d79b3dad0001f72fa2/postreceive?nonce=jhd2QyrArsc' --header "Content-Type:application/json" --data-raw '{"msg":"仓库 ${{github.repository}} 有新的 issue"}'

View File

@ -0,0 +1,11 @@
name: Notify
on:
pull_request:
branches: [ master ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Notify
run: curl --location --request POST 'https://api.finogeeks.club/api/v1/finstore/webhooks/61b331d79b3dad0001f72fa2/postreceive?nonce=jhd2QyrArsc' --header "Content-Type:application/json" --data-raw '{"msg":"仓库 ${{github.repository}} 有新的 PR ${{ github.event.pull_request._links.html.href }}"}'

123
README.md
View File

@ -1,18 +1,66 @@
# Flutter <p align="center">
<a href="https://www.finclip.com?from=github">
<img width="auto" src="https://www.finclip.com/mop/document/images/logo.png">
</a>
</p>
Flutter <p align="center">
<strong>FinClip Flutter SDK</strong></br>
<p>
<p align="center">
Flutter
<p>
## <p align="center">
👉 <a href="https://www.finclip.com?from=github">https://www.finclip.com/</a> 👈
</p>
pubspec.yaml <div align="center">
``` <a href="#"><img src="https://img.shields.io/badge/%E4%B8%93%E5%B1%9E%E5%BC%80%E5%8F%91%E8%80%85-20000%2B-brightgreen"></a>
<a href="#"><img src="https://img.shields.io/badge/%E5%B7%B2%E4%B8%8A%E6%9E%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F-6000%2B-blue"></a>
<a href="#"><img src="https://img.shields.io/badge/%E5%B7%B2%E9%9B%86%E6%88%90%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%BA%94%E7%94%A8-75%2B-yellow"></a>
<a href="#"><img src="https://img.shields.io/badge/%E5%AE%9E%E9%99%85%E8%A6%86%E7%9B%96%E7%94%A8%E6%88%B7-2500%20%E4%B8%87%2B-orange"></a>
<a href="https://www.zhihu.com/org/finchat"><img src="https://img.shields.io/badge/FinClip--lightgrey?logo=zhihu&style=social"></a>
<a href="https://www.finclip.com/blog/"><img src="https://img.shields.io/badge/FinClip%20Blog--lightgrey?logo=ghost&style=social"></a>
</div>
<p align="center">
<div align="center">
[](https://www.finclip.com/) | [](https://www.finclip.com/#/market) | [](https://www.finclip.com/mop/document/) | [](https://www.finclip.com/mop/document/introduce/quickStart/cloud-server-deployment-guide.html) | [SDK ](https://www.finclip.com/mop/document/introduce/quickStart/intergration-guide.html) | [API ](https://www.finclip.com/mop/document/develop/api/overview.html) | [](https://www.finclip.com/mop/document/develop/component/overview.html) | [](https://www.finclip.com/mop/document/operate/safety.html)
</div>
-----
## 🤔 FinClip ?
**** APP
**** APP SDK
FinClip
## Flutter 使
FinClip SDK APP Flutter SDK 使
## Flutter
`pubspec.yaml`
```yaml
mop: latest.version mop: latest.version
``` ```
## ## 🖥
``` ```flutter
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
@ -34,7 +82,7 @@ class _MyAppState extends State<MyApp> {
// Platform messages are asynchronous, so we initialize in an async method. // Platform messages are asynchronous, so we initialize in an async method.
Future<void> init() async { Future<void> init() async {
if (Platform.isIOS) { if (Platform.isiOS) {
//com.finogeeks.mopExample //com.finogeeks.mopExample
final res = await Mop.instance.initialize( final res = await Mop.instance.initialize(
'22LyZEib0gLTQdU3MUauARlLry7JL/2fRpscC9kpGZQA', '1c11d7252c53e0b6', '22LyZEib0gLTQdU3MUauARlLry7JL/2fRpscC9kpGZQA', '1c11d7252c53e0b6',
@ -115,15 +163,13 @@ class _MyAppState extends State<MyApp> {
} }
``` ```
## ## 📋
1. ### 1.
使sdkapisdksdk 使 SDK API SDK SDK
``` ```
///
/// ///
/// initialize mop miniprogram engine. /// initialize mop miniprogram engine.
/// ///
@ -137,18 +183,16 @@ class _MyAppState extends State<MyApp> {
{String apiServer, String apiPrefix}) {String apiServer, String apiPrefix})
``` ```
使: 使
``` ```
final res = await Mop.instance.initialize( final res = await Mop.instance.initialize(
'22LyZEib0gLTQdU3MUauARlLry7JL/2fRpscC9kpGZQA', '1c11d7252c53e0b6', '22LyZEib0gLTQdU3MUauARlLry7JL/2fRpscC9kpGZQA', '1c11d7252c53e0b6',
apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop'); apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop');
``` ```
2. ### 2.
``` ```
///
/// ///
/// open the miniprogram [appId] from the mop server. /// open the miniprogram [appId] from the mop server.
/// ///
@ -161,9 +205,9 @@ final res = await Mop.instance.initialize(
{final String path, final String query, final int sequence}) {final String path, final String query, final int sequence})
``` ```
3. 使 ### 3. 使
appId,name,icon,description,version,thumbnail `appId`, `name`, `icon`, `description`, `version`, `thumbnail`
``` ```
/// ///
@ -175,7 +219,7 @@ final res = await Mop.instance.initialize(
Future<Map<String, dynamic>> currentApplet() Future<Map<String, dynamic>> currentApplet()
``` ```
4. ### 4.
``` ```
/// ///
@ -185,10 +229,9 @@ final res = await Mop.instance.initialize(
Future closeAllApplets() Future closeAllApplets()
``` ```
5. ### 5.
``` ```
/// ///
/// clear applets cache /// clear applets cache
@ -197,7 +240,7 @@ final res = await Mop.instance.initialize(
Future clearApplets() Future clearApplets()
``` ```
6. ### 6.
使 使
@ -210,7 +253,6 @@ final res = await Mop.instance.initialize(
``` ```
``` ```
abstract class AppletHandler { abstract class AppletHandler {
/// ///
@ -238,19 +280,19 @@ abstract class AppletHandler {
} }
``` ```
7. api ### 7. API
SDK APIAPIAPI SDK API API API
··· ```
/// ///
/// register extension api /// register extension api
/// api /// api
/// ///
void registerExtensionApi(String name, ExtensionApiHandler handler) void registerExtensionApi(String name, ExtensionApiHandler handler)
··· ```
iosFinChatConf.js iOS `FinChatConf.js`
``` ```
module.exports = { module.exports = {
@ -263,4 +305,23 @@ module.exports = {
} }
] ]
} }
``` ```
## 🔗
FinClip
- [FinClip ](https://www.finclip.com/#/home)
- [](https://www.finclip.com/#/market)
- [](https://www.finclip.com/mop/document/)
- [SDK ](https://www.finclip.com/mop/document/introduce/quickStart/intergration-guide.html)
- [](https://www.finclip.com/mop/document/develop/guide/structure.html)
- [iOS ](https://www.finclip.com/mop/document/runtime-sdk/ios/ios-integrate.html)
- [Android ](https://www.finclip.com/mop/document/runtime-sdk/android/android-integrate.html)
- [Flutter ](https://www.finclip.com/mop/document/runtime-sdk/flutter/flutter-integrate.html)
##
****<br>
<img width="150px" src="https://www.finclip.com/mop/document/images/ic_qr.svg">
finclip <br>
<img width="150px" src="https://finclip-homeweb-1251849568.cos.ap-guangzhou.myqcloud.com/images/ldy111.jpg">

View File

@ -8,8 +8,7 @@
#import "MOP_initialize.h" #import "MOP_initialize.h"
#import <FinApplet/FinApplet.h> #import <FinApplet/FinApplet.h>
#import <FinAppletExt/FinAppletExt.h> #import <FinAppletExt/FinAppletExt.h>
#import <FinAppletWebRTC/FinAppletWebRTC.h> // #import <FinAppletWebRTC/FinAppletWebRTC.h>
#import <FinAppletGDMap/FinAppletGDMap.h>
@implementation MOP_initialize @implementation MOP_initialize
@ -57,7 +56,7 @@
[FATGDMapComponent setGDMapAppKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; [FATGDMapComponent setGDMapAppKey:@"6f0f28c4138cbaa51aa5890e26996ea2"];
[[FATClient sharedClient] setEnableLog:YES]; [[FATClient sharedClient] setEnableLog:YES];
[FATWebRTCComponent registerComponent]; // [FATWebRTCComponent registerComponent];
success(@{}); success(@{});