Skip to content

Commit 637abcf

Browse files
committed
升级第三方库,去除一些没用的
1 parent e101a03 commit 637abcf

File tree

7 files changed

+52
-72
lines changed

7 files changed

+52
-72
lines changed

ios/Podfile.lock

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ PODS:
1010
- flutter_lottie (0.0.1):
1111
- Flutter
1212
- lottie-ios
13-
- flutter_statusbar (0.0.1):
14-
- Flutter
1513
- flutter_webview_plugin (0.0.1):
1614
- Flutter
1715
- fluttertoast (0.0.2):
@@ -24,7 +22,7 @@ PODS:
2422
- Flutter
2523
- path_provider (0.0.1):
2624
- Flutter
27-
- permission_handler (3.0.2):
25+
- permission_handler (3.1.0):
2826
- Flutter
2927
- Reachability (3.2)
3028
- share (0.5.2):
@@ -43,9 +41,8 @@ DEPENDENCIES:
4341
- android_intent (from `.symlinks/plugins/android_intent/ios`)
4442
- connectivity (from `.symlinks/plugins/connectivity/ios`)
4543
- device_info (from `.symlinks/plugins/device_info/ios`)
46-
- Flutter (from `.symlinks/flutter/ios-release`)
44+
- Flutter (from `.symlinks/flutter/ios`)
4745
- flutter_lottie (from `.symlinks/plugins/flutter_lottie/ios`)
48-
- flutter_statusbar (from `.symlinks/plugins/flutter_statusbar/ios`)
4946
- flutter_webview_plugin (from `.symlinks/plugins/flutter_webview_plugin/ios`)
5047
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
5148
- package_info (from `.symlinks/plugins/package_info/ios`)
@@ -71,11 +68,9 @@ EXTERNAL SOURCES:
7168
device_info:
7269
:path: ".symlinks/plugins/device_info/ios"
7370
Flutter:
74-
:path: ".symlinks/flutter/ios-release"
71+
:path: ".symlinks/flutter/ios"
7572
flutter_lottie:
7673
:path: ".symlinks/plugins/flutter_lottie/ios"
77-
flutter_statusbar:
78-
:path: ".symlinks/plugins/flutter_statusbar/ios"
7974
flutter_webview_plugin:
8075
:path: ".symlinks/plugins/flutter_webview_plugin/ios"
8176
fluttertoast:
@@ -103,14 +98,13 @@ SPEC CHECKSUMS:
10398
device_info: 3ebad48f726348f69abd802f3334a8d1ed795fbd
10499
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
105100
flutter_lottie: c1fd7e92e771209f8b623119646c15201c5e8c87
106-
flutter_statusbar: aa4982b847304a72c5ac8439a9f37861b662c6bb
107101
flutter_webview_plugin: ed9e8a6a96baf0c867e90e1bce2673913eeac694
108102
fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
109103
FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
110104
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
111105
package_info: 78cabb3c322943c55d39676f4a5bfc748c01d055
112106
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
113-
permission_handler: 73cfc10e081c379c1dcc19cd0040c77e500fa936
107+
permission_handler: fa6b0d784b1a43cb96b468a5b8365cb130b1956a
114108
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
115109
share: 7d22fe8baedfe93aefd864bf0b73f29711fbb0a3
116110
shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -534,13 +534,12 @@
534534
inputPaths = (
535535
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
536536
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
537-
"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
537+
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
538538
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
539539
"${BUILT_PRODUCTS_DIR}/android_intent/android_intent.framework",
540540
"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
541541
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
542542
"${BUILT_PRODUCTS_DIR}/flutter_lottie/flutter_lottie.framework",
543-
"${BUILT_PRODUCTS_DIR}/flutter_statusbar/flutter_statusbar.framework",
544543
"${BUILT_PRODUCTS_DIR}/flutter_webview_plugin/flutter_webview_plugin.framework",
545544
"${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
546545
"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
@@ -561,7 +560,6 @@
561560
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
562561
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
563562
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_lottie.framework",
564-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbar.framework",
565563
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_webview_plugin.framework",
566564
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
567565
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",

lib/common/utils/common_utils.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import 'package:flutter_spinkit/flutter_spinkit.dart';
2121
import 'package:path_provider/path_provider.dart';
2222
import 'package:redux/redux.dart';
2323
import 'package:url_launcher/url_launcher.dart';
24-
import 'package:flutter_statusbar/flutter_statusbar.dart';
2524

2625
/**
2726
* 通用逻辑
@@ -39,13 +38,6 @@ class CommonUtils {
3938

4039
static final double DAYS_LIMIT = 30 * HOURS_LIMIT;
4140

42-
static double sStaticBarHeight = 0.0;
43-
44-
static void initStatusBarHeight(context) async {
45-
sStaticBarHeight =
46-
await FlutterStatusbar.height / MediaQuery.of(context).devicePixelRatio;
47-
}
48-
4941
static String getDateStr(DateTime date) {
5042
if (date == null || date.toString() == null) {
5143
return "";

lib/page/welcome_page.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class _WelcomePageState extends State<WelcomePage> {
3737

3838
///防止多次进入
3939
Store<GSYState> store = StoreProvider.of(context);
40-
CommonUtils.initStatusBarHeight(context);
4140
new Future.delayed(const Duration(seconds: 2, milliseconds: 500), () {
4241
UserDao.initUserInfo(store).then((res) {
4342
if (res != null && res.result) {

lib/widget/gsy_search_drawer.dart

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ class _GSYSearchDrawerState extends State<GSYSearchDrawer> {
2828

2929
@override
3030
Widget build(BuildContext context) {
31-
return new Container(
32-
color: Theme.of(context).primaryColor,
33-
padding: EdgeInsets.only(top: CommonUtils.sStaticBarHeight),
34-
child: Container(
35-
color: Color(GSYColors.white),
36-
child: new SingleChildScrollView(
37-
child: new Column(
38-
children: _renderList(),
31+
return new SafeArea(
32+
child: new Container(
33+
color: Theme.of(context).primaryColor,
34+
child: Container(
35+
color: Color(GSYColors.white),
36+
child: new SingleChildScrollView(
37+
child: new Column(
38+
children: _renderList(),
39+
),
3940
),
4041
),
4142
),
@@ -63,7 +64,8 @@ class _GSYSearchDrawerState extends State<GSYSearchDrawer> {
6364
list.add(_renderTitle(CommonUtils.getLocale(context).search_language));
6465
for (int i = 0; i < searchLanguageType.length; i++) {
6566
FilterModel model = searchLanguageType[i];
66-
list.add(_renderItem(model, searchLanguageType, i, widget.languageCallback));
67+
list.add(
68+
_renderItem(model, searchLanguageType, i, widget.languageCallback));
6769
list.add(_renderDivider());
6870
}
6971
return list;
@@ -92,7 +94,8 @@ class _GSYSearchDrawerState extends State<GSYSearchDrawer> {
9294
);
9395
}
9496

95-
_renderItem(FilterModel model, List<FilterModel> list, int index, SearchSelectItemChanged<String> select) {
97+
_renderItem(FilterModel model, List<FilterModel> list, int index,
98+
SearchSelectItemChanged<String> select) {
9699
return new Stack(
97100
children: <Widget>[
98101
new Container(
@@ -103,7 +106,9 @@ class _GSYSearchDrawerState extends State<GSYSearchDrawer> {
103106
mainAxisSize: MainAxisSize.min,
104107
crossAxisAlignment: CrossAxisAlignment.start,
105108
children: <Widget>[
106-
new Center(child: new Checkbox(value: model.select, onChanged: (value) {})),
109+
new Center(
110+
child: new Checkbox(
111+
value: model.select, onChanged: (value) {})),
107112
new Center(child: Text(model.name)),
108113
],
109114
),

pubspec.lock

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
44
after_layout:
55
dependency: transitive
@@ -21,7 +21,7 @@ packages:
2121
name: android_intent
2222
url: "https://pub.flutter-io.cn"
2323
source: hosted
24-
version: "0.3.0+2"
24+
version: "0.3.1+1"
2525
args:
2626
dependency: transitive
2727
description:
@@ -126,7 +126,7 @@ packages:
126126
name: connectivity
127127
url: "https://pub.flutter-io.cn"
128128
source: hosted
129-
version: "0.4.3+1"
129+
version: "0.4.3+2"
130130
convert:
131131
dependency: transitive
132132
description:
@@ -175,14 +175,14 @@ packages:
175175
name: device_info
176176
url: "https://pub.flutter-io.cn"
177177
source: hosted
178-
version: "0.4.0+1"
178+
version: "0.4.0+2"
179179
dio:
180180
dependency: "direct main"
181181
description:
182182
name: dio
183183
url: "https://pub.flutter-io.cn"
184184
source: hosted
185-
version: "2.1.4"
185+
version: "2.1.11"
186186
event_bus:
187187
dependency: "direct main"
188188
description:
@@ -226,7 +226,7 @@ packages:
226226
name: flutter_cache_manager
227227
url: "https://pub.flutter-io.cn"
228228
source: hosted
229-
version: "0.3.2"
229+
version: "1.0.0"
230230
flutter_localizations:
231231
dependency: "direct main"
232232
description: flutter
@@ -261,21 +261,14 @@ packages:
261261
name: flutter_slidable
262262
url: "https://pub.flutter-io.cn"
263263
source: hosted
264-
version: "0.5.0"
264+
version: "0.5.3"
265265
flutter_spinkit:
266266
dependency: "direct main"
267267
description:
268268
name: flutter_spinkit
269269
url: "https://pub.flutter-io.cn"
270270
source: hosted
271271
version: "3.1.0"
272-
flutter_statusbar:
273-
dependency: "direct main"
274-
description:
275-
name: flutter_statusbar
276-
url: "https://pub.flutter-io.cn"
277-
source: hosted
278-
version: "0.0.1"
279272
flutter_svg:
280273
dependency: "direct main"
281274
description:
@@ -296,7 +289,7 @@ packages:
296289
name: fluttertoast
297290
url: "https://pub.flutter-io.cn"
298291
source: hosted
299-
version: "3.0.4"
292+
version: "3.1.0"
300293
front_end:
301294
dependency: transitive
302295
description:
@@ -436,7 +429,7 @@ packages:
436429
name: package_info
437430
url: "https://pub.flutter-io.cn"
438431
source: hosted
439-
version: "0.4.0+3"
432+
version: "0.4.0+4"
440433
package_resolver:
441434
dependency: transitive
442435
description:
@@ -471,7 +464,7 @@ packages:
471464
name: path_provider
472465
url: "https://pub.flutter-io.cn"
473466
source: hosted
474-
version: "0.5.0+1"
467+
version: "1.1.2"
475468
pedantic:
476469
dependency: transitive
477470
description:
@@ -485,7 +478,7 @@ packages:
485478
name: permission_handler
486479
url: "https://pub.flutter-io.cn"
487480
source: hosted
488-
version: "3.0.2"
481+
version: "3.1.0"
489482
petitparser:
490483
dependency: transitive
491484
description:
@@ -571,14 +564,14 @@ packages:
571564
name: share
572565
url: "https://pub.flutter-io.cn"
573566
source: hosted
574-
version: "0.6.1"
567+
version: "0.6.1+1"
575568
shared_preferences:
576569
dependency: "direct main"
577570
description:
578571
name: shared_preferences
579572
url: "https://pub.flutter-io.cn"
580573
source: hosted
581-
version: "0.5.2"
574+
version: "0.5.3+2"
582575
shelf:
583576
dependency: transitive
584577
description:
@@ -618,7 +611,7 @@ packages:
618611
name: sqflite
619612
url: "https://pub.flutter-io.cn"
620613
source: hosted
621-
version: "1.1.5"
614+
version: "1.1.6+1"
622615
stack_trace:
623616
dependency: transitive
624617
description:
@@ -681,7 +674,7 @@ packages:
681674
name: url_launcher
682675
url: "https://pub.flutter-io.cn"
683676
source: hosted
684-
version: "5.0.2"
677+
version: "5.0.3"
685678
uuid:
686679
dependency: transitive
687680
description:
@@ -716,7 +709,7 @@ packages:
716709
name: webview_flutter
717710
url: "https://pub.flutter-io.cn"
718711
source: hosted
719-
version: "0.3.7+1"
712+
version: "0.3.9+1"
720713
xml:
721714
dependency: transitive
722715
description:

pubspec.yaml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,31 @@ dependencies:
1212
# The following adds the Cupertino Icons font to your application.
1313
# Use with the CupertinoIcons class for iOS style icons.
1414
cupertino_icons: ^0.1.2
15-
shared_preferences: ^0.5.1+1
16-
fluttertoast: ^3.0.1
15+
shared_preferences: ^0.5.3+2
16+
fluttertoast: ^3.1.0
1717
json_annotation: ^2.4.0
1818
flutter_redux: ^0.5.3
19-
device_info: ^0.4.0+1
20-
connectivity: ^0.4.3+1
21-
url_launcher: ^5.0.2
19+
device_info: ^0.4.0+2
20+
connectivity: ^0.4.3+2
21+
url_launcher: ^5.0.3
2222
flutter_markdown: ^0.2.0
23-
share: ^0.6.0+1
23+
share: ^0.6.1+1
2424
flutter_spinkit: ^3.1.0
2525
flutter_webview_plugin: ^0.3.5
26-
sqflite: ^1.1.5
26+
sqflite: ^1.1.6
2727
pub_semver: ^1.4.2
28-
flutter_statusbar: ^0.0.1
2928
flutter_svg: ^0.13.0+1
30-
flutter_slidable: ^0.5.0
31-
dio: ^2.1.4
29+
flutter_slidable: ^0.5.3
30+
dio: ^2.1.11
3231
event_bus: ^1.1.0
33-
flutter_cache_manager: ^0.3.2
34-
path_provider: ^0.5.0+1
35-
permission_handler: 3.0.2
32+
flutter_cache_manager: ^1.0,0
33+
path_provider: ^1.1.2
34+
permission_handler: 3.1.0
3635
scoped_model: ^1.0.1
37-
package_info: ^0.4.0+3
36+
package_info: ^0.4.0+4
3837
rxdart: ^0.22.0
39-
android_intent: ^0.3.0
40-
webview_flutter: ^0.3.7+1
38+
android_intent: ^0.3.1+1
39+
webview_flutter: ^0.3.9+1
4140
bezier: ^1.1.2
4241
provider: ^3.0.0+1
4342
flare_flutter:

0 commit comments

Comments
 (0)