Commit ec0284ff authored by 林生雨's avatar 林生雨

commot

parent 8ecd2a5b
...@@ -72,4 +72,5 @@ class LevelOneModel extends BaseModel { ...@@ -72,4 +72,5 @@ class LevelOneModel extends BaseModel {
void selectTab(int index) { void selectTab(int index) {
} }
} }
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* @author lsy * @author lsy
* @date 2020/6/29 * @date 2020/6/29
**/ **/
import 'dart:async';
import 'dart:math'; import 'dart:math';
import 'dart:ui'; import 'dart:ui';
...@@ -21,6 +22,7 @@ import 'package:gm_flutter/commonModel/base/BaseComponent.dart'; ...@@ -21,6 +22,7 @@ import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/base/BaseState.dart'; import 'package:gm_flutter/commonModel/base/BaseState.dart';
import 'package:gm_flutter/commonModel/bean/Pair.dart'; import 'package:gm_flutter/commonModel/bean/Pair.dart';
import 'package:gm_flutter/commonModel/util/DartUtil.dart'; import 'package:gm_flutter/commonModel/util/DartUtil.dart';
import 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'LevelOneBar.dart'; import 'LevelOneBar.dart';
...@@ -114,7 +116,18 @@ class LevelOneState extends BaseState<LevelOnePage> { ...@@ -114,7 +116,18 @@ class LevelOneState extends BaseState<LevelOnePage> {
MediaQuery.of(context).size.width, MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height, MediaQuery.of(context).size.height,
_model.stateLive, _model.stateLive,
newHomeWarp(), () { Container(
child: NestedScrollViewRefreshIndicator(
onRefresh: () async {
Completer completer = new Completer();
_model.init(() {
setState(() {});
completer.complete();
});
return completer.future;
},
child: newHomeWarp()),
), () {
_model.init(() { _model.init(() {
setState(() {}); setState(() {});
}); });
...@@ -168,7 +181,8 @@ class LevelOneState extends BaseState<LevelOnePage> { ...@@ -168,7 +181,8 @@ class LevelOneState extends BaseState<LevelOnePage> {
var d = MediaQueryData.fromWindow(window).padding.top; var d = MediaQueryData.fromWindow(window).padding.top;
for (int i = 0; i < _model.tabsList.length; i++) { for (int i = 0; i < _model.tabsList.length; i++) {
list.add( list.add(
LevelOneList(planId, _model.tabsList[i].tabType, kToolbarHeight + d).toActive()); LevelOneList(planId, _model.tabsList[i].tabType, kToolbarHeight + d)
.toActive());
} }
final double statusBarHeight = MediaQuery.of(context).padding.top; final double statusBarHeight = MediaQuery.of(context).padding.top;
final double pinnedHeaderHeight = statusBarHeight + kToolbarHeight; final double pinnedHeaderHeight = statusBarHeight + kToolbarHeight;
...@@ -179,21 +193,21 @@ class LevelOneState extends BaseState<LevelOnePage> { ...@@ -179,21 +193,21 @@ class LevelOneState extends BaseState<LevelOnePage> {
(BuildContext context, bool innerBoxIsScrolled) { (BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[ return <Widget>[
SliverOverlapAbsorber( SliverOverlapAbsorber(
handle: handle: NestedScrollView.sliverOverlapAbsorberHandleFor(
NestedScrollView.sliverOverlapAbsorberHandleFor( context),
context),
sliver: baseSliverAppBar( sliver: baseSliverAppBar(
// _model.imageUrl // _model.imageUrl
"https://pic.igengmei.com/2018/09/11/1513/b7e825a4e4c1-w")), "https://pic.igengmei.com/2018/09/11/1513/b7e825a4e4c1-w")),
SliverList( SliverList(
delegate: SliverChildBuilderDelegate((BuildContext c, int i) { delegate:
if(i==0){ SliverChildBuilderDelegate((BuildContext c, int i) {
return Container( if (i == 0) {
height: pinnedHeaderHeight, return Container(
); height: pinnedHeaderHeight,
} );
return oneList[i-1]; }
}, childCount: oneList.length+1)), return oneList[i - 1];
}, childCount: oneList.length + 1)),
SliverPersistentHeader( SliverPersistentHeader(
pinned: true, pinned: true,
delegate: StickyTabBarDelegate( delegate: StickyTabBarDelegate(
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment