From 74304c0abfa19ba92a8a27508b946e7686ca2f61 Mon Sep 17 00:00:00 2001 From: Wannz Date: Fri, 29 Oct 2021 15:27:49 +0800 Subject: [PATCH 01/81] Update README.md --- README.md | 97 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 33fb9e9..6270e58 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,40 @@ -# 凡泰极客小程序 Flutter 插件 +

+ + + +

-本插件提供在 Flutter 运行环境中运行小程序能力。 +

+ FinClip Flutter SDK
+

+

+ 本项目提供在 Flutter 环境中运行小程序的能力 +

-## 集成 +

+ 👉 https://www.finclip.com/ 👈 +

-在项目pubspec.yaml文件中添加依赖 +----- +## 🤔 FinClip 是什么? -``` +有没有**想过**，开发好的微信小程序能放在自己的 APP 里直接运行，只需要开发一次小程序，就能在不同的应用中打开它，是不是很不可思议？ + +有没有**试过**，在自己的 APP 中引入一个 SDK ，应用中不仅可以打开小程序，还能自定义小程序接口，修改小程序样式，是不是觉得更不可思议？ + +这就是 FinClip ，就是有这么多不可思议！ + +## ⚙️ Flutter 集成 + +在项目 `pubspec.yaml` 文件中添加依赖 + +```yaml mop: latest.version ``` -## 示例 +## 🖥 示例 -``` +```flutter import 'package:flutter/material.dart'; import 'dart:async'; import 'dart:io'; @@ -34,7 +56,7 @@ class _MyAppState extends State { // Platform messages are asynchronous, so we initialize in an async method. Future init() async { - if (Platform.isIOS) { + if (Platform.isiOS) { //com.finogeeks.mopExample final res = await Mop.instance.initialize( '22LyZEib0gLTQdU3MUauARlLry7JL/2fRpscC9kpGZQA', '1c11d7252c53e0b6', @@ -115,15 +137,13 @@ class _MyAppState extends State { } ``` -## 接口文档 +## 📋 接口文档 -1. 初始化小程序 - -在使用sdk提供的api之前必须要初始化sdk，初始化sdk的接口为 +### 1. 初始化小程序 + + 在使用 SDK 提供的 API 之前必须要初始化 SDK ，初始化 SDK 的接口如下 ``` - - /// /// /// initialize mop miniprogram engine. /// 初始化小程序 @@ -137,18 +157,16 @@ class _MyAppState extends State { {String apiServer, String apiPrefix}) ``` -使用示例: - +使用示例： ``` final res = await Mop.instance.initialize( '22LyZEib0gLTQdU3MUauARlLry7JL/2fRpscC9kpGZQA', '1c11d7252c53e0b6', apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop'); ``` -2. 打开小程序 +### 2. 打开小程序 ``` - /// /// /// open the miniprogram [appId] from the mop server. /// 打开小程序 @@ -161,9 +179,9 @@ final res = await Mop.instance.initialize( {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 +193,7 @@ final res = await Mop.instance.initialize( Future> currentApplet() ``` -4. 关闭当前打开的所有小程序 +### 4. 关闭当前打开的所有小程序 ``` /// @@ -185,10 +203,9 @@ final res = await Mop.instance.initialize( Future closeAllApplets() ``` -5. 清除缓存的小程序 +### 5. 清除缓存的小程序 清除缓存的小程序，当再次打开时，会重新下载小程序 - ``` /// /// clear applets cache @@ -197,7 +214,7 @@ final res = await Mop.instance.initialize( Future clearApplets() ``` -6. 注册小程序事件处理 +### 6. 注册小程序事件处理 当小程序内触发指定事件时，会通知到使用者，比如小程序被转发，小程序需要获取用户信息，注册处理器来做出对应的响应 @@ -210,7 +227,6 @@ final res = await Mop.instance.initialize( ``` 处理器的结构 - ``` abstract class AppletHandler { /// @@ -238,19 +254,19 @@ abstract class AppletHandler { } ``` -7. 注册拓展api +### 7. 注册拓展 API -如果，我们的小程序SDK API不满足您的需求，您可以注册自定义的小程序API，然后就可以在小程序内调用自已定义的API了。 +如果，我们的小程序 SDK API 不满足您的需求，您可以注册自定义的小程序API，然后就可以在小程序内调用自已定义的 API 了。 -··· +``` /// /// register extension api /// 注册拓展api /// void registerExtensionApi(String name, ExtensionApiHandler handler) -··· +``` -ios需要在小程序根目录创建FinChatConf.js文件，配置实例如下 +iOS 需要在小程序根目录创建 `FinChatConf.js` 文件，配置实例如下 ``` module.exports = { @@ -263,4 +279,23 @@ module.exports = { } ] } -``` \ No newline at end of file +``` + +## 🔗 常用链接 +以下内容是您在 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) + +## ☎️ 联系我们 +微信扫描下面二维码，关注官方公众号 **「凡泰极客」**，获取更多精彩内容。
+ + +微信扫描下面二维码，邀请进官方微信交流群（加好友备注：finclip 咨询），获取更多精彩内容。
+ From efb8eadf27b9e9f536c2e9989ccc0cb444378757 Mon Sep 17 00:00:00 2001 From: Wannz Date: Mon, 8 Nov 2021 14:44:01 +0800 Subject: [PATCH 02/81] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6270e58..d0b5110 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,10 @@ 这就是 FinClip ，就是有这么多不可思议！ +## ⚠️ Flutter 环境使用请注意 + +由于 FinClip 小程序技术主要通过 SDK 向 APP 提供运行小程序的能力，您看到的本仓库中长期未更新的文件并非“年久失修”，我们始终保持在 Flutter 环境中相关的 SDK 的资源更新。如果您在集成使用过程中遇到任何问题，欢迎与我们联系。 + ## ⚙️ Flutter 集成 在项目 `pubspec.yaml` 文件中添加依赖 From 5afe55f6cd759a1f39cb61dfb4e3ff27a6a25045 Mon Sep 17 00:00:00 2001 From: Wannz Date: Mon, 8 Nov 2021 14:44:15 +0800 Subject: [PATCH 03/81] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0b5110..c569afb 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ 这就是 FinClip ，就是有这么多不可思议！ -## ⚠️ Flutter 环境使用请注意 +## ⚠️ Flutter 使用注意 由于 FinClip 小程序技术主要通过 SDK 向 APP 提供运行小程序的能力，您看到的本仓库中长期未更新的文件并非“年久失修”，我们始终保持在 Flutter 环境中相关的 SDK 的资源更新。如果您在集成使用过程中遇到任何问题，欢迎与我们联系。 From 660b03accfd9ad55737961ba94748c6de413b0c5 Mon Sep 17 00:00:00 2001 From: Wannz Date: Mon, 8 Nov 2021 14:45:14 +0800 Subject: [PATCH 04/81] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c569afb..2aa1ff7 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ ## ⚠️ Flutter 使用注意 -由于 FinClip 小程序技术主要通过 SDK 向 APP 提供运行小程序的能力，您看到的本仓库中长期未更新的文件并非“年久失修”，我们始终保持在 Flutter 环境中相关的 SDK 的资源更新。如果您在集成使用过程中遇到任何问题，欢迎与我们联系。 +由于 FinClip 小程序技术主要通过 SDK 向 APP 提供运行小程序的能力，您看到的本仓库中长期未更新的文件并非“年久失修”，我们始终保持在 Flutter 环境中 SDK 资源的定期更新。如果您在集成使用过程中遇到任何问题，欢迎与我们联系。 ## ⚙️ Flutter 集成 From 928d7750f1209dc597d41c98a9674d5fdea8ca1c Mon Sep 17 00:00:00 2001 From: Wannz Date: Sun, 14 Nov 2021 23:12:48 +0800 Subject: [PATCH 05/81] Update README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 2aa1ff7..eafe8bd 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,20 @@ 👉 https://www.finclip.com/ 👈

