diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 9553253d..3f3154da 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -616,7 +616,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 83; + CURRENT_PROJECT_VERSION = 85; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +666,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.83; + MARKETING_VERSION = 1.0.85; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -816,7 +816,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 83; + CURRENT_PROJECT_VERSION = 85; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -866,7 +866,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.83; + MARKETING_VERSION = 1.0.85; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -907,7 +907,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 83; + CURRENT_PROJECT_VERSION = 85; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -957,7 +957,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.83; + MARKETING_VERSION = 1.0.85; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 5026bdb9..8fa0eb72 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -61,8 +61,8 @@ abstract class MinApiService { } headers["Environment"] = "app"; dio.options = BaseOptions( - connectTimeout: 15000, - receiveTimeout: 15000, + connectTimeout: 10000, + receiveTimeout: 10000, headers: headers, responseType: ResponseType.json, ); diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index e66070b7..cc7de47f 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -90,8 +90,8 @@ abstract class ApiService { headers["Environment"] = "app"; } dio.options = BaseOptions( - connectTimeout: 60000, - receiveTimeout: 60000, + connectTimeout: 10000, + receiveTimeout: 10000, headers: headers, responseType: ResponseType.json, ); diff --git a/pubspec.lock b/pubspec.lock index cef5af7e..8a62cc1d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -701,10 +701,12 @@ packages: tpns_flutter_plugin: dependency: "direct main" description: - name: tpns_flutter_plugin - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.0" + path: "." + ref: "V1.1.4" + resolved-ref: "9494908d3d974899dd6d8494a332b89998b5ac8b" + url: "https://github.com/TencentCloud/TPNS-Flutter-Plugin" + source: git + version: "1.1.4" transformer_page_view: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 20c07d3a..3b0c5729 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,10 +19,14 @@ dependencies: keframe: ^2.0.2 #滑动组件卡顿优化 - tpns_flutter_plugin: ^1.0.8 -# git: -# url: git://github.com/TencentCloud/TPNS-Flutter-Plugin -# ref: V1.1.4 + tpns_flutter_plugin: + git: + url: https://github.com/TencentCloud/TPNS-Flutter-Plugin + ref: V1.1.4 +# tpns_flutter_plugin: +# git: +# url: https://github.com/TencentCloud/TPNS-Flutter-Plugin +# ref: V1.1.6 like_button: ^2.0.2 cupertino_icons: ^1.0.2 @@ -61,7 +65,7 @@ dependencies: image_pickers: ^2.0.0 # flutter_scankit: ^1.2.0 -# qrscan: ^0.3.1 + # qrscan: ^0.3.1 scan: ^1.5.0 path_provider: ^1.2.0 @@ -73,8 +77,8 @@ dependencies: photo_view: ^0.13.0 video_player: ^2.2.3 thumbnails: ^1.0.1 -# media_info: ^0.9.0 -# flutter_ffmpeg: ^0.4.2 + # media_info: ^0.9.0 + # flutter_ffmpeg: ^0.4.2 package_info: ^2.0.2 @@ -94,7 +98,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter -# retrofit_generator: ^1.4.1+3 +# retrofit_generator: ^1.4.1+32 # build_runner: ^1.11.5 # json_serializable: ^3.5.1 @@ -105,12 +109,12 @@ flutter: - assets/map_style/ - assets/riv/ - assets/svg/ -# - assets/fonts/ + # - assets/fonts/ -# fonts: -# - family: iconfont -# fonts: -# - asset: assets/fonts/iconfont.ttf + # fonts: + # - family: iconfont + # fonts: + # - asset: assets/fonts/iconfont.ttf uses-material-design: true