Skip to content

fix: earthquake 頁面 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yayacat merged 5 commits into from
Oct 3, 2023
Merged

fix: earthquake 頁面 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e455502
fix: earthquake 頁面
yayacat Oct 3, 2023
1e22005
fix: earthquake 頁面
yayacat Oct 3, 2023
0b56659
fix: earthquake 頁面
yayacat Oct 3, 2023
767c20b
fix: earthquake 頁面
yayacat Oct 3, 2023
9d4ba18
fix: earthquake 頁面
yayacat Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/core/api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Future<dynamic> post(String uri, Map<String, dynamic> body) async {
.post(Uri.parse(uri),
headers: headers, body: jsonBody, encoding: encoding)
.timeout(const Duration(seconds: 2));
print(response.statusCode);
if (response.statusCode == 200) {
return jsonDecode(response.body);
} else {
Expand Down
37 changes: 27 additions & 10 deletions lib/view/earthquake.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class _EarthquakePage extends State<EarthquakePage> {

int _page = 0;
List<Widget> _List_children = <Widget>[];
String reports_url = "https://exptech.com.tw/api/v3/earthquake/reports";
String reports_url =
"https://yayacat.exptech.com.tw/api/v3/earthquake/reports";

@override
void initState() {
Expand Down Expand Up @@ -79,6 +80,12 @@ class _EarthquakePage extends State<EarthquakePage> {
super.dispose();
}

Future<void> _handleRefresh() async {
data = await post(reports_url, {"list": {}});
await _updateReportsWidget();
setState(() {});
}

@override
Widget build(BuildContext context) {
WidgetsBinding.instance.addPostFrameCallback((_) async {
Expand Down Expand Up @@ -111,7 +118,6 @@ class _EarthquakePage extends State<EarthquakePage> {
]),
));
} else {
print(data);
if (data is! bool) {
for (var i = 0; i < data.length; i++) {
_List_children.add(Padding(
Expand All @@ -129,17 +135,23 @@ class _EarthquakePage extends State<EarthquakePage> {
Text(
data[i]["data"][0]["areaIntensity"].toString(),
style: TextStyle(
fontSize: 32,
fontWeight: FontWeight.w100,
color: Colors.white),
fontSize: 50,
fontWeight: FontWeight.w300,
color: Colors.white,
),
),
const SizedBox(width: 10),
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
data[i]["location"].substring(data[i]["location"].indexOf("(") + 1, data[i]["location"].indexOf(")")).replaceAll("位於", ""),
data[i]["location"]
.substring(
data[i]["location"].indexOf("(") + 1,
data[i]["location"].indexOf(")"))
.replaceAll("位於", ""),
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w100,
Expand All @@ -163,7 +175,9 @@ class _EarthquakePage extends State<EarthquakePage> {
textBaseline: TextBaseline.alphabetic,
children: [
Text(
"M " + data[i]["magnitudeValue"].toStringAsFixed(1),
"M " +
data[i]["magnitudeValue"]
.toStringAsFixed(1),
style: TextStyle(
fontSize: 50,
fontWeight: FontWeight.w300,
Expand Down Expand Up @@ -255,9 +269,12 @@ class _EarthquakePage extends State<EarthquakePage> {
],
),
Expanded(
child: ListView(
physics: const ClampingScrollPhysics(),
children: _List_children.toList()),
child: RefreshIndicator(
onRefresh: _handleRefresh,
child: ListView(
physics: const ClampingScrollPhysics(),
children: _List_children.toList()),
),
),
],
),
Expand Down