Преглед изворни кода

Merge branch '1.22.0_master' of http://192.168.0.138:3000/FnuoOS_ZhiYing/zhiying_base_widget into 1.22.0_master

# Conflicts:
#	example/ios/Flutter/.last_build_id
#	example/ios/Podfile.lock
tags/0.0.18+3
Weller пре 3 година
родитељ
комит
6ab224b0d2
5 измењених фајлова са 828 додато и 21 уклоњено
  1. +752
    -0
      .dart_tool/package_config.json
  2. +26
    -2
      lib/models/app_config_model.dart
  3. +46
    -14
      lib/pages/mine_detail_page/mine_detail_page.dart
  4. +4
    -0
      lib/register.dart
  5. +0
    -5
      pubspec.yaml

+ 752
- 0
.dart_tool/package_config.json Прегледај датотеку

@@ -0,0 +1,752 @@
{
"configVersion": 2,
"packages": [
{
"name": "ali_auth_wbq",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/zhiying_ali_auth_wbq-f6421fe5735eab13738946da8fa7405e7aa952c6/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "amap_flutter_location",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/amap_flutter_location-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "archive",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.13",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "args",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/args-1.6.0",
"packageUri": "lib/",
"languageVersion": "2.3"
},
{
"name": "async",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/async-2.5.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "bloc",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/bloc-5.0.1",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "boolean_selector",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-2.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "cached_network_image",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.5.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "characters",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/characters-1.1.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "charcode",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.2.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "clock",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/clock-1.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "collection",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/collection-1.15.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "convert",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1",
"packageUri": "lib/",
"languageVersion": "1.17"
},
{
"name": "cookie_jar",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/cookie_jar-1.0.1",
"packageUri": "lib/",
"languageVersion": "1.20"
},
{
"name": "crypto",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.5",
"packageUri": "lib/",
"languageVersion": "2.3"
},
{
"name": "cubit",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/cubit-0.1.2",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "device_info",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+10",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "device_info_platform_interface",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "dio",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10",
"packageUri": "lib/",
"languageVersion": "2.4"
},
{
"name": "dio_cookie_manager",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/dio_cookie_manager-1.0.0",
"packageUri": "lib/",
"languageVersion": "2.4"
},
{
"name": "equatable",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.6",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "event_bus",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/event_bus-1.1.1",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "fake_async",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/fake_async-1.2.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "ffi",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/ffi-0.1.3",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "file",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "flutter",
"rootUri": "file:///Users/fnuouser/Documents/code/flutter/packages/flutter",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "flutter_alibc",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/zhiying_flutter_alibc-321acab9044f4097088c4235f46d16a4946eec9f/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "flutter_bloc",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-5.0.1",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "flutter_blurhash",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_blurhash-0.5.0",
"packageUri": "lib/",
"languageVersion": "2.4"
},
{
"name": "flutter_bugly",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/flutter_bugly-31ae70a8ce4440e51aab3d8a361583c3e07de3a6/",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "flutter_cache_manager",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-2.1.0",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "flutter_clipboard_plugin",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/flutter_clipboard_plugin-409b284517d93c775a502176389047fa73064900/",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "flutter_cubit",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_cubit-0.1.1",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "flutter_cupertino_date_picker",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/flutter-cupertino-date-picker-82142a924a770e68dca2a2f7b51449166870d7e2/",
"packageUri": "lib/",
"languageVersion": "1.19"
},
{
"name": "flutter_native_image",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+3",
"packageUri": "lib/",
"languageVersion": "1.19"
},
{
"name": "flutter_page_indicator",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_page_indicator-0.0.3",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "flutter_plugin_android_lifecycle",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_plugin_android_lifecycle-1.0.11",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "flutter_screenutil",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "flutter_slidable",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_slidable-0.5.7",
"packageUri": "lib/",
"languageVersion": "1.19"
},
{
"name": "flutter_swiper",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.1.6",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "flutter_test",
"rootUri": "file:///Users/fnuouser/Documents/code/flutter/packages/flutter_test",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "flutter_update_dialog",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_update_dialog-1.0.0",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "flutter_user_agent",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/flutter_user_agent-1.2.2",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "flutter_web_plugins",
"rootUri": "file:///Users/fnuouser/Documents/code/flutter/packages/flutter_web_plugins",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "flutter_xupdate",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/flutter_xupdate-d17c695461ee4588dec990533d7467c11884cd0f/",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "fluttertoast",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "fluwx",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/fluwx-2.6.2",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "http",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2",
"packageUri": "lib/",
"languageVersion": "2.4"
},
{
"name": "http_parser",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4",
"packageUri": "lib/",
"languageVersion": "2.3"
},
{
"name": "image",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.19",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "image_cropper",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/Image_Cropper-e32f2264f86a27a2f5d7a7a5e26c6154eaf5798e/",
"packageUri": "lib/",
"languageVersion": "1.20"
},
{
"name": "image_picker",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.6.7+22",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "image_picker_platform_interface",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/image_picker_platform_interface-1.1.6",
"packageUri": "lib/",
"languageVersion": "2.5"
},
{
"name": "intl",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1",
"packageUri": "lib/",
"languageVersion": "2.5"
},
{
"name": "jdsdk",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/flutter_jdsdk-9abac35b823b195f5a3a6c507c0d8e703165e3bf/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "loading_indicator",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/loading_indicator-1.2.0",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "matcher",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.10-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "meta",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/meta-1.3.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "mobcommonlib",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/mobcommonlib-1.0.2",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "moblink",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/moblink-5472bb698d70e336cf55febb9b0a209411466632/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "mobpush_plugin",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/mobpush_plugin-1.1.6",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "mobsms",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/mobsms-1.1.3",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "more_picture_share",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/more_picture_share-4767c418bfe4b8d75f9f8958199384141ba88e21/",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "nested",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "octo_image",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/octo_image-0.3.0",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "package_info",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3+4",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "path",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/path-1.8.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "path_provider",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.28",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "path_provider_linux",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "path_provider_macos",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+8",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "path_provider_platform_interface",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.4",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "path_provider_windows",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_windows-0.0.4+3",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "pedantic",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.9.2",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "permission_handler",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/permission_handler-c51d87952b6947996eebeb1fa84f52db6436c596/",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "permission_handler_platform_interface",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/permission_handler_platform_interface-2.0.1",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "petitparser",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/petitparser-3.1.0",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "photo_view",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/photo_view-0.10.3",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "platform",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1",
"packageUri": "lib/",
"languageVersion": "1.24"
},
{
"name": "plugin_platform_interface",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.2",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "process",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "provider",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/provider-4.3.3",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "pull_to_refresh",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/flutter_pulltorefresh-78a12e0ea45fdf1fbc615b8d243e0f4a8667489f/",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "rxdart",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.25.0",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "save_image",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/save_image-22e462499b373bb78611311d3ec9a14a64820f61/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "secverify",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/secverify-5ec756e9fe63339209cc6906a37a778952ac61f1/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "share_extend",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/share_extend-1.1.9",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "shared_preferences",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.12+4",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "shared_preferences_linux",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+4",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "shared_preferences_macos",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+11",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "shared_preferences_platform_interface",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "shared_preferences_web",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "shared_preferences_windows",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_windows-0.0.2+3",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "sharesdk_plugin",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/sharesdk_plugin-f947c09803374acdc4fb720ccb5356d0779afe2f/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "shimmer",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.2",
"packageUri": "lib/",
"languageVersion": "1.20"
},
{
"name": "sky_engine",
"rootUri": "file:///Users/fnuouser/Documents/code/flutter/bin/cache/pkg/sky_engine",
"packageUri": "lib/",
"languageVersion": "1.11"
},
{
"name": "source_span",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.8.0-nullsafety.2",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "sqflite",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+2",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "sqflite_common",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.3+3",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "stack_trace",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.10.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "stream_channel",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "string_scanner",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "string_validator",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/string_validator-0.1.4",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "synchronized",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0+2",
"packageUri": "lib/",
"languageVersion": "2.8"
},
{
"name": "tab_indicator_styler",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/tab_indicator_styler-1.0.0",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "term_glyph",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.2.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "test_api",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.19-nullsafety.2",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "tobias",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/tobias-15f6acb72df68703c96b2d8a14e1ab28f5dcc008/",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "transformer_page_view",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.6",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "typed_data",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.3.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "url_launcher",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.10",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "url_launcher_linux",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_linux-0.0.1+4",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "url_launcher_macos",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+9",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "url_launcher_platform_interface",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_platform_interface-1.0.9",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "url_launcher_web",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.5+3",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "url_launcher_windows",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_windows-0.0.1+3",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "uuid",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "vector_math",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.1.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "webview_flutter",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-1.0.7",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "win32",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.4+1",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "xdg_directories",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.2",
"packageUri": "lib/",
"languageVersion": "2.3"
},
{
"name": "xml",
"rootUri": "file:///Users/fnuouser/.pub-cache/hosted/pub.flutter-io.cn/xml-4.5.1",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "zhiying_comm",
"rootUri": "../../zhiying_comm",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "zhiying_flutter_webview",
"rootUri": "file:///Users/fnuouser/.pub-cache/git/zhiying_flutter_webview-ba86db9f6807c2afbdcbb1a065e435117e41da30/",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "zhiying_base_widget",
"rootUri": "../",
"packageUri": "lib/",
"languageVersion": "2.8"
}
],
"generated": "2021-05-27T09:55:36.471763Z",
"generator": "pub",
"generatorVersion": "2.10.5"
}

