Skip to content

Commit

Permalink
调整获取线路的时机
Browse files Browse the repository at this point in the history 
嗯哼，曲线救国
  • Loading branch information
@imhansai
imhansai committed Oct 13, 2020
1 parent a095dcc commit 1588923
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 54 deletions.
105 changes: 52 additions & 53 deletions lib/view/home/home_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import 'package:weifangbus/view/home/guide/guide.dart';
import 'package:weifangbus/view/home/line/route_detail.dart';
import 'package:weifangbus/view/home/news/news_detail.dart';
import 'package:weifangbus/view/home/news/news_list.dart';
import 'package:weifangbus/view/home/searchbar/search_input.dart';
import 'package:weifangbus/view/home/searchbar/search_bar.dart';
import 'package:weifangbus/view/home/searchbar/search_input.dart';
import 'package:weifangbus/view/store/news_model.dart';

/// 首页
Expand All @@ -33,13 +33,13 @@ class HomePage extends StatefulWidget {
class _HomePageState extends State<HomePage>
with AutomaticKeepAliveClientMixin {
/// 菜单项
List<MenuEntity> menuEntityList = List();
List<MenuEntity> _menuEntityList = List();

/// 初始页json数据实体类
Future<StartUpBasicInfoEntity> _startUpBasicInfoFuture;

/// 所有线路
List<MaterialSearchResult<String>> allRouteList = List();
List<MaterialSearchResult<String>> _allRouteList = List();

/// [_startUpBasicInfoFuture] 请求成功后的数据
StartUpBasicInfoEntity _startUpBasicInfoEntity;
Expand All @@ -58,7 +58,7 @@ class _HomePageState extends State<HomePage>
super.initState();
setMenuEntityList();
_startUpBasicInfoFuture = _getStartUpBasicInfoFuture();
getAllRoute();
// getAllRoute();
}

@override
Expand Down Expand Up @@ -89,7 +89,7 @@ class _HomePageState extends State<HomePage>
child: MaterialSearch<String>(
barBackgroundColor: Theme.of(context).primaryColor,
placeholder: "搜索线路",
results: allRouteList,
results: _allRouteList,
filter: (dynamic value, String criteria) {
return value.toLowerCase().trim().contains(
RegExp(r'' + criteria.toLowerCase().trim() + ''));
Expand All @@ -101,7 +101,7 @@ class _HomePageState extends State<HomePage>
);
},
);
menuEntityList.add(lineInquiry);
_menuEntityList.add(lineInquiry);
MenuEntity guide = MenuEntity(
Colors.lightBlue,
MyIcons.guide,
Expand All @@ -117,7 +117,7 @@ class _HomePageState extends State<HomePage>
);
},
);
menuEntityList.add(guide);
_menuEntityList.add(guide);
MenuEntity news = MenuEntity(
Colors.orangeAccent,
MyIcons.news,
Expand All @@ -133,14 +133,16 @@ class _HomePageState extends State<HomePage>
);
},
);
menuEntityList.add(news);
_menuEntityList.add(news);
}

