Skip to content

G
gm_flutter
Commit d8093190 authored by 林生雨's avatar 林生雨
Browse files
Options

fix bug

parent 0ae1dc4b
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 80 deletions
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ d8093190
...@@ -348,10 +348,10 @@ class LevelTwoState extends BaseState<LevelTwoPage> ...@@ -348,10 +348,10 @@ class LevelTwoState extends BaseState<LevelTwoPage>
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 2, right: 2), margin: EdgeInsets.only(left: 2, right: 2),
child: baseText(element.attrName, 14, Color(0xff282828), child: baseText(element.attrValue, 14, Color(0xff282828),
bold: true), bold: true),
), ),
baseText(element.attrValue, 11, Color(0xff999999)), baseText(element.attrName, 11, Color(0xff999999)),
], ],
), ),
), ),
......
lib/ClueModel/page/plan/FilterView.dart
View file @ d8093190
...@@ -56,22 +56,14 @@ class FilterViewState extends State<FilterView> { ...@@ -56,22 +56,14 @@ class FilterViewState extends State<FilterView> {
height: 186, height: 186,
child: Stack( child: Stack(
children: <Widget>[ children: <Widget>[
Positioned( // Positioned(
top: 0, // top: 0,
child: Container( // child: Container(
width: MediaQuery.of(context).size.width, // width: MediaQuery.of(context).size.width,
height: 1, // height: 6,
decoration: BoxDecoration( // child: Image.asset("assets/shadow.png"),
boxShadow: [ // ),
BoxShadow( // ),
color: Color(0x08000000),
offset: Offset(0.0,1.0),
blurRadius: 6.0,
spreadRadius: 0.0),
],
),
),
),
Positioned( Positioned(
top: 54.5, top: 54.5,
right: 15, right: 15,
......
lib/ClueModel/page/plan/PlanItem.dart
View file @ d8093190
...@@ -28,7 +28,7 @@ class PlanItem extends StatelessWidget { ...@@ -28,7 +28,7 @@ class PlanItem extends StatelessWidget {
if (i != plans.baseAttrs.length - 1) { if (i != plans.baseAttrs.length - 1) {
list.add(Container( list.add(Container(
width: 8.5, width: 8.5,
height: 10, height: 11,
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Container( child: Container(
width: 0.5, width: 0.5,
...@@ -56,11 +56,14 @@ class PlanItem extends StatelessWidget { ...@@ -56,11 +56,14 @@ class PlanItem extends StatelessWidget {
showOprea = showOprea.length > 4 ? showOprea.substring(0, 4) : showOprea; showOprea = showOprea.length > 4 ? showOprea.substring(0, 4) : showOprea;
} }
return Container( return Container(
margin: EdgeInsets.only(top: 4, left: 10, right: 10), width: double.maxFinite,
margin: EdgeInsets.only(top: 4, left: 8, right: 8),
child: Card( child: Card(
elevation: 3.0, shadowColor: Color(0x08000000),
elevation: 2.0,
child: Container( child: Container(
height: 90, height: 90,
width: double.maxFinite,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, borderRadius: BorderRadius.circular(4)), color: Colors.white, borderRadius: BorderRadius.circular(4)),
child: Stack( child: Stack(
...@@ -98,17 +101,18 @@ class PlanItem extends StatelessWidget { ...@@ -98,17 +101,18 @@ class PlanItem extends StatelessWidget {
height: 0, height: 0,
) )
: Container( : Container(
// constraints: BoxConstraints(maxWidth: 60),
margin: EdgeInsets.only(left: 4), margin: EdgeInsets.only(left: 4),
child: Container( child: Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 2, bottom: 2, left: 3, right: 3), top: 0.5, bottom: 1, left: 3, right: 3),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2), borderRadius: BorderRadius.circular(2),
color: Color(0xffF0F9F7)), color: Color(0xffF0F9F7)),
alignment: Alignment.center, child: baseText(
child: showOprea,
baseText(showOprea, 11, Color(0xff3FB5AF)), 11,
Color(0xff3FB5AF),
),
), ),
) )
], ],
...@@ -133,7 +137,7 @@ class PlanItem extends StatelessWidget { ...@@ -133,7 +137,7 @@ class PlanItem extends StatelessWidget {
), ),
Positioned( Positioned(
left: 91, left: 91,
bottom: 8, bottom: 12,
child: Container( child: Container(
width: MediaQuery.of(context).size.width - 30 - 91 - 10, width: MediaQuery.of(context).size.width - 30 - 91 - 10,
child: Row( child: Row(
...@@ -164,7 +168,7 @@ class PlanItem extends StatelessWidget { ...@@ -164,7 +168,7 @@ class PlanItem extends StatelessWidget {
), ),
Positioned( Positioned(
left: 92, left: 92,
top: 36, top: 32,
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
......
lib/ClueModel/page/plan/PlanPage.dart
View file @ d8093190
...@@ -86,15 +86,24 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -86,15 +86,24 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
@override @override
Widget buildItem(BuildContext context) { Widget buildItem(BuildContext context) {
stateBarHeight = MediaQueryData.fromWindow(window).padding.top; stateBarHeight = MediaQueryData
.fromWindow(window)
.padding
.top;
topHeight = stateBarHeight + kToolbarHeight; topHeight = stateBarHeight + kToolbarHeight;
return Scaffold( return Scaffold(
body: MediaQuery.removePadding( body: MediaQuery.removePadding(
removeTop: true, removeTop: true,
context: context, context: context,
child: baseStateView( child: baseStateView(
MediaQuery.of(context).size.width, MediaQuery
MediaQuery.of(context).size.height, .of(context)
.size
.width,
MediaQuery
.of(context)
.size
.height,
_model.stateLive, _model.stateLive,
newHome(), () { newHome(), () {
_model.stateLive.notifyView(LOADING); _model.stateLive.notifyView(LOADING);
...@@ -104,15 +113,28 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -104,15 +113,28 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
} }
Widget newHome() { Widget newHome() {
double diff = Platform.isAndroid ? 50.0 : 0.0;
return Container( return Container(
width: MediaQuery.of(context).size.width, width: MediaQuery
.of(context)
.size
.width,
//主页 剪去tabbar高度 //主页 剪去tabbar高度
height: MediaQuery.of(context).size.height - 50, height: MediaQuery
.of(context)
.size
.height -diff,
child: Stack( child: Stack(
children: <Widget>[ children: <Widget>[
Container( Container(
width: MediaQuery.of(context).size.width, width: MediaQuery
height: MediaQuery.of(context).size.height - 50, .of(context)
.size
.width,
height: MediaQuery
.of(context)
.size
.height - diff,
// child: child(), // child: child(),
child: homeWarp(), child: homeWarp(),
), ),
...@@ -126,13 +148,19 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -126,13 +148,19 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
child: Visibility( child: Visibility(
visible: data.data[2] > 0.1, visible: data.data[2] > 0.1,
child: Container( child: Container(
width: MediaQuery.of(context).size.width, width: MediaQuery
height: MediaQuery.of(context).size.height, .of(context)
.size
.width,
height: MediaQuery
.of(context)
.size
.height,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
height: height:
data.data[1] - 45 < 0 ? 0 : data.data[1] - 45, data.data[1] - 45 < 0 ? 0 : data.data[1] - 45,
color: Colors.transparent, color: Colors.transparent,
), ),
Container( Container(
...@@ -178,15 +206,18 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -178,15 +206,18 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
return BasePopMenu( return BasePopMenu(
leftPos: data.data[0], leftPos: data.data[0],
topPos: data.data[1], topPos: data.data[1],
width: MediaQuery.of(context).size.width, width: MediaQuery
.of(context)
.size
.width,
maxHeight: 450, maxHeight: 450,
listener: projectMenuListener, listener: projectMenuListener,
child: child:
ProjectView(_model.projectSelectIndex, _model.projectData, ProjectView(_model.projectSelectIndex, _model.projectData,
(id, name, index) { (id, name, index) {
clickIndexOther(0); clickIndexOther(0);
_model.projectClick(id, name, index); _model.projectClick(id, name, index);
}), }),
proListener: (pro) { proListener: (pro) {
_model.backProgress(pro, 0); _model.backProgress(pro, 0);
}, },
...@@ -199,7 +230,10 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -199,7 +230,10 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
return BasePopMenu( return BasePopMenu(
leftPos: data.data[0], leftPos: data.data[0],
topPos: data.data[1], topPos: data.data[1],
width: MediaQuery.of(context).size.width, width: MediaQuery
.of(context)
.size
.width,
maxHeight: 45 * _model.sortList.length, maxHeight: 45 * _model.sortList.length,
listener: sortMenuListener, listener: sortMenuListener,
child: SortView(_model.sortList, _model.sortPos, (index) { child: SortView(_model.sortList, _model.sortPos, (index) {
...@@ -219,11 +253,14 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -219,11 +253,14 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
return BasePopMenu( return BasePopMenu(
leftPos: data.data[0], leftPos: data.data[0],
topPos: data.data[1], topPos: data.data[1],
width: MediaQuery.of(context).size.width, width: MediaQuery
.of(context)
.size
.width,
maxHeight: 186, maxHeight: 186,
listener: filterMenuListener, listener: filterMenuListener,
child: FilterView( child: FilterView(
(max, min) { (max, min) {
clickIndexOther(2); clickIndexOther(2);
_model.filterClick(max, min); _model.filterClick(max, min);
}, },
...@@ -334,22 +371,23 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -334,22 +371,23 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
return <Widget>[ return <Widget>[
SliverOverlapAbsorber( SliverOverlapAbsorber(
handle: handle:
NestedScrollView.sliverOverlapAbsorberHandleFor(context), NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: baseSliverAppBar(null, sliver: baseSliverAppBar(null,
height: kToolbarHeight + stateBarHeight, needpic: false)), height: kToolbarHeight + stateBarHeight - 39,
needpic: false)),
SliverList( SliverList(
delegate: SliverChildBuilderDelegate((BuildContext c, int i) { delegate: SliverChildBuilderDelegate((BuildContext c, int i) {
if (i == 0) { if (i == 0) {
return Container( return Container(
height: kToolbarHeight, height: kToolbarHeight,
); );
} }
return towPic(); return towPic();
}, childCount: 2)), }, childCount: 2)),
SliverPersistentHeader( SliverPersistentHeader(
pinned: true, pinned: true,
delegate: delegate:
StickyTabBarDelegateWithSize(child: planBar(), height: 45), StickyTabBarDelegateWithSize(child: planBar(), height: 45),
) )
]; ];
}, },
...@@ -362,29 +400,47 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -362,29 +400,47 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
initialData: _model.feedsLive.data ?? Pair(LOADING, null), initialData: _model.feedsLive.data ?? Pair(LOADING, null),
builder: (c, data) { builder: (c, data) {
if (data.data.first == FAIL) { if (data.data.first == FAIL) {
return errorItem(MediaQuery.of(context).size.width, return errorItem(MediaQuery
MediaQuery.of(context).size.height, () { .of(context)
_model.feedsLive.notifyView(Pair(LOADING, null)); .size
_model.refreshFeed(true); .width,
}); MediaQuery
.of(context)
.size
.height, () {
_model.feedsLive.notifyView(Pair(LOADING, null));
_model.refreshFeed(true);
});
} }
if (data.data.first == LOADING) { if (data.data.first == LOADING) {
return Container( return Container(
color: Colors.white, color: Colors.white,
width: MediaQuery.of(context).size.width, width: MediaQuery
height: MediaQuery.of(context).size.height, .of(context)
.size
.width,
height: MediaQuery
.of(context)
.size
.height,
child: loadingItem(), child: loadingItem(),
); );
} }
if (data.data.first == EMPTY) { if (data.data.first == EMPTY) {
return emptyItem(MediaQuery.of(context).size.width, return emptyItem(MediaQuery
MediaQuery.of(context).size.height); .of(context)
.size
.width,
MediaQuery
.of(context)
.size
.height);
} }
return Container( return Container(
color: Color(0xffF7F6FA), color: Color(0xffF7F6FA),
child: baseRefreshView( child: baseRefreshView(
refreshController, refreshController,
() { () {
_model.refreshFeed(true, controller: refreshController); _model.refreshFeed(true, controller: refreshController);
}, },
null, null,
...@@ -394,7 +450,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -394,7 +450,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
slivers: <Widget>[ slivers: <Widget>[
SliverList( SliverList(
delegate: SliverChildBuilderDelegate( delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) { (BuildContext context, int index) {
if (data.data.second.length == 0) { if (data.data.second.length == 0) {
if (_model.page != 1) { if (_model.page != 1) {
refreshController.loadNoData(); refreshController.loadNoData();
...@@ -402,10 +458,16 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -402,10 +458,16 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
} else { } else {
refreshController.loadComplete(); refreshController.loadComplete();
} }
if (index == 0) {
return Container(
height: 6,
color: Color(0xffF7F6FA),
);
}
return PlanItem( return PlanItem(
_model.feedDatas[index], index, true, ""); _model.feedDatas[index - 1], index - 1, true, "");
}, },
childCount: _model.feedDatas.length, childCount: _model.feedDatas.length + 1,
), ),
) )
], ],
...@@ -436,7 +498,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -436,7 +498,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
borderRadius: BorderRadius.circular(3), borderRadius: BorderRadius.circular(3),
child: CachedNetworkImage( child: CachedNetworkImage(
imageUrl: imageUrl:
data.data == null ? "" : data.data[0].icon ?? "", data.data == null ? "" : data.data[0].icon ?? "",
fit: BoxFit.cover, fit: BoxFit.cover,
)).gestureDetector(() { )).gestureDetector(() {
Map<String, dynamic> map = { Map<String, dynamic> map = {
...@@ -468,7 +530,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -468,7 +530,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
borderRadius: BorderRadius.circular(3), borderRadius: BorderRadius.circular(3),
child: CachedNetworkImage( child: CachedNetworkImage(
imageUrl: imageUrl:
data.data == null ? "" : data.data[1].icon ?? "", data.data == null ? "" : data.data[1].icon ?? "",
fit: BoxFit.cover, fit: BoxFit.cover,
)).gestureDetector(() { )).gestureDetector(() {
Map<String, dynamic> map = { Map<String, dynamic> map = {
...@@ -525,7 +587,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -525,7 +587,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
double bottom = double bottom =
// WidgetUtil.buttonLeftMenuPosition(globalKey.currentContext)?.top ?? // WidgetUtil.buttonLeftMenuPosition(globalKey.currentContext)?.top ??
topPos == null ? 0.0 : topPos.dy + 45; topPos == null ? 0.0 : topPos.dy + 45;
if (bottom < 45) { if (bottom < 45) {
bottom = 45; bottom = 45;
} }
......
lib/ClueModel/page/plan/PlanProgressBar.dart
View file @ d8093190
...@@ -108,7 +108,7 @@ class PlanProgressBarState extends State<PlanProgressBar> { ...@@ -108,7 +108,7 @@ class PlanProgressBarState extends State<PlanProgressBar> {
widget.highLive.notifyView(textStr); widget.highLive.notifyView(textStr);
} }
double textWidth = textStr.length * 12.0+6; double textWidth =13+ (textStr.length-1) * 6.0+21;
if (textStr == "无限") { if (textStr == "无限") {
textWidth = textStr.length * 14.0+12; textWidth = textStr.length * 14.0+12;
} }
...@@ -152,13 +152,13 @@ class PlanProgressBarState extends State<PlanProgressBar> { ...@@ -152,13 +152,13 @@ class PlanProgressBarState extends State<PlanProgressBar> {
// textLeft >= 0 // textLeft >= 0
child: Container( child: Container(
width: textWidth, width: textWidth,
height: 42, height: 37,
child: Stack( child: Stack(
alignment: AlignmentDirectional.topCenter, alignment: AlignmentDirectional.topCenter,
children: <Widget>[ children: <Widget>[
Container( Container(
width: textWidth, width: textWidth,
height: 37, height: 32,
color: Colors.white, color: Colors.white,
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
...@@ -168,7 +168,7 @@ class PlanProgressBarState extends State<PlanProgressBar> { ...@@ -168,7 +168,7 @@ class PlanProgressBarState extends State<PlanProgressBar> {
), ),
), ),
Positioned( Positioned(
top: 36.9, top: 31.9,
child: Container( child: Container(
width: 9, width: 9,
height: 5, height: 5,
...@@ -178,7 +178,7 @@ class PlanProgressBarState extends State<PlanProgressBar> { ...@@ -178,7 +178,7 @@ class PlanProgressBarState extends State<PlanProgressBar> {
), ),
), ),
Positioned( Positioned(
top: 10, top: 6,
child: Container( child: Container(
width: textWidth, width: textWidth,
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
......
lib/ClueModel/page/top/TopList.dart
View file @ d8093190
...@@ -17,6 +17,7 @@ class TopList extends StatefulWidget { ...@@ -17,6 +17,7 @@ class TopList extends StatefulWidget {
double topHeight; double topHeight;
final String rankId; final String rankId;
String tabName; String tabName;
TopList(this.rankId, this.id, this.topHeight, this.tabName); TopList(this.rankId, this.id, this.topHeight, this.tabName);
@override @override
...@@ -75,6 +76,12 @@ class TopListState extends State<TopList> with AutomaticKeepAliveClientMixin { ...@@ -75,6 +76,12 @@ class TopListState extends State<TopList> with AutomaticKeepAliveClientMixin {
// extend.SliverOverlapInjector( // extend.SliverOverlapInjector(
// handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context), // handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
// ), // ),
SliverToBoxAdapter(
child: Container(
height: 6,
color: Color(0xffF7F6FA),
),
),
StreamBuilder<List<Plans>>( StreamBuilder<List<Plans>>(
stream: _model.datasLive.stream, stream: _model.datasLive.stream,
initialData: _model.datas ?? [], initialData: _model.datas ?? [],
......
lib/commonModel/base/BaseComponent.dart
View file @ d8093190
...@@ -319,7 +319,7 @@ Widget baseRefreshView(RefreshController refreshController, ...@@ -319,7 +319,7 @@ Widget baseRefreshView(RefreshController refreshController,
// body = baseText("加载失败", 12, Color(0xff545454)); // body = baseText("加载失败", 12, Color(0xff545454));
// } else // } else
if (mode == LoadStatus.noMore) { if (mode == LoadStatus.noMore) {
body = baseText("我们是有底线的", 12, Color(0xff545454)); body = baseText("我们是有底线的", 12, Color(0xff999999));
} }
// else { // else {
// body = Container(); // body = Container();
...@@ -485,7 +485,8 @@ Widget baseSliverAppBar(String url, ...@@ -485,7 +485,8 @@ Widget baseSliverAppBar(String url,
imageUrl: url ?? '', imageUrl: url ?? '',
fit: BoxFit.cover, fit: BoxFit.cover,
) )
: Container(), : Container(
),
), ),
); );
} }
......
updateAar.sh
View file @ d8093190
...@@ -17,6 +17,7 @@ rm -rf ${projectDir}/build ...@@ -17,6 +17,7 @@ rm -rf ${projectDir}/build
flutter build aar --release --target-platform android-arm flutter build aar --release --target-platform android-arm
#rm -rf /Users/apple/lsy/gengmei_android/gm-flutter/libs/flutterApp.aar #rm -rf /Users/apple/lsy/gengmei_android/gm-flutter/libs/flutterApp.aar
cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/zcc/Downloads/gm-flutter/libs/flutterApp.aar #cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/zcc/Downloads/gm-flutter/libs/flutterApp.aar
cp -r ${projectDir}/build/host/outputs/repo/com/example/gm_flutter/flutter_release/1.0/flutter_release-1.0.aar /Users/apple/lsy/gengmei_android/libs/flutterApp.aar
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