fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

zyh
w-R 3 years ago
parent
d467bf6058 253de6e63d
commit
fab0182c61
4 changed files with 31 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      ios/Podfile.lock
  2. 18
      ios/Runner.xcodeproj/project.pbxproj
  3. 18
      pubspec.lock
  4. 10
      pubspec.yaml

14
ios/Podfile.lock
Unescape View File

@ -43,7 +43,7 @@ PODS:
- Flutter - Flutter
- fluwx (0.0.1): - fluwx (0.0.1):
- Flutter - Flutter
- WechatOpenSDK_Fuck (~> 1.9.2) - "OpenWeChatSDK (~> 1.9.2+1)"
- image_pickers (0.0.1): - image_pickers (0.0.1):
- AFNetworking - AFNetworking
- Flutter - Flutter
@ -159,6 +159,7 @@ PODS:
- mob_sharesdk/ShareSDK - mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9) - MOBFoundation (>= 3.2.9)
- MOBFoundation (3.2.26) - MOBFoundation (3.2.26)
- "OpenWeChatSDK (1.9.2+1)"
- package_info (0.0.1): - package_info (0.0.1):
- Flutter - Flutter
- path_provider (0.0.1): - path_provider (0.0.1):
@ -214,7 +215,7 @@ PODS:
- thumbnails (0.0.1): - thumbnails (0.0.1):
- Flutter - Flutter
- TPNS-iOS (1.3.4.1) - TPNS-iOS (1.3.4.1)
- tpns_flutter_plugin (1.1.4): - tpns_flutter_plugin (1.1.6):
- Flutter - Flutter
- TPNS-iOS (= 1.3.4.1) - TPNS-iOS (= 1.3.4.1)
- url_launcher (0.0.1): - url_launcher (0.0.1):
@ -225,7 +226,6 @@ PODS:
- Flutter - Flutter
- webview_flutter (0.0.1): - webview_flutter (0.0.1):
- Flutter - Flutter
- WechatOpenSDK_Fuck (1.9.2)
- ZLPhotoBrowser-objc (1.0.4): - ZLPhotoBrowser-objc (1.0.4):
- SDWebImage - SDWebImage
@ -259,10 +259,10 @@ SPEC REPOS:
- BMKLocationKit - BMKLocationKit
- mob_sharesdk - mob_sharesdk
- MOBFoundation - MOBFoundation
- OpenWeChatSDK
- SDWebImage - SDWebImage
- SSZipArchive - SSZipArchive
- TPNS-iOS - TPNS-iOS
- WechatOpenSDK_Fuck
- ZLPhotoBrowser-objc - ZLPhotoBrowser-objc
EXTERNAL SOURCES: EXTERNAL SOURCES:
@ -317,10 +317,11 @@ SPEC CHECKSUMS:
flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d
flutter_baidu_mapapi_utils: a5bd582b91ecd35be1bc45558b38f49d5684f70a flutter_baidu_mapapi_utils: a5bd582b91ecd35be1bc45558b38f49d5684f70a
flutter_bmflocation: 12f1ba91bae4b16d78d4f475023e0254ed351f1c flutter_bmflocation: 12f1ba91bae4b16d78d4f475023e0254ed351f1c
fluwx: 02670633ce7509206f62b366e9734e7dda81e100 fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492
image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451 image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451
mob_sharesdk: c771f001e00739d24301a9fa250247601efe7a3c mob_sharesdk: c771f001e00739d24301a9fa250247601efe7a3c
MOBFoundation: 2abd23c80c33d1337d30dc4b0018ed914cef8f8e MOBFoundation: 2abd23c80c33d1337d30dc4b0018ed914cef8f8e
OpenWeChatSDK: 67375e7d4154c22f7ba6b1c334b121473e7d515c
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
@ -331,12 +332,11 @@ SPEC CHECKSUMS:
SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2 SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff
tpns_flutter_plugin: 9bbb12c9cc9682a5aec38a7def5c01ddb0cf0723 tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
WechatOpenSDK_Fuck: aa8f4b0af902837e887a1d40c62f06c060c1dc98
ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c

18
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -616,7 +616,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 93; CURRENT_PROJECT_VERSION = 2.0.2;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -654,7 +654,7 @@
"\"${PODS_ROOT}/Headers/Private/fluwx\"", "\"${PODS_ROOT}/Headers/Private/fluwx\"",
); );
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.93; MARKETING_VERSION = 2.0.2;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -816,7 +816,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 93; CURRENT_PROJECT_VERSION = 2.0.2;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -854,7 +854,7 @@
"\"${PODS_ROOT}/Headers/Private/fluwx\"", "\"${PODS_ROOT}/Headers/Private/fluwx\"",
); );
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.93; MARKETING_VERSION = 2.0.2;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -907,7 +907,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 93; CURRENT_PROJECT_VERSION = 2.0.2;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -945,7 +945,7 @@
"\"${PODS_ROOT}/Headers/Private/fluwx\"", "\"${PODS_ROOT}/Headers/Private/fluwx\"",
); );
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 1.0.93; MARKETING_VERSION = 2.0.2;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

18
pubspec.lock
Unescape View File

@ -112,7 +112,7 @@ packages:
name: csslib name: csslib
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.17.1" version: "0.17.2"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
@ -208,7 +208,7 @@ packages:
name: flutter_easyloading name: flutter_easyloading
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.3" version: "3.0.5"
flutter_html: flutter_html:
dependency: "direct main" dependency: "direct main"
description: description:
@ -307,7 +307,7 @@ packages:
name: fluwx name: fluwx
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.8.5" version: "3.9.0+2"
font_awesome_flutter: font_awesome_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
@ -538,7 +538,7 @@ packages:
name: provider name: provider
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "6.0.2" version: "6.0.3"
pull_to_refresh: pull_to_refresh:
dependency: "direct main" dependency: "direct main"
description: description:
@ -715,10 +715,12 @@ packages:
tpns_flutter_plugin: tpns_flutter_plugin:
dependency: "direct main" dependency: "direct main"
description: description:
name: tpns_flutter_plugin path: "."
url: "https://pub.flutter-io.cn" ref: "V1.1.6"
source: hosted resolved-ref: c21ce8a966f9238a5bf70a617c30468b79baa5a7
version: "1.1.0" url: "https://github.com/TencentCloud/TPNS-Flutter-Plugin"
source: git
version: "1.1.6"
transformer_page_view: transformer_page_view:
dependency: transitive dependency: transitive
description: description:

10
pubspec.yaml
Unescape View File

@ -13,16 +13,16 @@ dependencies:
sdk: flutter sdk: flutter
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
fluwx: ^3.8.2 fluwx: ^3.9.0+2
gradient_widgets: ^0.6.0 gradient_widgets: ^0.6.0
keframe: ^2.0.2 #滑动组件卡顿优化 keframe: ^2.0.2 #滑动组件卡顿优化
tpns_flutter_plugin: ^1.0.8 tpns_flutter_plugin:
# git: git:
# url: git://github.com/TencentCloud/TPNS-Flutter-Plugin url: https://github.com/TencentCloud/TPNS-Flutter-Plugin
# ref: V1.1.4 ref: V1.1.6
like_button: ^2.0.2 like_button: ^2.0.2
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.2

Write Preview
Loading…
Cancel
Save