|
|
|
@ -1,14 +1,20 @@ |
|
|
|
import 'dart:convert'; |
|
|
|
import 'dart:convert'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import 'package:dio/dio.dart'; |
|
|
|
import 'package:flutter/cupertino.dart'; |
|
|
|
import 'package:flutter/cupertino.dart'; |
|
|
|
import 'package:flutter/material.dart'; |
|
|
|
import 'package:flutter/material.dart'; |
|
|
|
import 'package:flutter/services.dart'; |
|
|
|
import 'package:flutter/services.dart'; |
|
|
|
import 'package:huixiang/utils/font_weight.dart'; |
|
|
|
import 'package:huixiang/utils/font_weight.dart'; |
|
|
|
import 'package:flutter_screenutil/flutter_screenutil.dart'; |
|
|
|
import 'package:flutter_screenutil/flutter_screenutil.dart'; |
|
|
|
import 'package:huixiang/view_widget/my_appbar.dart'; |
|
|
|
|
|
|
|
import 'package:pull_to_refresh/pull_to_refresh.dart'; |
|
|
|
import 'package:pull_to_refresh/pull_to_refresh.dart'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import '../retrofit/data/ip_data.dart'; |
|
|
|
|
|
|
|
import '../retrofit/retrofit_api.dart'; |
|
|
|
|
|
|
|
|
|
|
|
class UnionSelectCity extends StatefulWidget { |
|
|
|
class UnionSelectCity extends StatefulWidget { |
|
|
|
|
|
|
|
final Map<String, dynamic> arguments; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
UnionSelectCity({this.arguments}); |
|
|
|
@override |
|
|
|
@override |
|
|
|
State<StatefulWidget> createState() { |
|
|
|
State<StatefulWidget> createState() { |
|
|
|
return _UnionSelectCity(); |
|
|
|
return _UnionSelectCity(); |
|
|
|
@ -18,25 +24,58 @@ class UnionSelectCity extends StatefulWidget { |
|
|
|
class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
RefreshController refreshController = RefreshController(); |
|
|
|
RefreshController refreshController = RefreshController(); |
|
|
|
Map<String, dynamic> areaMap; |
|
|
|
Map<String, dynamic> areaMap; |
|
|
|
|
|
|
|
ApiService apiIpService; |
|
|
|
|
|
|
|
String ipName; |
|
|
|
|
|
|
|
int ipState = 0; |
|
|
|
|
|
|
|
List<String> hotCity = []; |
|
|
|
List<String> areaList = []; |
|
|
|
List<String> areaList = []; |
|
|
|
final TextEditingController editingController = TextEditingController(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@override |
|
|
|
@override |
|
|
|
void initState() { |
|
|
|
void initState() { |
|
|
|
super.initState(); |
|
|
|
super.initState(); |
|
|
|
areaCode(); |
|
|
|
areaCode(); |
|
|
|
|
|
|
|
queryIpInfo(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void areaCode() async { |
|
|
|
void areaCode({String searchTxt}) async { |
|
|
|
var value = |
|
|
|
var value = |
|
|
|
await rootBundle.loadString('assets/map_style/chinese_cities.json'); |
|
|
|
await rootBundle.loadString('assets/map_style/chinese_cities.json'); |
|
|
|
|
|
|
|
areaList.clear(); |
|
|
|
areaMap = jsonDecode(value); |
|
|
|
areaMap = jsonDecode(value); |
|
|
|
|
|
|
|
hotCity = (areaMap["热门城市"] as List).map((e) { |
|
|
|
|
|
|
|
return e["area"].toString(); |
|
|
|
|
|
|
|
}).toList(); |
|
|
|
|
|
|
|
areaMap.remove("热门城市"); |
|
|
|
|
|
|
|
Map<String, dynamic> tempAreaMap = jsonDecode(value); |
|
|
|
areaMap.forEach((key, value) { |
|
|
|
areaMap.forEach((key, value) { |
|
|
|
areaList.add(key); |
|
|
|
if (searchTxt != null && searchTxt.trim() != "") |
|
|
|
|
|
|
|
value.forEach((element) { |
|
|
|
|
|
|
|
if (!element["area"].contains(searchTxt)) |
|
|
|
|
|
|
|
(tempAreaMap[key] as List) |
|
|
|
|
|
|
|
.removeWhere((el) => el["area"] == element["area"]); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
if (tempAreaMap[key].isNotEmpty) areaList.add(key); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
areaMap = tempAreaMap; |
|
|
|
setState(() {}); |
|
|
|
setState(() {}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
queryIpInfo() async { |
|
|
|
|
|
|
|
apiIpService = ApiService( |
|
|
|
|
|
|
|
Dio(), |
|
|
|
|
|
|
|
context: context, |
|
|
|
|
|
|
|
isIp: true |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
IpData baseData = await apiIpService.getIpInfo().catchError((onError) {}); |
|
|
|
|
|
|
|
if (baseData != null) { |
|
|
|
|
|
|
|
ipName = baseData.city.replaceAll("市", ""); |
|
|
|
|
|
|
|
if(ipName != widget.arguments["cityName"] ){ |
|
|
|
|
|
|
|
ipState=2; |
|
|
|
|
|
|
|
setState((){}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@override |
|
|
|
@override |
|
|
|
Widget build(BuildContext context) { |
|
|
|
Widget build(BuildContext context) { |
|
|
|
return Scaffold( |
|
|
|
return Scaffold( |
|
|
|
@ -60,9 +99,9 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
onTap: () { |
|
|
|
onTap: () { |
|
|
|
Navigator.of(context).pop(); |
|
|
|
Navigator.of(context).pop(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
child:Container( |
|
|
|
child: Container( |
|
|
|
padding: EdgeInsets.only(right:21.w), |
|
|
|
padding: EdgeInsets.only(right: 21.w), |
|
|
|
child: Icon( |
|
|
|
child: Icon( |
|
|
|
Icons.arrow_back_ios, |
|
|
|
Icons.arrow_back_ios, |
|
|
|
color: Colors.black, |
|
|
|
color: Colors.black, |
|
|
|
), |
|
|
|
), |
|
|
|
@ -70,206 +109,112 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
Expanded(child: searchCityItem()) |
|
|
|
Expanded(child: searchCityItem()) |
|
|
|
], |
|
|
|
], |
|
|
|
), |
|
|
|
), |
|
|
|
Padding(padding:EdgeInsets.only(top: 16.h,bottom: 24.h), |
|
|
|
Padding( |
|
|
|
child:Row( |
|
|
|
padding: EdgeInsets.only(top: 16.h, bottom: 24.h), |
|
|
|
children: [ |
|
|
|
child: Row( |
|
|
|
Padding(padding:EdgeInsets.only(right: 10.w), |
|
|
|
crossAxisAlignment: CrossAxisAlignment.center, |
|
|
|
child: Text( |
|
|
|
children: [ |
|
|
|
"当前位置", |
|
|
|
Padding( |
|
|
|
style: TextStyle( |
|
|
|
padding: EdgeInsets.only(right: 10.w), |
|
|
|
color: Color(0xFFA29E9E), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
),), |
|
|
|
|
|
|
|
Image.asset( |
|
|
|
|
|
|
|
"assets/image/icon_union_location.webp", |
|
|
|
|
|
|
|
width:20, |
|
|
|
|
|
|
|
height:20, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
Padding(padding:EdgeInsets.only(left:8.w,), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"当前位置", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
),), |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
)), |
|
|
|
|
|
|
|
Padding(padding:EdgeInsets.only(bottom: 16.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"热门城市", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFFA29E9E), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
),), |
|
|
|
|
|
|
|
Padding(padding:EdgeInsets.only(right: 14.h,bottom: 14.h), |
|
|
|
|
|
|
|
child: Row( |
|
|
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween, |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
GestureDetector( |
|
|
|
|
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
|
|
|
|
onTap: (){ |
|
|
|
|
|
|
|
Navigator.of(context).pop("上海");}, |
|
|
|
|
|
|
|
child: Container( |
|
|
|
|
|
|
|
decoration: BoxDecoration( |
|
|
|
|
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
|
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"上海", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
)), |
|
|
|
|
|
|
|
GestureDetector( |
|
|
|
|
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
|
|
|
|
onTap: (){ |
|
|
|
|
|
|
|
Navigator.of(context).pop("深圳");}, |
|
|
|
|
|
|
|
child: Container( |
|
|
|
|
|
|
|
decoration: BoxDecoration( |
|
|
|
|
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
|
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"深圳", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
)), GestureDetector( |
|
|
|
|
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
|
|
|
|
onTap: (){ |
|
|
|
|
|
|
|
Navigator.of(context).pop("北京");}, |
|
|
|
|
|
|
|
child: Container( |
|
|
|
|
|
|
|
decoration: BoxDecoration( |
|
|
|
|
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
|
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"北京", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
)), GestureDetector( |
|
|
|
|
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
|
|
|
|
onTap: (){ |
|
|
|
|
|
|
|
Navigator.of(context).pop("广州");}, |
|
|
|
|
|
|
|
child: Container( |
|
|
|
|
|
|
|
decoration: BoxDecoration( |
|
|
|
|
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
|
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"广州", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
)), |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
),), |
|
|
|
|
|
|
|
Padding(padding:EdgeInsets.only(right: 14.h,), |
|
|
|
|
|
|
|
child: Row( |
|
|
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween, |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
GestureDetector( |
|
|
|
|
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
|
|
|
|
onTap: (){ |
|
|
|
|
|
|
|
Navigator.of(context).pop("成都");}, |
|
|
|
|
|
|
|
child: Container( |
|
|
|
|
|
|
|
decoration: BoxDecoration( |
|
|
|
|
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
|
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
child: Text( |
|
|
|
"成都", |
|
|
|
(ipState == 0||ipState == 1) ? "当前位置" : "已选:", |
|
|
|
style: TextStyle( |
|
|
|
style: TextStyle( |
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
color: Color(0xFFA29E9E), |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontSize: 16.sp, |
|
|
|
fontSize: 16.sp, |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
|
|
|
|
)), |
|
|
|
|
|
|
|
GestureDetector( |
|
|
|
|
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
|
|
|
|
onTap: (){ |
|
|
|
|
|
|
|
Navigator.of(context).pop("杭州");}, |
|
|
|
|
|
|
|
child: Container( |
|
|
|
|
|
|
|
decoration: BoxDecoration( |
|
|
|
|
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
|
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
|
|
|
|
), |
|
|
|
), |
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
), |
|
|
|
|
|
|
|
Image.asset( |
|
|
|
|
|
|
|
"assets/image/icon_union_location.webp", |
|
|
|
|
|
|
|
width: 20, |
|
|
|
|
|
|
|
height: 20, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
Expanded( |
|
|
|
|
|
|
|
// padding: EdgeInsets.only( |
|
|
|
|
|
|
|
// left: 8.w, |
|
|
|
|
|
|
|
// ), |
|
|
|
child: Text( |
|
|
|
child: Text( |
|
|
|
"杭州", |
|
|
|
(ipState== 1) ? (ipName??""):widget.arguments["cityName"] ?? "", |
|
|
|
style: TextStyle( |
|
|
|
style: TextStyle( |
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontSize: 16.sp, |
|
|
|
fontSize: 16.sp, |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
), |
|
|
|
)), |
|
|
|
), |
|
|
|
GestureDetector( |
|
|
|
if(ipState == 2) |
|
|
|
|
|
|
|
Icon( |
|
|
|
|
|
|
|
Icons.gps_fixed, |
|
|
|
|
|
|
|
color: Colors.grey, |
|
|
|
|
|
|
|
size: 18, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
if(ipState == 2) |
|
|
|
|
|
|
|
Padding(padding:EdgeInsets.only(left:5.w,right: 12.w), |
|
|
|
|
|
|
|
child:GestureDetector( |
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
onTap: (){ |
|
|
|
onTap: (){ |
|
|
|
Navigator.of(context).pop("南京");}, |
|
|
|
setState((){ |
|
|
|
child: Container( |
|
|
|
ipState = 1; |
|
|
|
decoration: BoxDecoration( |
|
|
|
Navigator.of(context).pop(ipName); |
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
}); |
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
}, |
|
|
|
), |
|
|
|
child: Text( |
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
"重新定位", |
|
|
|
child: Text( |
|
|
|
|
|
|
|
"南京", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
style: TextStyle( |
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontSize: 16.sp, |
|
|
|
fontSize: 16.sp, |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
), |
|
|
|
)), |
|
|
|
),) |
|
|
|
GestureDetector( |
|
|
|
], |
|
|
|
|
|
|
|
)), |
|
|
|
|
|
|
|
Padding( |
|
|
|
|
|
|
|
padding: EdgeInsets.only(bottom: 16.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"热门城市", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFFA29E9E), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 16.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
GridView.builder( |
|
|
|
|
|
|
|
itemCount: hotCity.length, |
|
|
|
|
|
|
|
padding: EdgeInsets.only(right: 14.h, bottom: 14.h), |
|
|
|
|
|
|
|
shrinkWrap: true, |
|
|
|
|
|
|
|
physics: NeverScrollableScrollPhysics(), |
|
|
|
|
|
|
|
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( |
|
|
|
|
|
|
|
crossAxisCount: 4, |
|
|
|
|
|
|
|
crossAxisSpacing: 12.w, |
|
|
|
|
|
|
|
mainAxisSpacing: 12.w, |
|
|
|
|
|
|
|
childAspectRatio: 2.5, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
itemBuilder: (context, index) { |
|
|
|
|
|
|
|
return GestureDetector( |
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
onTap: (){ |
|
|
|
onTap: () { |
|
|
|
Navigator.of(context).pop("重庆");}, |
|
|
|
Navigator.of(context).pop(hotCity[index]); |
|
|
|
|
|
|
|
setState((){}); |
|
|
|
|
|
|
|
}, |
|
|
|
child: Container( |
|
|
|
child: Container( |
|
|
|
decoration: BoxDecoration( |
|
|
|
decoration: BoxDecoration( |
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
color: Color(0xFFF7F7F7), |
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
borderRadius: BorderRadius.circular(4), |
|
|
|
), |
|
|
|
), |
|
|
|
padding: EdgeInsets.symmetric(horizontal:24.w,vertical:5.h), |
|
|
|
alignment: Alignment.center, |
|
|
|
child: Text( |
|
|
|
child: Text( |
|
|
|
"重庆", |
|
|
|
hotCity[index], |
|
|
|
style: TextStyle( |
|
|
|
style: TextStyle( |
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
fontSize: 16.sp, |
|
|
|
fontSize: 16.sp, |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
))); |
|
|
|
), |
|
|
|
}, |
|
|
|
), |
|
|
|
), |
|
|
|
], |
|
|
|
|
|
|
|
),) |
|
|
|
|
|
|
|
], |
|
|
|
], |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
@ -284,7 +229,7 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
return Container( |
|
|
|
return Container( |
|
|
|
height: 36.h, |
|
|
|
height: 36.h, |
|
|
|
margin: EdgeInsets.fromLTRB(6.w, 0, 14.w, 0), |
|
|
|
margin: EdgeInsets.fromLTRB(6.w, 0, 14.w, 0), |
|
|
|
padding: EdgeInsets.fromLTRB(0, 6.h, 0, 0), |
|
|
|
// padding: EdgeInsets.fromLTRB(0, 6.h, 0, 0), |
|
|
|
decoration: BoxDecoration( |
|
|
|
decoration: BoxDecoration( |
|
|
|
color: Color(0xFFF1F1F1), |
|
|
|
color: Color(0xFFF1F1F1), |
|
|
|
borderRadius: BorderRadius.circular(6), |
|
|
|
borderRadius: BorderRadius.circular(6), |
|
|
|
@ -302,12 +247,14 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
onEditingComplete: () { |
|
|
|
onEditingComplete: () { |
|
|
|
FocusScope.of(context).requestFocus(FocusNode()); |
|
|
|
FocusScope.of(context).requestFocus(FocusNode()); |
|
|
|
}, |
|
|
|
}, |
|
|
|
controller: editingController, |
|
|
|
onChanged: (txt) { |
|
|
|
|
|
|
|
areaCode(searchTxt: txt); |
|
|
|
|
|
|
|
}, |
|
|
|
cursorHeight: 25.h, |
|
|
|
cursorHeight: 25.h, |
|
|
|
decoration: InputDecoration( |
|
|
|
decoration: InputDecoration( |
|
|
|
// contentPadding: EdgeInsets.symmetric( |
|
|
|
contentPadding: EdgeInsets.symmetric( |
|
|
|
// vertical: 12.h, |
|
|
|
vertical: 14.h, |
|
|
|
// ), |
|
|
|
), |
|
|
|
hintText: "输入城市名进行搜索", |
|
|
|
hintText: "输入城市名进行搜索", |
|
|
|
hintStyle: TextStyle( |
|
|
|
hintStyle: TextStyle( |
|
|
|
fontSize: 12.sp, |
|
|
|
fontSize: 12.sp, |
|
|
|
@ -315,7 +262,7 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
), |
|
|
|
), |
|
|
|
prefixIcon: InkWell( |
|
|
|
prefixIcon: InkWell( |
|
|
|
onTap: () {}, |
|
|
|
onTap: () {}, |
|
|
|
child:Image.asset( |
|
|
|
child: Image.asset( |
|
|
|
"assets/image/icon_search.webp", |
|
|
|
"assets/image/icon_search.webp", |
|
|
|
width: 16, |
|
|
|
width: 16, |
|
|
|
height: 16, |
|
|
|
height: 16, |
|
|
|
@ -328,7 +275,7 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Widget sortList() { |
|
|
|
Widget sortList() { |
|
|
|
return ListView.builder( |
|
|
|
return areaList.length != 0 ?ListView.builder( |
|
|
|
padding: EdgeInsets.zero, |
|
|
|
padding: EdgeInsets.zero, |
|
|
|
itemCount: areaList.length, |
|
|
|
itemCount: areaList.length, |
|
|
|
scrollDirection: Axis.vertical, |
|
|
|
scrollDirection: Axis.vertical, |
|
|
|
@ -340,7 +287,15 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
child: sortItem(position), |
|
|
|
child: sortItem(position), |
|
|
|
); |
|
|
|
); |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
):Padding(padding:EdgeInsets.only(top:12.h), |
|
|
|
|
|
|
|
child: Text( |
|
|
|
|
|
|
|
"抱歉，未找到相关位置，可尝试修改后重试", |
|
|
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
|
|
color: Color(0xFF4D4D4D), |
|
|
|
|
|
|
|
fontWeight: MyFontWeight.medium, |
|
|
|
|
|
|
|
fontSize: 14.sp, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Widget sortItem(int position) { |
|
|
|
Widget sortItem(int position) { |
|
|
|
@ -369,46 +324,51 @@ class _UnionSelectCity extends State<UnionSelectCity> { |
|
|
|
padding: EdgeInsets.only( |
|
|
|
padding: EdgeInsets.only( |
|
|
|
top: 8.h, |
|
|
|
top: 8.h, |
|
|
|
), |
|
|
|
), |
|
|
|
child: Column( |
|
|
|
child: mapWidget(position), |
|
|
|
children: (areaMap[areaList[position]] as List).map((e) { |
|
|
|
|
|
|
|
return globalRoamingItem(e); |
|
|
|
|
|
|
|
}).toList(), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
) |
|
|
|
) |
|
|
|
], |
|
|
|
], |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Widget globalRoamingItem(data) { |
|
|
|
Widget mapWidget(position) { |
|
|
|
|
|
|
|
int mapIndex = 0; |
|
|
|
|
|
|
|
return Column( |
|
|
|
|
|
|
|
children: (areaMap[areaList[position]] as List).map((e) { |
|
|
|
|
|
|
|
mapIndex += 1; |
|
|
|
|
|
|
|
return globalRoamingItem( |
|
|
|
|
|
|
|
e, mapIndex == areaMap[areaList[position]].length); |
|
|
|
|
|
|
|
}).toList(), |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Widget globalRoamingItem(data, isLast) { |
|
|
|
return GestureDetector( |
|
|
|
return GestureDetector( |
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
behavior: HitTestBehavior.opaque, |
|
|
|
onTap: () { |
|
|
|
onTap: () { |
|
|
|
Navigator.of(context).pop(data["area"]); |
|
|
|
Navigator.of(context).pop(data["area"]); |
|
|
|
}, |
|
|
|
}, |
|
|
|
child: Container( |
|
|
|
child: Container( |
|
|
|
child: Column( |
|
|
|
width: double.infinity, |
|
|
|
mainAxisAlignment: MainAxisAlignment.start, |
|
|
|
child: Text( |
|
|
|
crossAxisAlignment: CrossAxisAlignment.start, |
|
|
|
data["area"], |
|
|
|
children: [ |
|
|
|
style: TextStyle( |
|
|
|
Padding( |
|
|
|
color: Color(0xFF000000), |
|
|
|
padding: EdgeInsets.only(left: 12.w), |
|
|
|
fontWeight: MyFontWeight.regular, |
|
|
|
child: Text( |
|
|
|
fontSize: 14.sp, |
|
|
|
data["area"], |
|
|
|
), |
|
|
|
style: TextStyle( |
|
|
|
), |
|
|
|
color: Color(0xFF000000), |
|
|
|
decoration: BoxDecoration( |
|
|
|
fontWeight: MyFontWeight.regular, |
|
|
|
border: isLast |
|
|
|
fontSize: 14.sp, |
|
|
|
? null |
|
|
|
|
|
|
|
: Border( |
|
|
|
|
|
|
|
bottom: BorderSide( |
|
|
|
|
|
|
|
width: 1.w, |
|
|
|
|
|
|
|
color: Color(0xFFDCDCDC), |
|
|
|
|
|
|
|
style: BorderStyle.solid, |
|
|
|
|
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
Container( |
|
|
|
|
|
|
|
margin: EdgeInsets.symmetric(vertical: 16.h), |
|
|
|
|
|
|
|
width: double.infinity, |
|
|
|
|
|
|
|
height: 1.h, |
|
|
|
|
|
|
|
color: Color(0xFFDCDCDC), |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
], |
|
|
|
|
|
|
|
), |
|
|
|
), |
|
|
|
|
|
|
|
padding: EdgeInsets.only(top: 16.h, bottom: 16.h, left: 16.w), |
|
|
|
), |
|
|
|
), |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
