Skip to content

Commit b4995f9

Browse files
committed
同步文件
1 parent ef0b12e commit b4995f9

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

Flutter_Go 代码开发规范.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void delete(String path) {
279279

280280
### 库的引用
281281

282-
flutter go 中,导入lib下文件库,统一指定报名,避免过多的```../../```
282+
flutter go 中,导入lib下文件库,统一指定包名,避免过多的```../../```
283283
```
284284
package:flutter_go/
285285
```

README-en.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## Flutter Go
22

3-
> Help developers get started quickly Flutter **In-house testing, the 1.0 official version will be released on February 20.**
3+
![https://img.alicdn.com/tfs/TB1OJkeHNYaK1RjSZFnXXa80pXa-229-229.png](https://img.alicdn.com/tfs/TB1OJkeHNYaK1RjSZFnXXa80pXa-229-229.png)
4+
5+
> Help developers get started quickly Flutter **Flutter Go 1.0 Android has been released**
46
57

68
## Download URL

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en.md) | [中文简体](https://github.com/alibaba/flutter-go/blob/master/README.md)
22
## Flutter Go
33

4-
> 帮助开发者快速上手 Flutter **内部测试中,1.0 正式版将于 2月 20日 发布。**
4+
![https://img.alicdn.com/tfs/TB1OJkeHNYaK1RjSZFnXXa80pXa-229-229.png](https://img.alicdn.com/tfs/TB1OJkeHNYaK1RjSZFnXXa80pXa-229-229.png)
5+
6+
> 帮助开发者快速上手 Flutter **Flutter Go 1.0 Android版已正式发布**
57
68
## 版本更新历史
79
> 按时间顺序,展示重要的提交更新内容。
@@ -17,7 +19,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en.
1719

1820
android下载地址:
1921

20-
<img src="https://img.alicdn.com/tfs/TB1Hy1FEzDpK1RjSZFrXXa78VXa-386-384.png" width="200px">
22+
<img src="https://img.alicdn.com/tfs/TB18aj7HQvoK1RjSZFNXXcxMVXa-486-490.png" width="200px">
2123

2224
iphone下载地址:
2325
暂无

lib/main.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:flutter_go/utils/provider.dart';
88
import 'package:flutter_go/utils/shared_preferences.dart';
99
import 'package:flutter_go/views/first_page/home.dart';
1010
import 'package:flutter_go/model/search_history.dart';
11-
import 'views/welcome_page/index.dart';
11+
//import 'views/welcome_page/index.dart';
1212

1313
const int ThemeColor = 0xFFC91B3A;
1414
SpUtil sp;
@@ -17,7 +17,9 @@ var db;
1717
class MyApp extends StatelessWidget {
1818
MyApp() {
1919
final router = new Router();
20+
2021
Routes.configureRoutes(router);
22+
2123
Application.router = router;
2224
}
2325
showWelcomePage() {
@@ -32,7 +34,6 @@ class MyApp extends StatelessWidget {
3234
}
3335
@override
3436
Widget build(BuildContext context) {
35-
showWelcomePage();
3637
return new MaterialApp(
3738
title: 'title',
3839
theme: new ThemeData(

lib/views/welcome_page/fourth_page.dart

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'dart:async';
22

33
import 'package:flutter/material.dart';
4-
54
import 'package:flutter_go/views/fourth_page/page_dragger.dart';
65
import 'package:flutter_go/views/fourth_page/page_reveal.dart';
76
import 'package:flutter_go/views/fourth_page/pager_indicator.dart';
@@ -19,13 +18,15 @@ class FourthPageState extends State<FourthPage> with TickerProviderStateMixin {
1918
int activeIndex = 0;
2019
SlideDirection slideDirection = SlideDirection.none;
2120
int nextPageIndex = 0;
21+
int waitingNextPageIndex = -1;
22+
2223
double slidePercent = 0.0;
2324

2425
FourthPageState() {
2526
slideUpdateStream = new StreamController<SlideUpdate>();
2627

2728
slideUpdateStream.stream.listen((SlideUpdate event) {
28-
if(mounted) {
29+
if (mounted) {
2930
setState(() {
3031
if (event.updateType == UpdateType.dragging) {
3132
slideDirection = event.direction;
@@ -56,15 +57,20 @@ class FourthPageState extends State<FourthPage> with TickerProviderStateMixin {
5657
vsync: this,
5758
);
5859

59-
nextPageIndex = activeIndex;
60+
waitingNextPageIndex = activeIndex;
6061
}
6162

6263
animatedPageDragger.run();
6364
} else if (event.updateType == UpdateType.animating) {
6465
slideDirection = event.direction;
6566
slidePercent = event.slidePercent;
6667
} else if (event.updateType == UpdateType.doneAnimating) {
67-
activeIndex = nextPageIndex;
68+
if (waitingNextPageIndex != -1) {
69+
nextPageIndex = waitingNextPageIndex;
70+
waitingNextPageIndex = -1;
71+
} else {
72+
activeIndex = nextPageIndex;
73+
}
6874

6975
slideDirection = SlideDirection.none;
7076
slidePercent = 0.0;

0 commit comments

Comments
 (0)