From 43431de00e965a61f15e2cf1b401f375f157dc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”> Date: Thu, 7 Jan 2021 11:26:06 +0800 Subject: [PATCH] 0107 --- .dart_tool/package_config.json | 8 +- .idea/codeStyles/Project.xml | 116 ------------------ .idea/saveactions_settings.xml | 14 --- .../shelved.patch | 18 --- ...2020_12_28__18_04__Default_Changelist_.xml | 4 - .../tmpmob/ShareSDK/assets/ShareSDK.xml | 2 +- example/ios/Podfile.lock | 16 +++ 7 files changed, 24 insertions(+), 154 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/saveactions_settings.xml delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 0e97db5..f3c7647 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -589,6 +589,12 @@ "packageUri": "lib/", "languageVersion": "2.4" }, + { + "name": "tobias", + "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/tobias-1.7.1+1", + "packageUri": "lib/", + "languageVersion": "2.1" + }, { "name": "transformer_page_view", "rootUri": "file:///Users/fnuser02/flutter/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.6", @@ -686,7 +692,7 @@ "languageVersion": "2.8" } ], - "generated": "2021-01-04T08:03:41.757747Z", + "generated": "2021-01-06T06:40:26.187159Z", "generator": "pub", "generatorVersion": "2.8.2" } diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 681f41a..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
-
-
-
-
-
\ No newline at end of file diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml deleted file mode 100644 index 1e9ec9d..0000000 --- a/.idea/saveactions_settings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch deleted file mode 100644 index 18bc975..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28,_18_04_[Default_Changelist]/shelved.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: pubspec.yaml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>name: zhiying_base_widget\ndescription: A new Flutter plugin.\nversion: 0.0.1\nauthor:\nhomepage:\n\nenvironment:\n sdk: \">=2.8.0 <3.0.0\"\n\ndependencies:\n flutter:\n sdk: flutter\n\n flutter_swiper: ^1.1.6\n bloc: ^4.0.0\n event_bus: ^1.1.1\n pull_to_refresh: ^1.6.1\n flutter_cupertino_date_picker: ^1.0.26+2\n image_picker: ^0.6.7+3\n tab_indicator_styler: 1.0.0\n connectivity: ^0.4.9+3\n save_image: ^1.0.1\n image_cropper:\n git:\n url: 'http://192.168.0.138:3000/FnuoOS_Flutter_Components/Image_Cropper.git'\n ref: '1.2.3+1'\n # 系统分享\n share_extend: ^1.1.9\n flutter_native_image: ^0.0.5\n #字符检测\n string_validator: 0.1.4\n # 列表滑动删除\n flutter_slidable: 0.5.7\n # image_gallery_saver: ^1.6.0\n\n permission_handler:\n git:\n ref: 0.0.1\n url: http://192.168.0.138:3000/FnuoOS_Flutter_Components/permission_handler.git\n\n\n intl: 0.16.1\n\n loading_indicator: ^1.2.0\n\ndev_dependencies:\n flutter_test:\n sdk: flutter\n\n zhiying_comm:\n path: ../zhiying_comm\n\n# For information on the generic Dart part of this file, see the\n# following page: https://dart.dev/tools/pub/pubspec\n\n# The following section is specific to Flutter.\nflutter:\n # This section identifies this Flutter project as a plugin project.\n # The androidPackage and pluginClass identifiers should not ordinarily\n # be modified. They are used by the tooling to maintain consistency when\n # adding or updating assets for this project.\n plugin:\n androidPackage: cn.zhios.zhiying_base_widget\n pluginClass: ZhiyingBaseWidgetPlugin\n\n # To add assets to your plugin package, add an assets section, like this:\n assets:\n - assets/images/launch_image/launch_image.png\n - assets/images/empty/empty.png\n - assets/images/qrcode/default_qrcode.png\n #\n # For details regarding assets in packages, see\n # https://flutter.dev/assets-and-images/#from-packages\n #\n # An image asset can refer to one or more resolution-specific \"variants\", see\n # https://flutter.dev/assets-and-images/#resolution-aware.\n\n # To add custom fonts to your plugin package, add a fonts section here,\n # in this \"flutter\" section. Each entry in this list should have a\n # \"family\" key with the font family name, and a \"fonts\" key with a\n # list giving the asset and other descriptors for the font. For\n # example:\n fonts:\n - family: Din-Bold\n fonts:\n - asset: assets/fonts/DIN-Bold.otf\n - family: Din-Medium\n fonts:\n - asset: assets/fonts/DIN-Medium.otf\n - family: Din\n fonts:\n - asset: assets/fonts/DIN-Regular.otf\n\n #\n # For details regarding fonts in packages, see\n # https://flutter.dev/custom-fonts/#from-packages\n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== ---- pubspec.yaml (revision cdaa6fadd2854f59327db04674e2b070713b6b5e) -+++ pubspec.yaml (date 1608880072000) -@@ -9,7 +9,7 @@ - - dependencies: - flutter: -- sdk: flutter -+ sdk: flutt - - flutter_swiper: ^1.1.6 - bloc: ^4.0.0 diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml deleted file mode 100644 index c1d1747..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_2020_12_28__18_04__Default_Changelist_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/example/android/tmpmob/ShareSDK/assets/ShareSDK.xml b/example/android/tmpmob/ShareSDK/assets/ShareSDK.xml index 6614d55..1cd7706 100644 --- a/example/android/tmpmob/ShareSDK/assets/ShareSDK.xml +++ b/example/android/tmpmob/ShareSDK/assets/ShareSDK.xml @@ -16,7 +16,7 @@ - + diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f99ba19..1e2acc9 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,7 +1,10 @@ PODS: + - ali_auth_wbq (0.0.4): + - Flutter - AliAuthSDK (1.1.0.41-bc) - AlibcTradeSDK (4.0.1.6) - AliLinkPartnerSDK (4.0.0.24) + - AlipaySDK-iOS (15.7.9) - BCUserTrack (5.2.0.18-appkeys): - UTDID - connectivity (0.0.1): @@ -156,6 +159,9 @@ PODS: - sqflite (0.0.1): - Flutter - FMDB (~> 2.7.2) + - tobias (0.0.1): + - AlipaySDK-iOS (~> 15.7.9) + - Flutter - TOCropViewController (2.5.4) - url_launcher (0.0.1): - Flutter @@ -189,6 +195,7 @@ PODS: - Flutter DEPENDENCIES: + - ali_auth_wbq (from `.symlinks/plugins/ali_auth_wbq/ios`) - connectivity (from `.symlinks/plugins/connectivity/ios`) - connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`) - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`) @@ -221,6 +228,7 @@ DEPENDENCIES: - shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`) - sharesdk_plugin (from `.symlinks/plugins/sharesdk_plugin/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) + - tobias (from `.symlinks/plugins/tobias/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`) - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`) @@ -241,6 +249,7 @@ SPEC REPOS: - UTDID - WindVane https://github.com/CocoaPods/Specs.git: + - AlipaySDK-iOS - FMDB - mob_linksdk_pro - mob_secverify @@ -251,6 +260,8 @@ SPEC REPOS: - TOCropViewController EXTERNAL SOURCES: + ali_auth_wbq: + :path: ".symlinks/plugins/ali_auth_wbq/ios" connectivity: :path: ".symlinks/plugins/connectivity/ios" connectivity_for_web: @@ -315,6 +326,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/sharesdk_plugin/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" + tobias: + :path: ".symlinks/plugins/tobias/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" url_launcher_linux: @@ -333,9 +346,11 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/zhiying_comm/ios" SPEC CHECKSUMS: + ali_auth_wbq: 83e881b20722051dccc9117062f674d736509468 AliAuthSDK: 7018e8f3c8be3382e60f69d3b517c7de34c351e0 AlibcTradeSDK: 9a3e7af6cd648dd1f85684e82694c213fe48dad2 AliLinkPartnerSDK: c5778cdfdcee7bfe342238d39a77766184d36a46 + AlipaySDK-iOS: 94ff4c0e17c5e7d126b8207596d5033006534c25 BCUserTrack: 49251c6fb7c65cbbc221a492bbd3f3e142f1fb0f connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467 connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b @@ -378,6 +393,7 @@ SPEC CHECKSUMS: shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae sharesdk_plugin: de8d8b87c50d60017472c5da425db1acd2911e0a sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 + tobias: 6872e2198dc30e17c10513b9ee114e28d099bc70 TOCropViewController: 2a1ae1242600b1f2d996fd91a5268b2309a33b5c url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0