From e557e7c42b07d6b1a8124e1eee243ce7dcf478f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”> Date: Tue, 23 Mar 2021 19:28:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/ios/Podfile.lock | 23 ++++++++++++-------- example/ios/Runner.xcodeproj/project.pbxproj | 3 --- lib/util/launcher_wx_mini_program.dart | 3 ++- lib/zhiying_comm.dart | 1 + pubspec.yaml | 4 ++-- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index ae4a347..9613040 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -4,8 +4,6 @@ PODS: - AliAuthSDK (1.1.0.41-bc) - AlibcTradeSDK (4.0.1.6) - AliLinkPartnerSDK (4.0.0.24) - - AlipaySDK_No_UTDID_SUN (15.2.0): - - UTDID - BCUserTrack (5.2.0.18-appkeys): - UTDID - device_info (0.0.1): @@ -27,6 +25,9 @@ PODS: - Flutter - fluttertoast (0.0.2): - Flutter + - fluwx (0.0.1): + - Flutter + - WechatOpenSDK (= 1.8.7.1) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) @@ -76,7 +77,7 @@ PODS: - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.3.16): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeChat (4.3.16): + - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.3.16): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - mob_sharesdk/ShareSDKRestoreScene (4.3.16): @@ -137,14 +138,13 @@ PODS: - mob_sharesdk/ShareSDKPlatforms/SnapChat - mob_sharesdk/ShareSDKPlatforms/Twitter - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo - - mob_sharesdk/ShareSDKPlatforms/WeChat + - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite - mob_sharesdk/ShareSDKRestoreScene - mob_sharesdk/ShareSDKUI - sqflite (0.0.1): - Flutter - FMDB (~> 2.7.2) - tobias (0.0.1): - - AlipaySDK_No_UTDID_SUN (~> 15.2.0) - Flutter - url_launcher (0.0.1): - Flutter @@ -159,6 +159,7 @@ PODS: - UTDID (1.1.0.16) - webview_flutter (0.0.1): - Flutter + - WechatOpenSDK (1.8.7.1) - WindVane (8.5.0.46-bc11): - WindVane/Basic (= 8.5.0.46-bc11) - WindVane/Core (= 8.5.0.46-bc11) @@ -177,6 +178,7 @@ DEPENDENCIES: - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`) - flutter_xupdate (from `.symlinks/plugins/flutter_xupdate/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) + - fluwx (from `.symlinks/plugins/fluwx/ios`) - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`) - jdsdk (from `.symlinks/plugins/jdsdk/ios`) - moblink (from `.symlinks/plugins/moblink/ios`) @@ -216,13 +218,13 @@ SPEC REPOS: - UTDID - WindVane trunk: - - AlipaySDK_No_UTDID_SUN - FMDB - mob_linksdk_pro - mob_secverify - mob_sharesdk - mob_smssdk - MOBFoundation + - WechatOpenSDK EXTERNAL SOURCES: ali_auth_wbq: @@ -239,6 +241,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_xupdate/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" + fluwx: + :path: ".symlinks/plugins/fluwx/ios" imei_plugin: :path: ".symlinks/plugins/imei_plugin/ios" jdsdk: @@ -299,7 +303,6 @@ SPEC CHECKSUMS: AliAuthSDK: 7018e8f3c8be3382e60f69d3b517c7de34c351e0 AlibcTradeSDK: 9a3e7af6cd648dd1f85684e82694c213fe48dad2 AliLinkPartnerSDK: c5778cdfdcee7bfe342238d39a77766184d36a46 - AlipaySDK_No_UTDID_SUN: ac3f953a08c8ac8eaade23e338862208b885c344 BCUserTrack: 49251c6fb7c65cbbc221a492bbd3f3e142f1fb0f device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec @@ -307,6 +310,7 @@ SPEC CHECKSUMS: flutter_native_image: 9c0b7451838484458e5b0fae007b86a4c2d4bdfe flutter_xupdate: bdb588f0fe4f6c5e45436b8b0de08d505a50c04e fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b + fluwx: 8d47bee15c7fed07b94c2a12fb2381677232431a FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd jdsdk: 2ca38c7e3a2dfb0f3641425f8fd1e8d20357693f @@ -332,9 +336,9 @@ SPEC CHECKSUMS: shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae - sharesdk_plugin: de8d8b87c50d60017472c5da425db1acd2911e0a + sharesdk_plugin: 455844465fc821a8ead9a9851ac928fa877cb379 sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 - tobias: 46e3fae88556c31a512721b97fc509a015174ebf + tobias: da6d872837de666e33393e7647aa6bc4ccb370b1 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0 url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 @@ -342,6 +346,7 @@ SPEC CHECKSUMS: url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5 UTDID: c28855683c5ea2e77e597cb14609328f7d470d6e webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96 + WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44 WindVane: 56e096abae757397ccd3accb66a959f3ffcbf949 zhiying_comm: 0daef4a480f4f4dbea3e11b615f3264aafea924b diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 205059d..292d515 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -373,7 +373,6 @@ /* Begin XCBuildConfiguration section */ 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -451,7 +450,6 @@ }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -507,7 +505,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; diff --git a/lib/util/launcher_wx_mini_program.dart b/lib/util/launcher_wx_mini_program.dart index 0a93b4c..73f824a 100644 --- a/lib/util/launcher_wx_mini_program.dart +++ b/lib/util/launcher_wx_mini_program.dart @@ -5,6 +5,7 @@ class LauncherWxMiniProgram { if (data == null) { return false; } - return await launchWeChatMiniProgram(username: data['user_name'],miniProgramType: data['miniprogram_type'],path: data['page']); + print(data); + return await launchWeChatMiniProgram(username: data['user_name'],path: data['page']); } } \ No newline at end of file diff --git a/lib/zhiying_comm.dart b/lib/zhiying_comm.dart index 2868067..3d612b7 100644 --- a/lib/zhiying_comm.dart +++ b/lib/zhiying_comm.dart @@ -52,3 +52,4 @@ export 'package:fluwx/fluwx.dart'; export 'package:permission_handler/permission_handler.dart'; export 'package:zhiying_comm/util/shared_prefe_util.dart'; export 'package:fluttertoast/fluttertoast.dart'; +export 'package:zhiying_comm/util/launcher_wx_mini_program.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index df18655..33b7814 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -96,10 +96,10 @@ dependencies: ref: '0.0.2' #微信支付 fluwx: -# path: ../fluwx +# path: ../fluwx git: url: 'http://192.168.0.138:3000/FnuoOS_ZhiYing/fluwx.git' - ref: '0.0.2' + ref: '0.0.3' event_bus: 1.1.1