+ 26
- 2
lib/models/app_config_model.dart Прегледај датотеку

@@ -12,6 +12,9 @@ class AppConfigModel {
// 引导页
AppConfigGuideModel guideImage;

// H5根域名
DomainModel domain;

///新引导页参数
GuideData guideData;

@@ -19,7 +22,7 @@ class AppConfigModel {

static AppConfigModel _config;

AppConfigModel({this.keys, this.guideImage});
AppConfigModel({this.keys, this.guideImage, this.domain});

static AppConfigModel getConfig() => _config;

@@ -55,6 +58,7 @@ class AppConfigModel {
guideImage = json['guide_image'] != null ? new AppConfigGuideModel.fromJson(json['guide_image']) : null;
guideData = json['guide_data'] != null ? GuideData.fromJson(json['guide_data']) : null;
appStartDelay = json['app_start_delay'] != null ? json['app_start_delay'] : '0.5';
domain = json['domain'] != null ? new DomainModel.fromJson(json['domain']) : null;
}

Map<String, dynamic> toJson() {
@@ -65,6 +69,9 @@ class AppConfigModel {
if (this.guideImage != null) {
data['guide_image'] = this.guideImage.toJson();
}
if (this.domain != null) {
data['domain'] = this.domain.toJson();
}
return data;
}
}
@@ -79,6 +86,7 @@ class AppConfigKeyModel {
AppConfigKeyItemModel bugly;
GDModel gd;


AppConfigKeyModel({this.weibo, this.qq, this.weixin, this.jdIos, this.jdAndroid, this.taobao, this.bugly});

AppConfigKeyModel.fromJson(Map<String, dynamic> json) {
@@ -118,7 +126,6 @@ class AppConfigKeyModel {
if (this.bugly != null) {
data['bugly_list'] = this.bugly.toJson();
}

return data;
}
}
@@ -261,6 +268,23 @@ class AppConfigGuideModel {
}
}

class DomainModel {
String h5Url;

DomainModel({this.h5Url});

DomainModel.fromJson(Map<String, dynamic> json) {
h5Url = json['h5_url']?.toString();
}

Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['h5_url'] = this.h5Url;
return data;
}

}

class GDModel {
String androidKey;
String iosKey;


+ 46
- 14
lib/pages/mine_detail_page/mine_detail_page.dart Прегледај датотеку

@@ -301,23 +301,55 @@ class _MineDetailContainerState extends State<_MineDetailContainer> {
backgroundColor: Colors.transparent);
if (index != null) {
if (index == 0) {
if (!await Permission.camera.isGranted) {
var result = await showDialog(context: context, child: NotificationSettingDialogNew([NotificationSettingDialogNew.cameraPermissModel]));
}
if (await Permission.camera.isGranted) {
file = await picker.getImage(source: ImageSource.camera);
} else {
Fluttertoast.showToast(msg: '暂无权限,图片拍取失败');
}
} else {
if (!await Permission.storage.isGranted) {
var result = await showDialog(context: context, child: NotificationSettingDialogNew([NotificationSettingDialogNew.storagePermissModel]));
if (!await Permission.camera.isGranted) {
if (Platform.isAndroid) {
var result = await showDialog(context: context, child: NotificationSettingDialogNew([NotificationSettingDialogNew.cameraPermissModel]));
} else {
PermissionStatus status = await Permission.camera.request();
if (status.isUndetermined) {
//从未申请过
}else if(status.isDenied){
//第一次申请用户拒绝
Fluttertoast.showToast(msg: '请进入iPhone的"设置-隐私-相机"选项,允许本APP访问您的手机相机');
}else if(status.isPermanentlyDenied){
//用户点击了 拒绝且不再提示
}else{
//权限通过
}
}
}
if (await Permission.storage.isGranted) {
file = await picker.getImage(source: ImageSource.gallery);
if (await Permission.camera.isGranted) {
file = await picker.getImage(source: ImageSource.camera);
} else {
Fluttertoast.showToast(msg: '暂无权限,图片获取失败');
if (Platform.isAndroid) {
Fluttertoast.showToast(msg: '暂无权限,图片拍取失败');
}
}
} else {
if (!await Permission.storage.isGranted) {
if (Platform.isAndroid) {
var result = await showDialog(context: context, child: NotificationSettingDialogNew([NotificationSettingDialogNew.storagePermissModel]));
} else {
PermissionStatus status = await Permission.storage.request();
if (status.isUndetermined) {
//从未申请过
}else if(status.isDenied){
//第一次申请用户拒绝
Fluttertoast.showToast(msg: '请进入iPhone的"设置-隐私-照片"选项,允许本APP访问您的手机相册');
}else if(status.isPermanentlyDenied){
//用户点击了 拒绝且不再提示
}else{
//权限通过
}
}
}
if (await Permission.storage.isGranted) {
file = await picker.getImage(source: ImageSource.gallery);
} else {
Fluttertoast.showToast(msg: '暂无权限,图片获取失败');
}


}

if (file == null) return;


+ 4
- 0
lib/register.dart Прегледај датотеку

@@ -187,6 +187,10 @@ class BaseWidgetRegister {
}
}

// 缓存h5根域名, 用来与h5共享token等数据
SharedPreferencesUtil.setStringValue(GlobalConfig.H5_DOMAIN, config?.domain?.h5Url ?? '');
Logger.log('h5 根域名 = ' + config?.domain?.h5Url ?? '');

});

return null;


+ 0
- 5
pubspec.yaml Прегледај датотеку

@@ -68,11 +68,6 @@ dependencies:
url: http://192.168.0.138:3000/FnuoOS_ZhiYing/flutter_bugly.git
# ath: ../flutter_bugly

zhiying_flutter_webview:
git:
url: http://192.168.0.138:3000/FnuoOS_ZhiYing/zhiying_flutter_webview.git
ref: 0.0.4

# 特效底部
# convex_bottom_bar: ^2.7.1+2



Loading…
Откажи
Сачувај