+
+ + + + + + + + + + + +
+ ----- ## 🤔 FinClip 是什么? From 8058b6327bce27cea781aca97c2b72723f09ab64 Mon Sep 17 00:00:00 2001 From: Wannz Date: Sun, 14 Nov 2021 23:16:34 +0800 Subject: [PATCH 06/81] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index eafe8bd..754c9d5 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,14 @@ + + +

+ +

+ +[官方网站](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) +
----- From 37ea8e298cd011d0dc9e06634ea5b42f2130a69f Mon Sep 17 00:00:00 2001 From: Elric Date: Fri, 10 Dec 2021 18:54:38 +0800 Subject: [PATCH 07/81] Create pull_request.yml --- .github/workflows/pull_request.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/pull_request.yml diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..b5872ff --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -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 }}"}' From f0b9add4ea28e6447e172ecb505909001f445ff7 Mon Sep 17 00:00:00 2001 From: Elric Date: Fri, 10 Dec 2021 18:55:49 +0800 Subject: [PATCH 08/81] Create issue.yml --- .github/workflows/issue.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/issue.yml diff --git a/.github/workflows/issue.yml b/.github/workflows/issue.yml new file mode 100644 index 0000000..cdb807e --- /dev/null +++ b/.github/workflows/issue.yml @@ -0,0 +1,17 @@ +name: Notify +on: + issues: + types: [opened] + issue_comment: + types: [created] +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - 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"}' From 6781a202d97956433f3afd0b8536b0fa7b294b15 Mon Sep 17 00:00:00 2001 From: Elric Date: Fri, 10 Dec 2021 18:56:07 +0800 Subject: [PATCH 09/81] Update issue.yml --- .github/workflows/issue.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/issue.yml b/.github/workflows/issue.yml index cdb807e..8a4587e 100644 --- a/.github/workflows/issue.yml +++ b/.github/workflows/issue.yml @@ -9,9 +9,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(github) }} - run: echo "$GITHUB_CONTEXT" - 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"}' From b663f1bf897ac09eb842879e48a8212c3ce9106a Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Sat, 23 Oct 2021 10:42:39 +0800 Subject: [PATCH 10/81] =?UTF-8?q?Android=20Major=E8=BF=AD=E4=BB=A3?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 42edc6a..32b0654 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.34.3' - implementation 'com.finogeeks.mop:plugins:2.34.3' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211023v01' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211023v01' } \ No newline at end of file From d09e093939a8f8fc9e83b23a303055834769da11 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Tue, 26 Oct 2021 10:21:55 +0800 Subject: [PATCH 11/81] Update SDK version --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 32b0654..93af635 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211023v01' - implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211023v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211026v01' + implementation 'com.finogeeks.mop:plugins:2.34.3' } \ No newline at end of file From 6da98f77985692091ed31c4b128f48733aa2c76b Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Tue, 26 Oct 2021 19:52:02 +0800 Subject: [PATCH 12/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 93af635..e033b03 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211026v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211026v02' implementation 'com.finogeeks.mop:plugins:2.34.3' } \ No newline at end of file From 1e27f673d38de37c53401571ca6d08885284da8d Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Thu, 28 Oct 2021 11:11:11 +0800 Subject: [PATCH 13/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index e033b03..776c2b5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211026v02' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211028v01' implementation 'com.finogeeks.mop:plugins:2.34.3' } \ No newline at end of file From 4886c7e38e79d4c4cf1264254ed77b209a089306 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Thu, 28 Oct 2021 15:10:52 +0800 Subject: [PATCH 14/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 776c2b5..5edff8e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211028v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211028v04' implementation 'com.finogeeks.mop:plugins:2.34.3' } \ No newline at end of file From 319512bea6e9e36e3ee621f8d84a799f9d48a744 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Mon, 1 Nov 2021 09:24:02 +0800 Subject: [PATCH 15/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 5edff8e..338bcdc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211028v04' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211101v01' implementation 'com.finogeeks.mop:plugins:2.34.3' } \ No newline at end of file From a6ab3349314378f4af5fab8c65efe24bfd01637f Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Tue, 2 Nov 2021 18:11:02 +0800 Subject: [PATCH 16/81] upgrade --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 338bcdc..eb68132 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211101v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211102v01' implementation 'com.finogeeks.mop:plugins:2.34.3' } \ No newline at end of file From 3ef3142c8b9574b11c7fae98828d7a868ae10191 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Wed, 3 Nov 2021 18:23:44 +0800 Subject: [PATCH 17/81] upgrade --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index eb68132..467f8b1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211102v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211103v01' implementation 'com.finogeeks.mop:plugins:2.34.3' } \ No newline at end of file From 4ea3fbb5f4657b13c98301f348c3f83eec1a0846 Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Thu, 4 Nov 2021 14:28:58 +0800 Subject: [PATCH 18/81] Update SDK version --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 467f8b1..3dd9b1e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211103v01' - implementation 'com.finogeeks.mop:plugins:2.34.3' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211104v01' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211104v01' } \ No newline at end of file From 74bd3e30bbf009a64b5726ade70f7fda2f92f60a Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 4 Nov 2021 16:37:50 +0800 Subject: [PATCH 19/81] version++ --- android/build.gradle | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3dd9b1e..55bb54c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211104v01' - implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211104v01' + implementation 'com.finogeeks.lib:finapplet:2.33.17' + implementation 'com.finogeeks.mop:plugins:2.33.17' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index d95f43c..34c876a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.3' +version: '2.33.17' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 6f8f4e42068097790f311d7c0de205dcc63b4f90 Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 5 Nov 2021 14:12:17 +0800 Subject: [PATCH 20/81] Update SDK version --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 55bb54c..ee8b689 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.33.17' - implementation 'com.finogeeks.mop:plugins:2.33.17' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211105v01' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211105v01' } \ No newline at end of file From 8da2fc786be134a50fd74beb33a9a741b62bd8ab Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 5 Nov 2021 16:33:03 +0800 Subject: [PATCH 21/81] Update SDK version --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ee8b689..7e52a27 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211105v01' - implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211105v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211105v03' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211105v02' } \ No newline at end of file From 393eb47aeff888ee6ece6bdf2fff7a0a61bea57c Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 5 Nov 2021 16:55:37 +0800 Subject: [PATCH 22/81] Update SDK version --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 7e52a27..e21fb12 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211105v03' - implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211105v02' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211105v04' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211104v01' } \ No newline at end of file From df6218171ae28c1e7fb1aafc955c0b3d4c588986 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 5 Nov 2021 19:56:38 +0800 Subject: [PATCH 23/81] version++ --- android/build.gradle | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e21fb12..d8796fa 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211105v04' - implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211104v01' + implementation 'com.finogeeks.lib:finapplet:2.34.5' + implementation 'com.finogeeks.mop:plugins:2.34.5' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 34c876a..bf62ceb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.33.17' +version: '2.34.5' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From d8f07ae7708a1edd377ffda23a220589c9e1af45 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Tue, 9 Nov 2021 10:21:15 +0800 Subject: [PATCH 24/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index d8796fa..091d80a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.34.5' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211109v01' implementation 'com.finogeeks.mop:plugins:2.34.5' } \ No newline at end of file From e703ed71b641b98bf6a460a5626f0a405abf013f Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Thu, 11 Nov 2021 09:38:01 +0800 Subject: [PATCH 25/81] upgrade --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 091d80a..190b777 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211109v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211111v02' implementation 'com.finogeeks.mop:plugins:2.34.5' } \ No newline at end of file From b93a8c9586c524c6092f85fc2d6aa86fe75cf758 Mon Sep 17 00:00:00 2001 From: yangbingqiao Date: Fri, 12 Nov 2021 14:27:55 +0800 Subject: [PATCH 26/81] =?UTF-8?q?gradle=20plugin=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E8=87=B33.5.4;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/build.gradle b/example/android/build.gradle index 9957ae3..1edbb3f 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.5.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61" } } From 593ed82eb1d7c54bf74916e288d5e3f002c58543 Mon Sep 17 00:00:00 2001 From: developer Date: Mon, 15 Nov 2021 12:48:19 +0800 Subject: [PATCH 27/81] release: version:2.34.5 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 0191af4..8964a66 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.3' - s.dependency 'FinAppletExt' , '2.34.3' + s.dependency 'FinApplet' , '2.34.5' + s.dependency 'FinAppletExt' , '2.34.5' end From f24afa7ea439ef300cbae1fb84d4314e6bed04cc Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Mon, 15 Nov 2021 17:16:00 +0800 Subject: [PATCH 28/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 190b777..5b9f4f4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211111v02' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211115v03' implementation 'com.finogeeks.mop:plugins:2.34.5' } \ No newline at end of file From 311c9436e296b249351b83b826daec0a1a29ae4c Mon Sep 17 00:00:00 2001 From: jizelin Date: Tue, 16 Nov 2021 21:47:25 +0800 Subject: [PATCH 29/81] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9EwebViewBoun?= =?UTF-8?q?ces=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=A6=81=E7=94=A8webview?= =?UTF-8?q?=E5=BC=B9=E6=80=A7=E8=A7=A3=E5=86=B3=E5=88=86=E9=A1=B5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/.flutter-plugins-dependencies | 2 +- example/pubspec.lock | 2 +- ios/Classes/Api/MOP_webViewBounces.h | 19 ++++++++++++++++ ios/Classes/Api/MOP_webViewBounces.m | 32 +++++++++++++++++++++++++++ ios/mop.podspec | 4 ++-- lib/mop.dart | 10 ++++++--- 6 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 ios/Classes/Api/MOP_webViewBounces.h create mode 100644 ios/Classes/Api/MOP_webViewBounces.m diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 7d3d40b..438deb6 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-09-10 20:41:42.050199","version":"2.2.2"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-11-15 23:44:20.482386","version":"2.2.2"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index e9626a4..310124c 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -87,7 +87,7 @@ packages: path: ".." relative: true source: path - version: "2.33.15" + version: "2.34.5" path: dependency: transitive description: diff --git a/ios/Classes/Api/MOP_webViewBounces.h b/ios/Classes/Api/MOP_webViewBounces.h new file mode 100644 index 0000000..0d15f9b --- /dev/null +++ b/ios/Classes/Api/MOP_webViewBounces.h @@ -0,0 +1,19 @@ +// +// MOP_webViewBounces.h +// mop +// +// Created by beetle_92 on 2021/11/16. +// + +#import +#import "MOPBaseApi.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MOP_webViewBounces : MOPBaseApi + +@property (nonatomic, assign) BOOL bounces; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Api/MOP_webViewBounces.m b/ios/Classes/Api/MOP_webViewBounces.m new file mode 100644 index 0000000..b3a084f --- /dev/null +++ b/ios/Classes/Api/MOP_webViewBounces.m @@ -0,0 +1,32 @@ +// +// MOP_webViewBounces.m +// mop +// +// Created by beetle_92 on 2021/11/16. +// + +#import "MOP_webViewBounces.h" +#import "MOPTools.h" + +@implementation MOP_webViewBounces + +- (void)setupApiWithSuccess:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel { + UIViewController *currentVC = [MOPTools topViewController]; + WKWebView *webView = [self searchWKWebView:currentVC.view]; + webView.scrollView.bounces = self.bounces; +} + +- (WKWebView *)searchWKWebView:(UIView *)view { + for (UIView *subview in view.subviews) { + if ([subview isKindOfClass:[WKWebView class]]) { + return (WKWebView *)subview; + } + WKWebView *webView = [self searchWKWebView:subview]; + if (webView) { + return webView; + } + } + return nil; +} + +@end diff --git a/ios/mop.podspec b/ios/mop.podspec index 8964a66..36ded5b 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.5' - s.dependency 'FinAppletExt' , '2.34.5' + s.dependency 'FinApplet' , '2.35.0-alpha20211116v012' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211116v12' end diff --git a/lib/mop.dart b/lib/mop.dart index 855078e..8c08066 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -54,9 +54,7 @@ class Mop { if (handler != null) { return await handler(call.arguments); } - } else if (call.method.startsWith("extensionApi:")) { - - } + } else if (call.method.startsWith("extensionApi:")) {} } /// @@ -242,4 +240,10 @@ class Mop { print(data); return data; } + + /// WKWebView的弹性设置 + void webViewBounces(bool bounces) async { + await _channel.invokeMapMethod("webViewBounces", {'bounces': bounces}); + return; + } } From 7326838e49a0ceba754f78d8aceb55be93054196 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Tue, 16 Nov 2021 08:28:36 +0800 Subject: [PATCH 30/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 5b9f4f4..d523b70 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211115v03' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211116v01' implementation 'com.finogeeks.mop:plugins:2.34.5' } \ No newline at end of file From 9207aa8c833dc85285a7a01d6ff18710f30ba0b1 Mon Sep 17 00:00:00 2001 From: wzy Date: Tue, 16 Nov 2021 10:51:55 +0800 Subject: [PATCH 31/81] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 00be1a1..9b9297b 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -51,6 +51,8 @@ return; } [[FATExtClient sharedClient] fat_prepareExtensionApis]; + [[FATExtClient sharedClient] fat_UsingMapType:@"FATExtMapStyleGD" MapKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; + [[FATClient sharedClient] setEnableLog:YES]; success(@{}); From c3a51ce4f05cadb3bbd9e46e760bf48e0016d53f Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Tue, 16 Nov 2021 23:39:22 +0800 Subject: [PATCH 32/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index d523b70..1555707 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211116v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211116v06' implementation 'com.finogeeks.mop:plugins:2.34.5' } \ No newline at end of file From e6c95fe8262c244c121efca7bb3378be1356cfe2 Mon Sep 17 00:00:00 2001 From: wzy Date: Thu, 18 Nov 2021 09:32:17 +0800 Subject: [PATCH 33/81] =?UTF-8?q?1.=E6=B3=A8=E9=87=8Astable=E5=88=86?= =?UTF-8?q?=E6=94=AF=E4=BC=9A=E6=8A=A5=E9=94=99=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 9b9297b..377af9f 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -51,7 +51,7 @@ return; } [[FATExtClient sharedClient] fat_prepareExtensionApis]; - [[FATExtClient sharedClient] fat_UsingMapType:@"FATExtMapStyleGD" MapKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; +// [[FATExtClient sharedClient] fat_UsingMapType:@"FATExtMapStyleGD" MapKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; [[FATClient sharedClient] setEnableLog:YES]; success(@{}); From 24f4341528a3abad13e3fb563cf070cb02540d9a Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Thu, 18 Nov 2021 17:34:32 +0800 Subject: [PATCH 34/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 1555707..17e1ea5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211116v06' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211118v07' implementation 'com.finogeeks.mop:plugins:2.34.5' } \ No newline at end of file From c85db5142be894e0fae6ffd43ecbfda656c7ad37 Mon Sep 17 00:00:00 2001 From: hujianhui Date: Thu, 18 Nov 2021 18:18:14 +0800 Subject: [PATCH 35/81] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=8B=93=E5=B1=95api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 377af9f..60fd032 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -50,7 +50,7 @@ failure(@"初始化失败"); return; } - [[FATExtClient sharedClient] fat_prepareExtensionApis]; +// [[FATExtClient sharedClient] fat_prepareExtensionApis]; // [[FATExtClient sharedClient] fat_UsingMapType:@"FATExtMapStyleGD" MapKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; [[FATClient sharedClient] setEnableLog:YES]; From de09863c12d146693ec0abf78f892f546d78f29b Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 19 Nov 2021 22:22:31 +0800 Subject: [PATCH 36/81] version++ --- android/build.gradle | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 17e1ea5..36b6f2d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211118v07' - implementation 'com.finogeeks.mop:plugins:2.34.5' + implementation 'com.finogeeks.lib:finapplet:2.34.7' + implementation 'com.finogeeks.mop:plugins:2.34.7' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index bf62ceb..70afe9a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.5' +version: '2.34.7' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 7d045231b36faf8dcdbabf8db9e8c6a3f903ee71 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Mon, 22 Nov 2021 16:42:29 +0800 Subject: [PATCH 37/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 36b6f2d..8f8c948 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.34.7' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211122v01' implementation 'com.finogeeks.mop:plugins:2.34.7' } \ No newline at end of file From f7e17566beccd8e556080c9754c94936ebbd8809 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Wed, 1 Dec 2021 10:03:16 +0800 Subject: [PATCH 38/81] upgrade --- android/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8f8c948..32ab6b2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -92,5 +92,7 @@ kapt { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211122v01' - implementation 'com.finogeeks.mop:plugins:2.34.7' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211201v01' + implementation 'com.finogeeks.mop:webrtc:2.35.0-alpha20211201v01' + implementation 'com.finogeeks.mop:map:2.35.0-alpha20211201v01' } \ No newline at end of file From 26dd288915016c54ede37345f9635efad2ee5ff1 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Fri, 3 Dec 2021 09:14:09 +0800 Subject: [PATCH 39/81] =?UTF-8?q?fix:Android=207.0=E5=8F=8A=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E7=AE=A1=E7=90=86=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AC=AC=E4=BA=8C=E6=AC=A1=E5=90=AF=E5=8A=A8=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/finogeeks/mop/api/mop/AppletModule.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java index 18ccd4e..15a7494 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java @@ -53,14 +53,18 @@ public class AppletModule extends BaseApi { String appId = String.valueOf(param.get("appId")); Integer sequence = (Integer) param.get("sequence"); Map params = (Map) param.get("params"); + // mContext是FlutterActivity， + // 在Android 6.0、7.0系统的部分设备中热启动小程序时，如果context参数用mContext，会出现无法启动小程序的问题 + // 所以这里使用Application Context + Context context = mContext.getApplicationContext(); if (params == null) { if (sequence == null) { - FinAppClient.INSTANCE.getAppletApiManager().startApplet(mContext, appId); + FinAppClient.INSTANCE.getAppletApiManager().startApplet(context, appId); } else { - FinAppClient.INSTANCE.getAppletApiManager().startApplet(mContext, appId, sequence, null); + FinAppClient.INSTANCE.getAppletApiManager().startApplet(context, appId, sequence, null); } } else { - FinAppClient.INSTANCE.getAppletApiManager().startApplet(mContext, appId, params); + FinAppClient.INSTANCE.getAppletApiManager().startApplet(context, appId, params); } // String apiServer = (String) param.get("apiServer"); // String apiPrefix = (String) param.get("apiPrefix"); From db02af9f70d2e46a545ac8f40fb65556ebb21149 Mon Sep 17 00:00:00 2001 From: wangtao Date: Fri, 3 Dec 2021 14:20:45 +0800 Subject: [PATCH 40/81] =?UTF-8?q?feat:=20podspec=E5=A2=9E=E5=8A=A0webrtc?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 2 ++ ios/mop.podspec | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 60fd032..296c898 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -8,6 +8,7 @@ #import "MOP_initialize.h" #import #import +#import @implementation MOP_initialize @@ -54,6 +55,7 @@ // [[FATExtClient sharedClient] fat_UsingMapType:@"FATExtMapStyleGD" MapKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; [[FATClient sharedClient] setEnableLog:YES]; + [FATWebRTCComponent registerComponent]; success(@{}); diff --git a/ios/mop.podspec b/ios/mop.podspec index 36ded5b..375c150 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,8 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211116v012' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211116v12' + s.dependency 'FinApplet' , '2.35.0-alpha20211203v06' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211203v06' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211203v06' end From a3bfa872c904b16259b7ba55d47f72d7d5f76999 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 3 Dec 2021 22:10:51 +0800 Subject: [PATCH 41/81] version++ --- android/build.gradle | 6 ++---- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 32ab6b2..aa883af 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,8 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211122v01' - implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211201v01' - implementation 'com.finogeeks.mop:webrtc:2.35.0-alpha20211201v01' - implementation 'com.finogeeks.mop:map:2.35.0-alpha20211201v01' + implementation 'com.finogeeks.lib:finapplet:2.34.9' + implementation 'com.finogeeks.mop:plugins:2.34.9' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 70afe9a..b4614b0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.7' +version: '2.34.9' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 3371497333ff1d523ecd8a1ef2eb32edf076426e Mon Sep 17 00:00:00 2001 From: developer Date: Fri, 3 Dec 2021 22:13:13 +0800 Subject: [PATCH 42/81] release: version:2.34.9 --- ios/mop.podspec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 375c150..cd980c6 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,8 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211203v06' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211203v06' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211203v06' + s.dependency 'FinApplet' , '2.34.9' + s.dependency 'FinAppletExt' , '2.34.9' end From d9f2521921bf144d15a6846f74dbbe9194bfdeed Mon Sep 17 00:00:00 2001 From: wangtao Date: Fri, 17 Dec 2021 15:55:25 +0800 Subject: [PATCH 43/81] =?UTF-8?q?fix:=20mop=E7=9A=84podspec=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BE=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 4 +++- ios/mop.podspec | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 296c898..428b045 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -9,6 +9,7 @@ #import #import #import +#import @implementation MOP_initialize @@ -53,7 +54,8 @@ } // [[FATExtClient sharedClient] fat_prepareExtensionApis]; // [[FATExtClient sharedClient] fat_UsingMapType:@"FATExtMapStyleGD" MapKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; - + + [FATGDMapComponent setGDMapAppKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; [[FATClient sharedClient] setEnableLog:YES]; [FATWebRTCComponent registerComponent]; success(@{}); diff --git a/ios/mop.podspec b/ios/mop.podspec index cd980c6..a4216fe 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,10 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.9' - s.dependency 'FinAppletExt' , '2.34.9' + s.dependency 'FinApplet' , '2.35.0-alpha20211217v01' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211217v01' + s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211217v01' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211217v01' + end From 3dc249044cdb24d123e4a712c7992684576332c5 Mon Sep 17 00:00:00 2001 From: wangtao Date: Thu, 23 Dec 2021 17:19:23 +0800 Subject: [PATCH 44/81] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=96=B0iOS?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E5=BA=93=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/mop.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index a4216fe..9f7c284 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,10 +17,10 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211217v01' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211217v01' - s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211217v01' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211217v01' + s.dependency 'FinApplet' , '2.35.0-alpha20211223v02' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211223v02' + s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211223v02' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211223v02' end From b964553fa7994a1aa48177c74874d93b67aca0e5 Mon Sep 17 00:00:00 2001 From: jizelin Date: Thu, 9 Dec 2021 15:18:35 +0800 Subject: [PATCH 45/81] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89master=E5=88=86?= =?UTF-8?q?=E6=94=AF=E4=B8=8Awebrtc=E7=9A=84=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 428b045..c90dff7 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -8,8 +8,7 @@ #import "MOP_initialize.h" #import #import -#import -#import +// #import @implementation MOP_initialize @@ -57,7 +56,7 @@ [FATGDMapComponent setGDMapAppKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; [[FATClient sharedClient] setEnableLog:YES]; - [FATWebRTCComponent registerComponent]; + // [FATWebRTCComponent registerComponent]; success(@{}); From f9ed67b4d8f255bcb95efe5e16ca29e6b843437d Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 9 Dec 2021 15:26:31 +0800 Subject: [PATCH 46/81] release: version:2.34.9.1 --- ios/mop.podspec | 7 ++----- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 9f7c284..cc69ae8 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,10 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211223v02' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211223v02' - s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211223v02' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211223v02' - + s.dependency 'FinApplet' , '2.34.9.1' + s.dependency 'FinAppletExt' , '2.34.9.1' end diff --git a/pubspec.yaml b/pubspec.yaml index b4614b0..2bcf0f9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.9' +version: '2.34.9.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From e29a0f23264f8769fa0940f898fde67d99b05e54 Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 9 Dec 2021 15:29:55 +0800 Subject: [PATCH 47/81] release: version:2.34.10 --- ios/mop.podspec | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index cc69ae8..39e03ca 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.9.1' - s.dependency 'FinAppletExt' , '2.34.9.1' + s.dependency 'FinApplet' , '2.34.10' + s.dependency 'FinAppletExt' , '2.34.10' end diff --git a/pubspec.yaml b/pubspec.yaml index 2bcf0f9..810d175 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.9.1' +version: '2.34.10' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From c4879bb36674c41e5d2626f02c7bf4e86814b449 Mon Sep 17 00:00:00 2001 From: jizelin Date: Thu, 9 Dec 2021 16:02:33 +0800 Subject: [PATCH 48/81] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9sdk?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 39e03ca..cd980c6 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.10' - s.dependency 'FinAppletExt' , '2.34.10' + s.dependency 'FinApplet' , '2.34.9' + s.dependency 'FinAppletExt' , '2.34.9' end From 83964cb70d87a8710c31e10880ec37341082e73f Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 9 Dec 2021 17:26:50 +0800 Subject: [PATCH 49/81] release: version:2.34.10 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index cd980c6..39e03ca 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.9' - s.dependency 'FinAppletExt' , '2.34.9' + s.dependency 'FinApplet' , '2.34.10' + s.dependency 'FinAppletExt' , '2.34.10' end From 2dc1a98c3ca23d0f8c656faf1d0728784391e72c Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 9 Dec 2021 17:48:40 +0800 Subject: [PATCH 50/81] release: version:2.34.10 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 39e03ca..cd980c6 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.10' - s.dependency 'FinAppletExt' , '2.34.10' + s.dependency 'FinApplet' , '2.34.9' + s.dependency 'FinAppletExt' , '2.34.9' end From ee5aeb523e3441ae358d2b4af8fadbb96b48de67 Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 9 Dec 2021 18:55:37 +0800 Subject: [PATCH 51/81] release: version:2.34.10.1 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 810d175..0deb4a1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.10' +version: '2.34.10.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 2e726acf76adfd5a189cb6be6b22d654f14d13df Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 9 Dec 2021 19:06:13 +0800 Subject: [PATCH 52/81] release: version:2.34.8 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 0deb4a1..82db333 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.10.1' +version: '2.34.8' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 82c5716af47a1c19be15f5c839e5c173492441f9 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 13 Dec 2021 09:19:02 +0800 Subject: [PATCH 53/81] upgrade --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index aa883af..40d5a09 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.34.9' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211213v01' implementation 'com.finogeeks.mop:plugins:2.34.9' } \ No newline at end of file From 43b85e5f1545d25c2c6ad45c2f1bda421ec82a2e Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Thu, 16 Dec 2021 14:36:00 +0800 Subject: [PATCH 54/81] upgrade --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 40d5a09..b64cbce 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211213v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211216v02' implementation 'com.finogeeks.mop:plugins:2.34.9' } \ No newline at end of file From 5451c717c13360ad89edb90b36970743f6cea9f2 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 17 Dec 2021 23:15:36 +0800 Subject: [PATCH 55/81] version++ --- android/build.gradle | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b64cbce..582262a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211216v02' - implementation 'com.finogeeks.mop:plugins:2.34.9' + implementation 'com.finogeeks.lib:finapplet:2.34.11' + implementation 'com.finogeeks.mop:plugins:2.34.11' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 82db333..06b92ea 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.8' +version: '2.34.11' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 10e01f27ee01c781eec33652a0a223cb5986ce9e Mon Sep 17 00:00:00 2001 From: developer Date: Fri, 17 Dec 2021 23:17:34 +0800 Subject: [PATCH 56/81] release: version:2.34.11 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index cd980c6..637578a 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.9' - s.dependency 'FinAppletExt' , '2.34.9' + s.dependency 'FinApplet' , '2.34.11' + s.dependency 'FinAppletExt' , '2.34.11' end From c1f23080eb95682888954d9bd3cea9943d52ddc4 Mon Sep 17 00:00:00 2001 From: jenkins Date: Sat, 18 Dec 2021 14:53:33 +0800 Subject: [PATCH 57/81] version++ --- android/build.gradle | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 582262a..e6a7106 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.34.11' - implementation 'com.finogeeks.mop:plugins:2.34.11' + implementation 'com.finogeeks.lib:finapplet:2.34.12' + implementation 'com.finogeeks.mop:plugins:2.34.12' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 06b92ea..5b1e732 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.11' +version: '2.34.12' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 06f05af4633b38758032f38bcc8b81dede0ca131 Mon Sep 17 00:00:00 2001 From: developer Date: Sat, 18 Dec 2021 14:55:32 +0800 Subject: [PATCH 58/81] release: version:2.34.12 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 637578a..4c79944 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.11' - s.dependency 'FinAppletExt' , '2.34.11' + s.dependency 'FinApplet' , '2.34.12' + s.dependency 'FinAppletExt' , '2.34.12' end From 67f1a79b66023f13c2945a8c9e36406d7a3acc23 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Wed, 29 Dec 2021 10:11:50 +0800 Subject: [PATCH 59/81] =?UTF-8?q?add=20=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/.flutter-plugins-dependencies | 2 +- .../contents.xcworkspacedata | 2 +- ios/Classes/Api/MOP_qrcodeOpenApplet.h | 18 +++++++++ ios/Classes/Api/MOP_qrcodeOpenApplet.m | 37 +++++++++++++++++++ ios/mop.podspec | 4 +- lib/mop.dart | 5 +++ 6 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 ios/Classes/Api/MOP_qrcodeOpenApplet.h create mode 100644 ios/Classes/Api/MOP_qrcodeOpenApplet.m diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 438deb6..ec9321b 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-11-15 23:44:20.482386","version":"2.2.2"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Gitlab/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Gitlab/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-12-29 10:07:33.662750","version":"2.3.0-1.0.pre.169"} \ No newline at end of file diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a1..919434a 100644 --- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/ios/Classes/Api/MOP_qrcodeOpenApplet.h b/ios/Classes/Api/MOP_qrcodeOpenApplet.h new file mode 100644 index 0000000..f9fdbf0 --- /dev/null +++ b/ios/Classes/Api/MOP_qrcodeOpenApplet.h @@ -0,0 +1,18 @@ +// +// MOP_scanOpenApplet.h +// mop +// +// Created by beetle_92 on 2021/6/7. +// + +#import "MOPBaseApi.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MOP_qrcodeOpenApplet : MOPBaseApi + +@property (nonatomic,copy) NSString *qrcode; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Api/MOP_qrcodeOpenApplet.m b/ios/Classes/Api/MOP_qrcodeOpenApplet.m new file mode 100644 index 0000000..527e5ea --- /dev/null +++ b/ios/Classes/Api/MOP_qrcodeOpenApplet.m @@ -0,0 +1,37 @@ +// +// MOP_scanOpenApplet.m +// mop +// +// Created by beetle_92 on 2021/6/7. +// + +#import "MOP_qrcodeOpenApplet.h" +#import "MOPTools.h" +#import + +@implementation MOP_qrcodeOpenApplet + +- (void)setupApiWithSuccess:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel { + NSLog(@"MOP_qrcodeOpenApplet:%@", self.qrcode); + FATAppletQrCodeRequest *qrcodeRequest = [[FATAppletQrCodeRequest alloc] init]; + qrcodeRequest.qrCode = self.qrcode; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + UIViewController *currentVC = [MOPTools topViewController]; + [[FATClient sharedClient] startAppletWithQrCodeRequest:qrcodeRequest inParentViewController:currentVC requestBlock:^(BOOL result, FATError *error) { + NSLog(@"请求完成：%@", error); + } completion:^(BOOL result, FATError *error) { + NSLog(@"打开完成：%@", error); + if (result){ + success(@{}); + } else { + failure(error.description); + } + } closeCompletion:^{ + NSLog(@"关闭"); + }]; + }); + +} + +@end diff --git a/ios/mop.podspec b/ios/mop.podspec index 4c79944..59e3ab1 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.34.12' - s.dependency 'FinAppletExt' , '2.34.12' + s.dependency 'FinApplet' , '2.35.0-alpha20211229v02' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211229v02' end diff --git a/lib/mop.dart b/lib/mop.dart index 8c08066..2dd8e92 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -178,6 +178,11 @@ class Mop { return await _channel.invokeMapMethod("scanOpenApplet", params); } + Future qrcodeOpenApplet(String qrcode) async { + Map params = {'qrcode': qrcode}; + return await _channel.invokeMapMethod("qrcodeOpenApplet", params); + } + /// /// 根据微信QrCode信息解析小程序信息 /// From f0cb4d289615c7c7a2c0c6bab3aaccd08d98a008 Mon Sep 17 00:00:00 2001 From: hujianhui Date: Wed, 22 Dec 2021 21:03:38 +0800 Subject: [PATCH 60/81] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=A1=8C?= =?UTF-8?q?=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOPAppletDelegate.m | 47 +++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index d01d99a..0b0390a 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -9,6 +9,12 @@ #import "MopPlugin.h" #import "MopCustomMenuModel.h" +@interface NSString (FATEncode) +- (NSString *)fat_encodeString; + +@end + + @implementation MOPAppletDelegate + (instancetype)instance @@ -87,6 +93,11 @@ [channel invokeMethod:@"extensionApi:onCustomMenuClick" arguments:arguments result:^(id _Nullable result) { }]; + + if ([@"Desktop" isEqualToString:customMenu.menuId]) { + [self addToDesktopItemClick:appletInfo path:path]; + } + } - (void)clickCustomItemMenuWithInfo:(NSDictionary *)contentInfo completion:(void (^)(FATExtensionCode code, NSDictionary *result))completion { @@ -102,6 +113,12 @@ }]; } +- (void)clickCustomItemMenuWithInfo:(NSDictionary *)contentInfo inApplet:(FATAppletInfo *)appletInfo completion:(void (^)(FATExtensionCode code, NSDictionary *result))completion { + if ([@"Desktop" isEqualToString:contentInfo[@"menuId"]]) { + [self addToDesktopItemClick:appletInfo path:contentInfo[@"path"]]; + } +} + - (void)applet:(NSString *)appletId didOpenCompletion:(NSError *)error { if (!appletId) { return; @@ -113,4 +130,34 @@ }]; } +static NSString *scheme = @"fatae55433be2f62915";//App对应的scheme + +- (void)addToDesktopItemClick:(FATAppletInfo *)appInfo path:(NSString *)path { + NSMutableString *herf = [NSString stringWithFormat:@"%@://applet/appid/%@?", scheme, appInfo.appId].mutableCopy; + NSString *query = [NSString stringWithFormat:@"apiServer=%@&path=%@",appInfo.apiServer, path]; + + if ([appInfo.startParams[@"query"] length]) { + query = [NSString stringWithFormat:@"%@&query=%@",query, appInfo.startParams[@"query"]]; + } + [herf appendString:query.fat_encodeString]; + + NSMutableString *url = [NSMutableString stringWithFormat:@"%@/mop/scattered-page/#/desktopicon", appInfo.apiServer]; + [url appendFormat:@"?iconpath=%@", appInfo.appAvatar]; + [url appendFormat:@"&apptitle=%@", appInfo.appTitle.fat_encodeString]; + [url appendFormat:@"&linkhref=%@", herf]; + + NSLog(@"跳转到中间页面:%@", url); + + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]]; +} + + +@end + +@implementation NSString (FATEncode) + +- (NSString *)fat_encodeString { + return (__bridge NSString *)CFURLCreateStringByAddingPercentEscapes( NULL, (__bridge CFStringRef)self, NULL, (CFStringRef)@"!*'();:@&=+$,/?%#[]", kCFStringEncodingUTF8); +} + @end From 98d2ecb95751ddfbf120b2c45ebba2cbaafbb4d8 Mon Sep 17 00:00:00 2001 From: hujianhui Date: Fri, 24 Dec 2021 15:02:17 +0800 Subject: [PATCH 61/81] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B7=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E4=B8=8D=E8=83=BD=E8=B7=B3=E8=BD=AC=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/MopPlugin.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ios/Classes/MopPlugin.m b/ios/Classes/MopPlugin.m index 3f51f4e..efa087b 100644 --- a/ios/Classes/MopPlugin.m +++ b/ios/Classes/MopPlugin.m @@ -88,6 +88,11 @@ static MopPlugin *_instance; - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options { + if (![FATClient sharedClient].inited) { + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [[FATClient sharedClient] handleOpenURL:url]; + }); + } return [[FATClient sharedClient] handleOpenURL:url]; } From 04665b39346d319d8b0bcc25eeff57a136a3a1dc Mon Sep 17 00:00:00 2001 From: hujianhui Date: Mon, 27 Dec 2021 18:22:04 +0800 Subject: [PATCH 62/81] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=A1=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOPAppletDelegate.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index 0b0390a..4a210d9 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -76,6 +76,9 @@ FATAppletMenuStyle style = [typeString isEqualToString:@"onMiniProgram"] ? FATAppletMenuStyleOnMiniProgram : FATAppletMenuStyleCommon; model.menuType = style; } + if ([@"Desktop" isEqualToString:model.menuId] && FATAppletVersionTypeRelease != appletInfo.appletVersionType) { + continue; + } [models addObject:model]; } From 1dce1597e0ea435100875e2c0401561ba2bfb92b Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Wed, 29 Dec 2021 11:15:34 +0800 Subject: [PATCH 63/81] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- .../finogeeks/mop/api/mop/AppletModule.java | 29 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e6a7106..9870b14 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.34.12' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211229v01' implementation 'com.finogeeks.mop:plugins:2.34.12' } \ No newline at end of file diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java index 15a7494..8345e46 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletModule.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import android.util.Log; import com.finogeeks.lib.applet.client.FinAppClient; +import com.finogeeks.lib.applet.interfaces.FinCallback; import com.finogeeks.lib.applet.sdk.model.StartAppletDecryptRequest; import com.finogeeks.mop.api.BaseApi; import com.finogeeks.mop.interfaces.ICallback; @@ -28,7 +29,7 @@ public class AppletModule extends BaseApi { @Override public String[] apis() { - return new String[]{"openApplet", "scanOpenApplet"}; + return new String[]{"openApplet", "scanOpenApplet","qrcodeOpenApplet"}; } @Override @@ -37,6 +38,8 @@ public class AppletModule extends BaseApi { openApplet(param, callback); } else if ("scanOpenApplet".equals(event)) { scanOpenApplet(param, callback); + } else if ("qrcodeOpenApplet".equals(event)){ + qrcodeOpenApplet(param,callback); } } @@ -109,4 +112,28 @@ public class AppletModule extends BaseApi { FinAppClient.INSTANCE.getAppletApiManager().startApplet(mContext, new StartAppletDecryptRequest(info)); callback.onSuccess(new HashMap()); } + + private void qrcodeOpenApplet(Map param, ICallback callback){ + String qrcode = String.valueOf(param.get("qrcode")); + FinAppClient.INSTANCE.getAppletApiManager().startAppletByQrcode(mContext, qrcode, new FinCallback() { + @Override + public void onSuccess(String s) { + callback.onSuccess(new HashMap()); + } + + @Override + public void onError(int i, String s) { + callback.onFail(new HashMap(){ + { + put("info",s); + } + }); + } + + @Override + public void onProgress(int i, String s) { + + } + }); + } } From c51007c1c2c37585ef2a35ed5d317fa348de42b8 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Wed, 29 Dec 2021 17:09:52 +0800 Subject: [PATCH 64/81] Update SDK version --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 9870b14..321b774 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211229v01' - implementation 'com.finogeeks.mop:plugins:2.34.12' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211229v09' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' } \ No newline at end of file From 76d6e111c8bf94b6001369a61c0d282c499ca9e8 Mon Sep 17 00:00:00 2001 From: wangtao Date: Wed, 29 Dec 2021 19:10:27 +0800 Subject: [PATCH 65/81] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0iOS=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96sdk=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/mop.podspec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 59e3ab1..c01b846 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,10 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211229v02' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211229v02' + s.dependency 'FinApplet' , '2.35.0-alpha20211229v14' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211229v14' + s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211229v14' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211229v14' + end From c797fd0c90a5959509b3578970b9612750915923 Mon Sep 17 00:00:00 2001 From: jizelin Date: Thu, 30 Dec 2021 16:16:02 +0800 Subject: [PATCH 66/81] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E8=8F=9C=E5=8D=95getCustomMenus=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=BANSArray?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/.flutter-plugins-dependencies | 2 +- example/pubspec.lock | 2 +- ios/Classes/Api/MOPAppletDelegate.m | 4 +++- ios/mop.podspec | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index ec9321b..64b440d 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Gitlab/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Gitlab/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-12-29 10:07:33.662750","version":"2.3.0-1.0.pre.169"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-12-30 16:09:08.189707","version":"2.2.2"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 310124c..4d1da1d 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -87,7 +87,7 @@ packages: path: ".." relative: true source: path - version: "2.34.5" + version: "2.34.12" path: dependency: transitive description: diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index 4a210d9..7ef475c 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -61,7 +61,9 @@ FlutterMethodChannel *channel = [[MopPlugin instance] methodChannel]; [channel invokeMethod:@"extensionApi:getCustomMenus" arguments:@{@"appId": appletInfo.appId} result:^(id _Nullable result) { CFRunLoopStop(CFRunLoopGetMain()); - list = result; + if ([result isKindOfClass:[NSArray class]]) { + list = result; + } }]; CFRunLoopRun(); diff --git a/ios/mop.podspec b/ios/mop.podspec index c01b846..4c50e34 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,10 +17,10 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211229v14' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211229v14' - s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211229v14' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211229v14' + s.dependency 'FinApplet' , '2.35.0-alpha20211230v01' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211230v01' + s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211230v01' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211230v01' end From 1c9ea01b85712cd44bf6761ddb1428b7fc715077 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Thu, 30 Dec 2021 08:39:50 +0800 Subject: [PATCH 67/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 321b774..8ff4d90 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211229v09' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v01' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' } \ No newline at end of file From b62a30c10186b73486fe28babd0e704792c726e6 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Thu, 30 Dec 2021 14:47:53 +0800 Subject: [PATCH 68/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8ff4d90..ffdd292 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v02' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' } \ No newline at end of file From d76d40dd662e511c38f1bbccd184c23cf99f9c70 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Thu, 30 Dec 2021 15:36:46 +0800 Subject: [PATCH 69/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index ffdd292..cb3759e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v02' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v03' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' } \ No newline at end of file From a54be12d3930f6d0cf8b2c5bccdb0192afb452ea Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Thu, 30 Dec 2021 16:34:49 +0800 Subject: [PATCH 70/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index cb3759e..74c5c6d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v03' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v04' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' } \ No newline at end of file From ab789bedadd9cb54b381954f76304f6b5deb9626 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Fri, 31 Dec 2021 09:23:52 +0800 Subject: [PATCH 71/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 74c5c6d..8add44e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211230v04' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211231v01' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' } \ No newline at end of file From 2572e6650f966a219d0a0f00e4780562facafe5b Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Fri, 31 Dec 2021 14:35:00 +0800 Subject: [PATCH 72/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8add44e..8e6c25c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211231v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211231v05' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' } \ No newline at end of file From 4cefc7eeec42192c43f53e0e9d5abc1fe1e390b2 Mon Sep 17 00:00:00 2001 From: hujianhui Date: Fri, 31 Dec 2021 18:28:14 +0800 Subject: [PATCH 73/81] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E6=A1=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOPAppletDelegate.m | 3 -- ios/Classes/MopPlugin.h | 1 + ios/Classes/MopPlugin.m | 48 ++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index 7ef475c..dab0502 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -78,9 +78,6 @@ FATAppletMenuStyle style = [typeString isEqualToString:@"onMiniProgram"] ? FATAppletMenuStyleOnMiniProgram : FATAppletMenuStyleCommon; model.menuType = style; } - if ([@"Desktop" isEqualToString:model.menuId] && FATAppletVersionTypeRelease != appletInfo.appletVersionType) { - continue; - } [models addObject:model]; } diff --git a/ios/Classes/MopPlugin.h b/ios/Classes/MopPlugin.h index 70db2b6..cd478db 100644 --- a/ios/Classes/MopPlugin.h +++ b/ios/Classes/MopPlugin.h @@ -8,6 +8,7 @@ @property MopEventStream *mopEventStreamHandler; @property FlutterMethodChannel *methodChannel; @property FlutterMethodChannel *shareMethodChannel; +@property FlutterMethodChannel *appletMethodChannel; + (instancetype) instance; @end diff --git a/ios/Classes/MopPlugin.m b/ios/Classes/MopPlugin.m index efa087b..26d2a08 100644 --- a/ios/Classes/MopPlugin.m +++ b/ios/Classes/MopPlugin.m @@ -48,6 +48,13 @@ static MopPlugin *_instance; binaryMessenger:[registrar messenger]]; [registrar addMethodCallDelegate:_instance channel:shareChannel]; _instance.shareMethodChannel = shareChannel; + + FlutterMethodChannel* appletChannel = [FlutterMethodChannel + methodChannelWithName:@"plugins.finosprite.finogeeks.com/applet" + binaryMessenger:[registrar messenger]]; + [registrar addMethodCallDelegate:_instance channel:appletChannel]; + _instance.appletMethodChannel = appletChannel; + } + (instancetype)instance{ @@ -58,7 +65,11 @@ static MopPlugin *_instance; - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { if ([@"getPlatformVersion" isEqualToString:call.method]) { result([@"iOS " stringByAppendingString:[[UIDevice currentDevice] systemVersion]]); - } else { + } + else if ([@"getAppletInfo" isEqualToString:call.method]) { + result([self appInfoDictWithAppId:call.arguments[@"appId"]]); + } + else { MOPApiRequest* request = [[MOPApiRequest alloc] init]; request.command = call.method; request.param = (NSDictionary*)call.arguments; @@ -106,4 +117,39 @@ static MopPlugin *_instance; return YES; } + +- (NSDictionary *)appInfoDictWithAppId:(NSString *)appId { + FATAppletInfo *info = [[FATClient sharedClient] currentApplet]; + if ([appId isEqualToString:info.appId]) { + NSMutableDictionary *dict = [NSMutableDictionary dictionary]; + dict[@"appId"] = info.appId; + switch (info.appletVersionType) { + case FATAppletVersionTypeRelease: { + dict[@"appType"] = @"release"; + break; + } + case FATAppletVersionTypeTrial: { + dict[@"appType"] = @"trial"; + break; + } + case FATAppletVersionTypeTemporary: { + dict[@"appType"] = @"temporary"; + break; + } + case FATAppletVersionTypeReview: { + dict[@"appType"] = @"review"; + break; + } + case FATAppletVersionTypeDevelopment: { + dict[@"appType"] = @"development"; + break; + } + + default: + break; + } + return dict; + } + return nil;; +} @end From c6fa7e7ca9377c331f4638ecd14a02fe07835f45 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Fri, 31 Dec 2021 17:40:26 +0800 Subject: [PATCH 74/81] =?UTF-8?q?update=20=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/mop.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 4c50e34..db40fbd 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,10 +17,10 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211230v01' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211230v01' - s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211230v01' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211230v01' + s.dependency 'FinApplet' , '2.35.0-alpha20211231v04' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211231v04' + s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211231v04' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211231v04' end From ab48f06aea855a34143d01af3838474bc2175110 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Fri, 31 Dec 2021 17:26:14 +0800 Subject: [PATCH 75/81] upgrade --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 8e6c25c..8fd14ed 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211231v05' - implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211229v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211231v09' + implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211231v09' } \ No newline at end of file From 81d4cf04da46c2050e8621f181ba2e1e38fb5546 Mon Sep 17 00:00:00 2001 From: developer Date: Fri, 31 Dec 2021 21:58:47 +0800 Subject: [PATCH 76/81] release: version:2.35.0 --- ios/mop.podspec | 7 ++----- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index db40fbd..129d3b9 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,10 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211231v04' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211231v04' - s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211231v04' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211231v04' - + s.dependency 'FinApplet' , '2.35.0' + s.dependency 'FinAppletExt' , '2.35.0' end diff --git a/pubspec.yaml b/pubspec.yaml index 5b1e732..6338e2d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.34.12' +version: '2.35.0' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 92623d87669cd4990d7b73aab7f932b4b2a915df Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Mon, 3 Jan 2022 18:50:10 +0800 Subject: [PATCH 77/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8fd14ed..1577080 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20211231v09' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20220103v02' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211231v09' } \ No newline at end of file From 81d1e48a1a17cb2c9dd592fae3f2e0352fe5dd5d Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Tue, 4 Jan 2022 08:57:50 +0800 Subject: [PATCH 78/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 1577080..163fd1b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20220103v02' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20220104v01' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211231v09' } \ No newline at end of file From e3f184c2f0b3dde1d8c4e99d1b866ce971c00193 Mon Sep 17 00:00:00 2001 From: wangtao Date: Tue, 4 Jan 2022 15:11:24 +0800 Subject: [PATCH 79/81] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9iOS?= =?UTF-8?q?=E5=9C=A89.0=E7=B3=BB=E7=BB=9F=E4=B8=8ABOOL=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.h | 4 ++-- ios/Classes/Api/MOP_webViewBounces.h | 2 +- ios/mop.podspec | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ios/Classes/Api/MOP_initialize.h b/ios/Classes/Api/MOP_initialize.h index 349c5a3..22f3ac9 100644 --- a/ios/Classes/Api/MOP_initialize.h +++ b/ios/Classes/Api/MOP_initialize.h @@ -17,8 +17,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NSString *apiPrefix; @property (nonatomic, copy) NSString *cryptType; @property (nonatomic, copy) NSString *userId; -@property (nonatomic, assign) BOOL disablePermission; -@property (nonatomic, assign) BOOL encryptServerData; +@property (nonatomic, assign) bool disablePermission; +@property (nonatomic, assign) bool encryptServerData; @end diff --git a/ios/Classes/Api/MOP_webViewBounces.h b/ios/Classes/Api/MOP_webViewBounces.h index 0d15f9b..3f4afde 100644 --- a/ios/Classes/Api/MOP_webViewBounces.h +++ b/ios/Classes/Api/MOP_webViewBounces.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @interface MOP_webViewBounces : MOPBaseApi -@property (nonatomic, assign) BOOL bounces; +@property (nonatomic, assign) bool bounces; @end diff --git a/ios/mop.podspec b/ios/mop.podspec index 129d3b9..5fa25e8 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,9 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0' - s.dependency 'FinAppletExt' , '2.35.0' + s.dependency 'FinApplet' , '2.35.0-alpha20211231v07' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211231v07' + s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211231v07' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211231v07' end From e0f05d12f6c3256164eefa557dc45532878d00d5 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Tue, 4 Jan 2022 17:45:01 +0800 Subject: [PATCH 80/81] Update SDK version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 163fd1b..f169d78 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20220104v01' + implementation 'com.finogeeks.lib:finapplet:2.35.0-alpha20220104v11' implementation 'com.finogeeks.mop:plugins:2.35.0-alpha20211231v09' } \ No newline at end of file From 9bc3ff42c1aae705dacde2ccd2622c30452ab840 Mon Sep 17 00:00:00 2001 From: developer Date: Wed, 5 Jan 2022 09:58:19 +0800 Subject: [PATCH 81/81] release: version:2.35.0 --- ios/mop.podspec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 5fa25e8..129d3b9 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,9 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211231v07' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211231v07' - s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211231v07' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211231v07' + s.dependency 'FinApplet' , '2.35.0' + s.dependency 'FinAppletExt' , '2.35.0' end