From 9a14315e2a7e42548d65fa69ce1740c5c3546c04 Mon Sep 17 00:00:00 2001 From: wangyong Date: Thu, 9 Mar 2023 10:47:56 +0800 Subject: [PATCH 01/24] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mop.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/mop.dart b/lib/mop.dart index 2f18283..fb94edf 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -90,6 +90,9 @@ class UIConfig { //注入小程序统称appletText字符串，默认为“小程序”。 String? appletText; + ///是否使用我们内部实现的live组件（直播组件） + bool useNativeLiveComponent = false; + Map toMap() { return { "navigationTitleTextAttributes": navigationTitleTextAttributes, @@ -106,6 +109,7 @@ class UIConfig { "floatWindowConfig": floatWindowConfig?.toMap(), "progressBarColor": progressBarColor, "autoAdaptDarkMode": autoAdaptDarkMode, + "useNativeLiveComponent": useNativeLiveComponent, "appletText": appletText }; } From cf452cb0f4e691be3496a1978448d33235e33f62 Mon Sep 17 00:00:00 2001 From: wangyong Date: Thu, 9 Mar 2023 11:22:20 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=85=E5=90=ABX5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3SDK=E7=89=88=E6=9C=AC=E5=8F=B7?= 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 fe70af9..6e20cfd 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.39.9' - implementation 'com.finogeeks.mop:plugins:2.39.9' + implementation 'com.finogeeks.lib:finapplet:2.40.0-dev20230306v02' + implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230228v02' } \ No newline at end of file From d6c6d1fc101a3fc712c561ff3cc2a8ef843b0dd8 Mon Sep 17 00:00:00 2001 From: wangyong Date: Tue, 14 Mar 2023 16:44:47 +0800 Subject: [PATCH 03/24] =?UTF-8?q?X5=20CDN=20=E4=B8=8B=E8=BD=BD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 4 ++-- .../src/main/java/com/finogeeks/mop/api/mop/BaseModule.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 6e20cfd..a77a22c 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.40.0-dev20230306v02' - implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230228v02' + implementation 'com.finogeeks.lib:finapplet:2.40.0-dev20230314v01' + implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230309v01' } \ No newline at end of file diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java index 802b8e2..9b823a2 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java @@ -125,7 +125,10 @@ public class BaseModule extends BaseApi { .setDisableRequestPermissions(disablePermission) .setBindAppletWithMainProcess(bindAppletWithMainProcess) .setLogLevel(XLogLevel.LEVEL_VERBOSE) - .setXLogDir(new File(getContext().getExternalCacheDir(),"xlog")); + .setXLogDir(new File(getContext().getExternalCacheDir(),"xlog")) + .setUseLocalTbsCore(true) + .setTbsCoreUrl("https://www-cdn.finclip.com/sdk/x5/latest/"); + // .setPageCountLimit(pageCountLimit); if (customWebViewUserAgent != null) From 9a6e6b25febe30787e7fbbae75a4a7c16b7f14d1 Mon Sep 17 00:00:00 2001 From: wangyong Date: Wed, 15 Mar 2023 17:46:29 +0800 Subject: [PATCH 04/24] =?UTF-8?q?feat=EF=BC=9AX5=20CDN=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=81=9A=E6=88=90=E5=8F=AF=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/finogeeks/mop/api/mop/BaseModule.java | 15 +++++++++++++-- lib/mop.dart | 7 ++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java index 9b823a2..3f8964e 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java @@ -67,6 +67,17 @@ public class BaseModule extends BaseApi { if (disablePermission == null) { disablePermission = false; } + + Boolean useLocalTbsCore = (Boolean) param.get("useLocalTbsCore"); + if (useLocalTbsCore == null) { + useLocalTbsCore = false; + } + + String tbsCoreUrl = ""; + if (param.get("tbsCoreUrl") != null) { + tbsCoreUrl = (String) param.get("tbsCoreUrl"); + } + String userId = ""; if (param.get("userId") != null) { userId = (String) param.get("userId"); @@ -126,8 +137,8 @@ public class BaseModule extends BaseApi { .setBindAppletWithMainProcess(bindAppletWithMainProcess) .setLogLevel(XLogLevel.LEVEL_VERBOSE) .setXLogDir(new File(getContext().getExternalCacheDir(),"xlog")) - .setUseLocalTbsCore(true) - .setTbsCoreUrl("https://www-cdn.finclip.com/sdk/x5/latest/"); + .setUseLocalTbsCore(useLocalTbsCore) + .setTbsCoreUrl(tbsCoreUrl); // .setPageCountLimit(pageCountLimit); diff --git a/lib/mop.dart b/lib/mop.dart index fb94edf..02b325f 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -431,6 +431,9 @@ class Mop { String? customWebViewUserAgent, int? appletIntervalUpdateLimit, int? maxRunningApplet, + bool useLocalTbsCore = false, + String? tbsCoreUrl + }) async { List>? storeConfigs = finStoreConfigs?.map((e) => e.toMap()).toList(); @@ -451,7 +454,9 @@ class Mop { "uiConfig": uiConfig?.toMap(), "customWebViewUserAgent": customWebViewUserAgent, "appletIntervalUpdateLimit": appletIntervalUpdateLimit, - "maxRunningApplet": maxRunningApplet + "maxRunningApplet": maxRunningApplet, + "useLocalTbsCore": useLocalTbsCore, + "tbsCoreUrl": tbsCoreUrl }); return ret; } From 5b74c69f3df77aca59bcd8adda819a200375d98a Mon Sep 17 00:00:00 2001 From: wangyong Date: Wed, 15 Mar 2023 18:08:33 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=85=E5=90=ABX5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3SDK=E7=89=88=E6=9C=AC=E5=8F=B7?= 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 a77a22c..b74f32d 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.40.0-dev20230314v01' - implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230309v01' + implementation 'com.finogeeks.lib:finapplet:2.40.0-dev20230315v02' + implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230315v02' } \ No newline at end of file From 446814c2e81e846ca290621a6c64c50f74db716a Mon Sep 17 00:00:00 2001 From: yangbinqiao Date: Thu, 23 Mar 2023 20:41:06 +0800 Subject: [PATCH 06/24] =?UTF-8?q?opt=EF=BC=9A=E9=85=8D=E7=BD=AE=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 4 ++-- example/pubspec.lock | 51 +++++++++++++++++++------------------------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ed9f964..9d83e3a 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.40.0-dev20230323v02' - implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230323v02' + implementation 'com.finogeeks.lib:finapplet:2.41.0-dev20230323v02' + implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230323v02' } \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 86b7e85..6d1b398 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,28 +21,21 @@ packages: name: characters url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.flutter-io.cn" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +49,7 @@ packages: name: fake_async url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -94,28 +87,35 @@ packages: name: matcher url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.11" + version: "0.12.12" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.7.0" + version: "1.8.0" mop: dependency: "direct main" description: path: ".." relative: true source: path - version: "2.39.1" + version: "2.39.11" path: dependency: transitive description: name: path url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -127,7 +127,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.1" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -148,35 +148,28 @@ packages: name: string_scanner url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.3" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.0" + version: "0.4.12" vector_math: dependency: transitive description: name: vector_math url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.2.3" From 76fabf91878d548cb457204dc9f119f208543944 Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 24 Mar 2023 11:52:37 +0800 Subject: [PATCH 07/24] =?UTF-8?q?initSDK=E6=96=B0=E5=A2=9EuseLocalTbsCore?= =?UTF-8?q?=E3=80=81tbsCoreUrl=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=9Binitiali?= =?UTF-8?q?ze=E5=8E=BB=E9=99=A4useLocalTbsCore=E3=80=81tbsCoreUrl=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/finogeeks/mop/api/mop/BaseModule.java | 12 ------------ .../com/finogeeks/mop/api/mop/InitSDKModule.java | 6 +++++- lib/mop.dart | 16 +++++++++++----- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java index d18d5c4..23a049c 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java @@ -67,16 +67,6 @@ public class BaseModule extends BaseApi { disablePermission = false; } - Boolean useLocalTbsCore = (Boolean) param.get("useLocalTbsCore"); - if (useLocalTbsCore == null) { - useLocalTbsCore = false; - } - - String tbsCoreUrl = ""; - if (param.get("tbsCoreUrl") != null) { - tbsCoreUrl = (String) param.get("tbsCoreUrl"); - } - String userId = ""; if (param.get("userId") != null) { userId = (String) param.get("userId"); @@ -135,8 +125,6 @@ public class BaseModule extends BaseApi { .setLogLevel(XLogLevel.LEVEL_VERBOSE) .setXLogDir(new File(getContext().getExternalCacheDir(),"xlog")) .setPageCountLimit(pageCountLimit) - .setUseLocalTbsCore(useLocalTbsCore) - .setTbsCoreUrl(tbsCoreUrl); if (customWebViewUserAgent != null) builder.setCustomWebViewUserAgent(customWebViewUserAgent); diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/InitSDKModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/InitSDKModule.java index fe11cdd..12a2b92 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/InitSDKModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/InitSDKModule.java @@ -169,7 +169,11 @@ public class InitSDKModule extends BaseApi { configBuilder.setXLogDir(logDir); } configBuilder.setEnablePreNewProcess((Boolean) configMap.get("enablePreNewProcess")); - + configBuilder.setUseLocalTbsCore((Boolean) configMap.get("useLocalTbsCore")); + String tbsCoreUrl = (String) configMap.get("tbsCoreUrl"); + if (tbsCoreUrl != null) { + configBuilder.setTbsCoreUrl(tbsCoreUrl); + } Map uiConfigMap = (Map) param.get("uiConfig"); String appendingCustomUserAgent = (String) uiConfigMap.get("appendingCustomUserAgent"); if (appendingCustomUserAgent != null) { diff --git a/lib/mop.dart b/lib/mop.dart index f53f5d4..6b4db95 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -202,6 +202,14 @@ class Config { /// 是否提前创建进程 bool enablePreNewProcess = false; + /// Android属性 + /// 是否使用本地加载tbs内核 + bool useLocalTbsCore = false; + + /// Android属性 + /// tbs内核的下载地址，不包含文件名 + String? tbsCoreUrl; + Config(this.finStoreConfigs); Map toMap() { @@ -243,6 +251,8 @@ class Config { "logMaxAliveSec": logMaxAliveSec, "logDir": logDir, "enablePreNewProcess": enablePreNewProcess, + "useLocalTbsCore": useLocalTbsCore, + "tbsCoreUrl": tbsCoreUrl, }; } } @@ -964,9 +974,7 @@ class Mop { UIConfig? uiConfig, String? customWebViewUserAgent, int? appletIntervalUpdateLimit, - int? maxRunningApplet, - bool useLocalTbsCore = false, - String? tbsCoreUrl, + int? maxRunningApplet }) async { List>? storeConfigs = finStoreConfigs?.map((e) => e.toMap()).toList(); @@ -988,8 +996,6 @@ class Mop { "customWebViewUserAgent": customWebViewUserAgent, "appletIntervalUpdateLimit": appletIntervalUpdateLimit, "maxRunningApplet": maxRunningApplet, - "useLocalTbsCore": useLocalTbsCore, - "tbsCoreUrl": tbsCoreUrl }); return ret; } From 00d0014544e4e2040a357aa102078d8ffbc7bb2e Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 24 Mar 2023 12:23:22 +0800 Subject: [PATCH 08/24] fix error --- android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java index 23a049c..fcf43c4 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java @@ -124,7 +124,7 @@ public class BaseModule extends BaseApi { .setBindAppletWithMainProcess(bindAppletWithMainProcess) .setLogLevel(XLogLevel.LEVEL_VERBOSE) .setXLogDir(new File(getContext().getExternalCacheDir(),"xlog")) - .setPageCountLimit(pageCountLimit) + .setPageCountLimit(pageCountLimit); if (customWebViewUserAgent != null) builder.setCustomWebViewUserAgent(customWebViewUserAgent); From b882a23db1d565127ba83e3e40c34259d8fb579c Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 24 Mar 2023 12:41:14 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B8=E5=BF=83sdk?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 9d83e3a..89af1be 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.41.0-dev20230323v02' + implementation 'com.finogeeks.lib:finapplet:2.41.0-dev20230324v01' implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230323v02' } \ No newline at end of file From f73a1d5eccc4243f42cd99db0bebb87978784d0e Mon Sep 17 00:00:00 2001 From: wangyong Date: Fri, 24 Mar 2023 22:54:15 +0800 Subject: [PATCH 10/24] =?UTF-8?q?fix:Java=E5=B1=82=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E8=A1=A5=E9=BD=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/finogeeks/mop/api/mop/util/InitUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/util/InitUtils.java b/android/src/main/java/com/finogeeks/mop/api/mop/util/InitUtils.java index 2c104de..fc99ae9 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/util/InitUtils.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/util/InitUtils.java @@ -24,6 +24,7 @@ public class InitUtils { uiConfig.setHideFavoriteMenu((Boolean) map.get("isHideFavoriteMenu")); uiConfig.setHideSettingMenu((Boolean) map.get("isHideSettingMenu")); uiConfig.setHideTransitionCloseButton((Boolean) map.get("hideTransitionCloseButton")); + uiConfig.setUseNativeLiveComponent((Boolean) map.get("useNativeLiveComponent")); Map capsuleConfigMap = (Map) map.get("capsuleConfig"); if (capsuleConfigMap != null) { FinAppConfig.UIConfig.CapsuleConfig capsuleConfig = new FinAppConfig.UIConfig.CapsuleConfig(); From 86fde17579470b52c691af9c76d05081ff8ab6c9 Mon Sep 17 00:00:00 2001 From: yangbinqiao Date: Mon, 27 Mar 2023 15:38:07 +0800 Subject: [PATCH 11/24] =?UTF-8?q?update=EF=BC=9A=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=EF=BC=9B?= 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 89af1be..1802e72 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.41.0-dev20230324v01' - implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230323v02' + implementation 'com.finogeeks.lib:finapplet:2.41.0-alpha20230327v01' + implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230327v01' } \ No newline at end of file From 3abf4181444ab2c2067a5fab3360ed16052dc6bd Mon Sep 17 00:00:00 2001 From: wangyong Date: Sat, 8 Apr 2023 02:26:06 +0800 Subject: [PATCH 12/24] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= 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 9c2a4da..0ba8d31 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.40.3' - implementation 'com.finogeeks.mop:plugins:2.40.3' + implementation 'com.finogeeks.lib:finapplet:2.41.0-alpha20230408v01' + implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230408v01' } \ No newline at end of file From bb4f5e5f6c36d41856c4b8aca74c2f8821fae0cb Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Sun, 23 Apr 2023 16:32:53 +0800 Subject: [PATCH 13/24] merge conflict --- lib/mop.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/mop.dart b/lib/mop.dart index 80a00a3..74d6562 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -368,9 +368,6 @@ class UIConfig { /// Loading页回调Class String? loadingLayoutCls; - /// 是否使用我们内部实现的live组件（直播组件） - bool useNativeLiveComponent = false; - Map toMap() { return { "navigationTitleTextAttributes": navigationTitleTextAttributes, From 37b9f4dc897dd919197606955842d429299b7679 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 24 Apr 2023 13:57:11 +0800 Subject: [PATCH 14/24] 2.41.0-alpha20230424v01 --- android/build.gradle | 4 ++-- example/pubspec.lock | 34 +++++++++++++++++----------------- pubspec.lock | 28 ++++++++++++++-------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b7e2f95..1d22143 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.40.4-dev20230417v01' - implementation 'com.finogeeks.mop:plugins:2.40.4-dev20230417v01' + implementation 'com.finogeeks.lib:finapplet:2.41.0-alpha20230424v01' + implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230424v01' } \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 3013f95..091e767 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.flutter-io.cn" source: hosted - version: "1.16.0" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -75,7 +75,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.9" + version: "2.0.6" flutter_test: dependency: "direct dev" description: flutter @@ -95,13 +95,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.12.11" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.4" meta: dependency: transitive description: @@ -115,14 +108,14 @@ packages: path: ".." relative: true source: path - version: "2.40.1" + version: "2.40.3" path: dependency: transitive description: name: path url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.1" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -134,7 +127,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -169,14 +162,21 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.9" + version: "0.4.3" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.2" + version: "2.1.1" sdks: - dart: ">=2.17.0-0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=2.14.0 <3.0.0" + flutter: ">=2.2.3" diff --git a/pubspec.lock b/pubspec.lock index 7d68fe5..f39f99b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,14 +42,14 @@ packages: name: collection url: "https://pub.flutter-io.cn" source: hosted - version: "1.16.0" + version: "1.15.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -88,13 +88,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.12.11" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.4" meta: dependency: transitive description: @@ -108,7 +101,7 @@ packages: name: path url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.1" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -120,7 +113,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -155,14 +148,21 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.9" + version: "0.4.3" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.2" + version: "2.1.1" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.2.3" From 0a59f8d4b972accc5efc4311d8b8af0f173f10f3 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Fri, 5 May 2023 23:15:39 +0800 Subject: [PATCH 15/24] 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 1d22143..2ac5dcd 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.41.0-alpha20230424v01' - implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230424v01' + implementation 'com.finogeeks.lib:finapplet:2.41.0-dev20230505v02' + implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230505v02' } \ No newline at end of file From eb2386f0fd58beb2be864b3dc925c3f47c31fc40 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Sat, 6 May 2023 13:15:37 +0800 Subject: [PATCH 16/24] 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 2ac5dcd..6684f13 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.41.0-dev20230505v02' - implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230505v02' + implementation 'com.finogeeks.lib:finapplet:2.41.0-dev20230506v02' + implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230506v02' } \ No newline at end of file From a5e2d7212b3c93addcda65eb8595f3214ac957bc Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Sat, 6 May 2023 17:15:01 +0800 Subject: [PATCH 17/24] 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 6684f13..8be013c 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.41.0-dev20230506v02' - implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230506v02' + implementation 'com.finogeeks.lib:finapplet:2.41.0-dev20230506v03' + implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230506v03' } \ No newline at end of file From b265f1ae1f8d627cab53670fe0416ccea26dea8c Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Sat, 6 May 2023 22:08:44 +0800 Subject: [PATCH 18/24] 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 8be013c..a325f41 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.41.0-dev20230506v03' - implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230506v03' + implementation 'com.finogeeks.lib:finapplet:2.41.0-dev20230506v05' + implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230506v05' } \ No newline at end of file From 998a0f148137d15e9b236f0f28e97fb3faece9b8 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Sun, 7 May 2023 01:19:59 +0800 Subject: [PATCH 19/24] 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 a325f41..8687394 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.41.0-dev20230506v05' - implementation 'com.finogeeks.mop:plugins:2.41.0-dev20230506v05' + implementation 'com.finogeeks.lib:finapplet:2.41.0-alpha20230507v01' + implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230507v01' } \ No newline at end of file From 691c9ee3f1cdf6a825be7c158e2ecb66db728a69 Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 19 May 2023 23:44:11 +0800 Subject: [PATCH 20/24] 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 8687394..0a0f198 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.41.0-alpha20230507v01' - implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230507v01' + implementation 'com.finogeeks.lib:finapplet:2.41.0-alpha20230519v01' + implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230519v01' } \ No newline at end of file From a6929baa71630d6aab13d996eb5ee88c48f663cb Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Fri, 2 Jun 2023 22:00:16 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E5=8D=87=E7=BA=A7SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 0a0f198..8fdab9a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,7 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.41.0-alpha20230519v01' - implementation 'com.finogeeks.mop:plugins:2.41.0-alpha20230519v01' + def sdk_version = '2.41.0-alpha20230602v01' + implementation "com.finogeeks.lib:finapplet:$sdk_version" + implementation "com.finogeeks.mop:plugins:$sdk_version" } \ No newline at end of file From e625b3634293de6eb19d52f80793b04762d4b5d8 Mon Sep 17 00:00:00 2001 From: yangbinqiao Date: Sat, 17 Jun 2023 19:11:59 +0800 Subject: [PATCH 22/24] =?UTF-8?q?Android=20major=202.41.0-alpha20230617v01?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8fdab9a..83d06f9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,7 +91,7 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - def sdk_version = '2.41.0-alpha20230602v01' + def sdk_version = '2.41.0-alpha20230617v01' implementation "com.finogeeks.lib:finapplet:$sdk_version" implementation "com.finogeeks.mop:plugins:$sdk_version" } \ No newline at end of file From 271139ae4526d164d0c19925a8ee1b881563944f Mon Sep 17 00:00:00 2001 From: wangyong Date: Thu, 29 Jun 2023 15:29:58 +0800 Subject: [PATCH 23/24] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 83d06f9..01cf514 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,7 +91,7 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - def sdk_version = '2.41.0-alpha20230617v01' + def sdk_version = '2.41.0-dev20230628v01' implementation "com.finogeeks.lib:finapplet:$sdk_version" implementation "com.finogeeks.mop:plugins:$sdk_version" } \ No newline at end of file From 62eb312d1a402a851f83e55fde90cb147413ad0d Mon Sep 17 00:00:00 2001 From: wangyong Date: Sat, 1 Jul 2023 12:57:33 +0800 Subject: [PATCH 24/24] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 01cf514..e81e3a1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,7 +91,7 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - def sdk_version = '2.41.0-dev20230628v01' + def sdk_version = '2.41.0-dev20230630v06' implementation "com.finogeeks.lib:finapplet:$sdk_version" implementation "com.finogeeks.mop:plugins:$sdk_version" } \ No newline at end of file