/// 请求首页数据
Future<StartUpBasicInfoEntity> _getStartUpBasicInfoFuture() async {
var connectivityResult = await (Connectivity().checkConnectivity());
if (connectivityResult != ConnectivityResult.none) {
try {
// todo 应该作用线路搜索页上
_getAllRoute();
var uri = "/BusService/Query_StartUpBasicInfo?" + getSignString();
Response response = await dio.get(uri);
var startUpBasicInfoEntity =
Expand All @@ -162,54 +164,51 @@ class _HomePageState extends State<HomePage>
}

/// 请求所有的路线
void getAllRoute() async {
try {
Response response;
var uri = "/BusService/Require_AllRouteData/?" + getSignString();
// print('$uri');
response = await dio.get(uri);
AllroutedataEntity allRouteDataEntity =
EntityFactory.generateOBJ<AllroutedataEntity>(response.data);
print("请求全部线路完成");
setState(() {
var routeList = allRouteDataEntity.routelist;
for (var i = 0; i < routeList.length; ++i) {
var route = routeList[i];
var materialSearchResult = MaterialSearchResult<String>(
index: i,
value: route.routename,
// icon: Icons.directions_bus,
routeName: route.routename,
routeNameExt: route.routenameext.substring(
route.routenameext.indexOf('(') + 1,
route.routenameext.length - 1),
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (BuildContext context) {
return RouteDetail(
title: route.routenameext,
routeId: route.routeid,
);
},
),
);
},
_getAllRoute() async {
Response response;
var uri = "/BusService/Require_AllRouteData/?" + getSignString();
// print('$uri');
response = await dio.get(uri);
AllroutedataEntity allRouteDataEntity =
EntityFactory.generateOBJ<AllroutedataEntity>(response.data);
print("请求全部线路完成");
var routeList = allRouteDataEntity.routelist;
List<MaterialSearchResult<String>> materialSearchResultList = List();
for (var i = 0; i < routeList.length; ++i) {
var route = routeList[i];
var materialSearchResult = MaterialSearchResult<String>(
index: i,
value: route.routename,
// icon: Icons.directions_bus,
routeName: route.routename,
routeNameExt: route.routenameext.substring(
route.routenameext.indexOf('(') + 1, route.routenameext.length - 1),
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (BuildContext context) {
return RouteDetail(
title: route.routenameext,
routeId: route.routeid,
);
},
),
);
allRouteList.add(materialSearchResult);
}
});
} catch (e) {
print('请求所有的路线异常::: $e');
},
);
materialSearchResultList.add(materialSearchResult);
}
setState(() {
_allRouteList = materialSearchResultList;
});
}

/// 重试处理
reTry() {
setState(() {
_startUpBasicInfoFuture = _getStartUpBasicInfoFuture();
getAllRoute();
Future.microtask(() => context.read<NewsModel>().refreshNewsList());
// getAllRoute();
});
}

Expand Down Expand Up @@ -420,7 +419,7 @@ class _HomePageState extends State<HomePage>
height: ScreenUtil().setHeight(180),
child: DecoratedBox(
decoration: BoxDecoration(
color: menuEntityList[index].color,
color: _menuEntityList[index].color,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
Expand All @@ -434,7 +433,7 @@ class _HomePageState extends State<HomePage>
),
child: Center(
child: Icon(
menuEntityList[index].icon,
_menuEntityList[index].icon,
size: ScreenUtil().setWidth(80),
color: Colors.white,
),
Expand All @@ -449,7 +448,7 @@ class _HomePageState extends State<HomePage>
ScreenUtil().setHeight(0),
),
child: Text(
menuEntityList[index].menuText,
_menuEntityList[index].menuText,
style: TextStyle(
fontSize: ScreenUtil().setSp(40),
),
Expand All @@ -458,10 +457,10 @@ class _HomePageState extends State<HomePage>
],
),
),
onTap: menuEntityList[index].function,
onTap: _menuEntityList[index].function,
);
},
childCount: menuEntityList.length,
childCount: _menuEntityList.length,
),
),
);
Expand Down Expand Up @@ -492,7 +491,7 @@ class _HomePageState extends State<HomePage>
super.build(context);
return Scaffold(
appBar: AppBar(
title: SearchBar(allRouteList: allRouteList),
title: SearchBar(allRouteList: _allRouteList),
),
body: FutureBuilder<StartUpBasicInfoEntity>(
future: _startUpBasicInfoFuture,
Expand Down
2 changes: 1 addition & 1 deletion lib/view/home/line/route_detail.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ class _RouteDetailState extends State<RouteDetail>
flex: 6,
child: AutoSizeText(
e.stationname,
maxLines: 1,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
Expand Down

0 comments on commit 1588923

Please sign in to comment.