Skip to content

Commit 66ac123

Browse files
committed
fix: enter sport password if it is empty
1 parent 9c7c6ec commit 66ac123

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

lib/model/user.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Map<String, String?> user = {
1010
"dorm": null,
1111
"idsAccount": null,
1212
"idsPassword": null,
13-
"sportPassword": null,
13+
"sportPassword": "",
1414
"electricityPassword": "123456",
1515
"decorated": "false",
1616
"decoration": "",
@@ -58,7 +58,7 @@ void prefrenceClear() async {
5858
"dorm": null,
5959
"idsAccount": null,
6060
"idsPassword": null,
61-
"sportPassword": null,
61+
"sportPassword": "",
6262
"electricityPassword": "123456",
6363
"decorated": "false",
6464
"decoration": "",

lib/page/homepage/homepage.dart

+20-11
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import 'package:flutter/material.dart';
1515
import 'package:easy_refresh/easy_refresh.dart';
1616
import 'package:watermeter/controller/electricity_controller.dart';
1717
import 'package:watermeter/controller/exam_controller.dart';
18+
import 'package:watermeter/model/user.dart';
1819
import 'package:watermeter/page/exam/exam.dart';
1920

2021
import 'package:watermeter/page/homepage/clipper.dart';
@@ -25,6 +26,7 @@ import 'package:watermeter/controller/score_controller.dart';
2526
import 'package:watermeter/model/xidian_ids/classtable.dart';
2627

2728
import 'package:watermeter/page/score/score.dart';
29+
import 'package:watermeter/page/setting/subwindow/sport_password_dialog.dart';
2830
import 'package:watermeter/page/sport/sport_window.dart';
2931
import 'package:watermeter/page/classtable/classtable.dart';
3032

@@ -215,18 +217,25 @@ class MainPage extends StatelessWidget {
215217
GetBuilder<PunchController>(
216218
builder: (c) => GestureDetector(
217219
onTap: () async {
218-
if (c.isGet == true) {
219-
Get.to(() => const SportWindow());
220-
} else if (c.error != null) {
221-
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
222-
behavior: SnackBarBehavior.floating,
223-
content: Text("遇到错误"),
224-
));
220+
if (user["sportPassword"] != "") {
221+
if (c.isGet == true) {
222+
Get.to(() => const SportWindow());
223+
} else if (c.error != null) {
224+
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
225+
behavior: SnackBarBehavior.floating,
226+
content: Text("遇到错误"),
227+
));
228+
} else {
229+
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
230+
behavior: SnackBarBehavior.floating,
231+
content: Text("请稍候,正在刷新信息"),
232+
));
233+
}
225234
} else {
226-
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
227-
behavior: SnackBarBehavior.floating,
228-
content: Text("请稍候,正在刷新信息"),
229-
));
235+
showDialog(
236+
context: context,
237+
builder: (context) => const SportPasswordDialog(),
238+
);
230239
}
231240
},
232241
child: Card(

0 commit comments

Comments
 (0)