From d83481d9650545665e279149b42d8508ba6e1676 Mon Sep 17 00:00:00 2001 From: Codex Date: Wed, 14 Oct 2026 20:58:47 +0800 Subject: [PATCH] feat: select school before connecting timetable --- README.md | 8 +- docs/tpschedule-0.6.2-validation.md | 23 +++ mobile/lib/app/app_version.dart | 4 +- mobile/lib/app/hepan_app.dart | 54 ++++++- mobile/lib/features/exams/exams_page.dart | 2 +- mobile/lib/features/profile/profile_page.dart | 8 +- .../school/school_selection_page.dart | 60 ++++++++ mobile/pubspec.yaml | 2 +- mobile/test/widgets/glass_dock_test.dart | 10 +- mobile/test/widgets/navigation_test.dart | 2 +- .../widgets/rschedule_navigation_test.dart | 2 +- .../test/widgets/school_selection_test.dart | 142 ++++++++++++++++++ 12 files changed, 297 insertions(+), 20 deletions(-) create mode 100644 docs/tpschedule-0.6.2-validation.md create mode 100644 mobile/lib/features/school/school_selection_page.dart create mode 100644 mobile/test/widgets/school_selection_test.dart diff --git a/README.md b/README.md index 0205d46..58819ce 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TPSchedule -学生课表 APP，Flutter 实现，目前接入电子科技大学研究生系统。Android 0.6.1+16，Android 7.0 及以上。 +学生课表 APP，Flutter 实现，目前接入电子科技大学研究生系统。Android 0.6.2+17，Android 7.0 及以上。 使用用户提供的原始 SVG 图标，蓝色渐变、黄色日历框及白色笔画保持一致；启动画面使用相同配色。0.5.1修复重复启动页闪烁：初始化期间保留原生启动屏，数据就绪后直接显示课表首帧，不再叠加Flutter品牌页或淡出动画。Android12+ 原生启动屏使用同色纯蓝背景及图标，旧版采用蓝色渐变。 @@ -22,6 +22,8 @@ 0.6.1优化启动：先绘制与原生开屏衔接的品牌帧，读取本地课表后以300ms过渡进入首页，通知与日历随后同步；学校浏览器首次访问时才初始化，后台返回不重播开屏。基础和旧版Android开屏资源统一蓝底与图标尺寸。详见[0.6.1启动验证记录](docs/tpschedule-0.6.1-validation.md)。 +0.6.2将学校连接入口改为「选择学校」，目前提供「电子科技大学（研究生）」。选中后沿用原认证及导入，取消不开始登录；旧学校学期和连接刷新继续复用。详见[0.6.2学校选择验证记录](docs/tpschedule-0.6.2-validation.md)。 + 0.5.4源码和安装包已冻结用于登记，位于dist/backups/TPSchedule-0.5.4-registration-20261014，Git标签tpschedule-0.5.4-registration。软著材料登记版本按用户要求为V1.0，使用冻结源码，未混入0.5.5功能，另存于output/pdf/TPSchedule-软著登记材料-V1.0。 ## 安装与学校登录 @@ -30,7 +32,9 @@ 原签名密钥及签名配置不改，新旧 APK 证书及公钥会核对一致。保留 `.tools/android-user/debug.keystore`，不要删除、重建或随源码分发。当前保留的证书是Android Debug类型，release运行模式不代表更换为正式发行证书；提交商店/备案前须确认目标平台是否接受。`dist/TPSchedule-signing-info.json`、证书PEM及公钥PEM只含公开签名信息。 -在个人设置中打开学校账户。应用先访问 [研究生系统专用认证入口](https://yjsjy.uestc.edu.cn/pyxx/jzsso/login)，学生在学校原网页填写账号、密码和验证码；应用没有自己的密码表单，不读取或注入密码。首次认证完成后选择学校学期，确认后显示“正在查找课表，请稍候”，自动打开对应课表查询并导入保存。 +在「我的」点击「选择学校」，目前提供「电子科技大学（研究生）」。选中后应用访问 [研究生系统专用认证入口](https://yjsjy.uestc.edu.cn/pyxx/jzsso/login)，学生在学校原网页填写账号、密码和验证码；应用没有自己的密码表单，不读取或注入密码。首次认证完成后选择学校学期，确认后显示“正在查找课表，请稍候”，自动打开对应课表查询并导入保存。取消学校选择不开始登录，也不改已有课表。首次课表刷新、考试更新或更新学期共用学校选择入口；已有学校连接或学校学期时沿用原学校及学期。 + +学校目录集中在 `mobile/lib/features/school/school_selection_page.dart`，当前只列出已接入的学校。以后新增学校需增加相应认证和课表/考试解析适配，再加入目录；当前所有学校数据模型仍按电子科技大学研究生系统处理。 学期73为2026-2027年秋、72为2025-2026年春、71为2025-2026年秋。课表路径为 `/pyxx/pygl/xskbcx/index/{学期编号}`；考试路径为 `/pyxx/pygl/kskcxx/index?xq={学期编号}`。选择成功后保存在本机，课表右上角刷新及考试更新沿用该学期。「个人设置 → 更新学期」已连接时立即选择，未连接时先认证。读取的 HTML 必须与所选学期一致，取消或保存失败不改原数据。 diff --git a/docs/tpschedule-0.6.2-validation.md b/docs/tpschedule-0.6.2-validation.md new file mode 100644 index 0000000..bfb025a --- /dev/null +++ b/docs/tpschedule-0.6.2-validation.md @@ -0,0 +1,23 @@ +# TPSchedule 0.6.2+17：学校选择入口 + +2026-10-14。将原来的直接学校连接改为选择学校，先提供「电子科技大学（研究生）」，为后续接入其他学校保留明确入口。 + +## 改动 + +- 「我的」学校卡片显示「学校课表」，按钮为「选择学校」。选择页面沿用蓝色主题，当前只列出「电子科技大学（研究生）」。已知学校在卡片和列表中标明。 +- 选中学校后进入原有学校认证页面，沿用专用认证入口、验证码、学期选择及课表/考试读取流程。取消选择不会打开浏览器或开始认证，也不修改已有数据。 +- 首次课表刷新、考试更新、更新学期共用选择入口。已连接学校或保存了学校学期时，刷新沿用原学校及学期；「我的」按钮始终允许再次打开学校列表。 +- 原有导入的学校学期和会话均来自电子科技大学研究生系统，继续识别为该学校。首次选择、尚未导入时的选择仅保存在本次会话；保存学期后可以从既有数据识别学校。 +- 学校目录集中在 `school_selection_page.dart`，入口按学校枚举明确分发。目录只列出已实现连接器的学校；增加其他学校仍需其认证和解析适配，当前不是通用的多学校数据模型。 +- 防止重复点击同时打开多个选择/认证页面。保持学校浏览器延迟创建，普通离线启动不启动学校浏览器。 + +## 验证 + +- 四项新增界面测试覆盖取消不认证、选中后访问专用认证入口、首次考试更新保留考试流程、已连接刷新沿用原学期。新增流程先观察失败，再实现；全部201项Flutter测试通过，静态分析无问题。 +- 独立代码审查涵盖取消、重复进入、旧学期识别、学校认证页面生命周期和延迟浏览器，未发现需要修改的问题。 +- 发布和调试APK均构建通过，版本0.6.2、版本号17、包名 `com.tpschedule.app`。两个构建均由构建脚本验证原签名；发布包另与0.6.1证书逐字节比较，证书和公钥一致。原私有签名文件与迁移前摘要一致。 +- API36（Android16）模拟器覆盖安装发布包，冷启动进入原有课表。「我的→选择学校」显示学校列表；取消返回后11条已保存课程仍在；选中学校后进入原有「学校认证」页面。本次未输入真实账户完成验证码及在线导入。 +- 原0.5.4登记备份清单18项全部复核通过，登记冻结和V1.0材料未改动。保留 `dist/TPSchedule-0.6.1.apk` 作为上一版安装包。 +- 本地构建仍有既有SDK XML版本提示，不影响此次构建。未升级工具链或第三方依赖。 + +截图：`dist/screenshots/tpschedule-062-profile.png`、`tpschedule-062-schools.png`、`tpschedule-062-auth-entry.png`。运行和构建日志在本地 `.tools/tpschedule-062-*`，不随源码分发。 diff --git a/mobile/lib/app/app_version.dart b/mobile/lib/app/app_version.dart index f73a03a..d58171c 100644 --- a/mobile/lib/app/app_version.dart +++ b/mobile/lib/app/app_version.dart @@ -1,2 +1,2 @@ -const appVersion = '0.6.1'; -const appBuildNumber = 16; +const appVersion = '0.6.2'; +const appBuildNumber = 17; diff --git a/mobile/lib/app/hepan_app.dart b/mobile/lib/app/hepan_app.dart index f71f237..b079cf6 100644 --- a/mobile/lib/app/hepan_app.dart +++ b/mobile/lib/app/hepan_app.dart @@ -14,6 +14,7 @@ import '../features/exams/exams_page.dart'; import '../features/timetable/timetable_page.dart'; import '../features/profile/profile_page.dart'; import '../features/school/school_session.dart'; +import '../features/school/school_selection_page.dart'; class HepanApp extends StatelessWidget { const HepanApp({ @@ -66,6 +67,16 @@ class _Shell extends StatefulWidget { class _ShellState extends State<_Shell> with WidgetsBindingObserver { int _tab = 0; + bool _openingSchool = false; + SupportedSchool? _selectedSchool; + // Earlier imports all belong to UESTC graduate; reuse their existing term + // and session without requiring students to choose again on every refresh. + SupportedSchool? get _knownSchool => + _selectedSchool ?? + (widget.controller.snapshot.schoolTerm != null || + widget.school?.canLogout == true + ? SupportedSchool.uestcGraduate + : null); void _selectTab(int index) { if (index == _tab) return; setState(() => _tab = index); @@ -121,7 +132,41 @@ class _ShellState extends State<_Shell> with WidgetsBindingObserver { } } - void _school({bool exams = false, bool chooseTerm = false}) { + Future _school({ + bool exams = false, + bool chooseTerm = false, + bool selectSchool = false, + }) async { + if (_openingSchool) return; + _openingSchool = true; + try { + var selected = _knownSchool; + if (selectSchool || selected == null) { + selected = await Navigator.push( + context, + MaterialPageRoute( + builder: (_) => SchoolSelectionPage(selected: _knownSchool), + ), + ); + if (!mounted || selected == null) return; + setState(() => _selectedSchool = selected); + } + if (!mounted) return; + // The only current connector is the existing UESTC graduate workflow. + // A new catalog option must provide its own connector here. + switch (selected) { + case SupportedSchool.uestcGraduate: + await _openSchool(exams: exams, chooseTerm: chooseTerm); + } + } finally { + _openingSchool = false; + } + } + + Future _openSchool({ + bool exams = false, + bool chooseTerm = false, + }) async { if (widget.schoolBuilder != null) { final term = widget.controller.snapshot.schoolTerm; if (exams) { @@ -135,12 +180,12 @@ class _ShellState extends State<_Shell> with WidgetsBindingObserver { chooseTerm: chooseTerm || term == null, ); } - Navigator.push( + await Navigator.push( context, MaterialPageRoute(builder: (_) => widget.schoolBuilder!()), ); } else { - showDialog( + await showDialog( context: context, builder: (context) => AlertDialog( title: const Text('学校认证'), @@ -275,7 +320,8 @@ class _ShellState extends State<_Shell> with WidgetsBindingObserver { ProfilePage( controller: widget.controller, feedbackSender: widget.feedbackSender, - onLogin: _school, + onLogin: () => _school(selectSchool: true), + schoolName: _knownSchool?.label, onUpdateTerm: () => _school(chooseTerm: true), authStatus: widget.school?.statusLabel ?? '未登录', logoutLabel: widget.school?.logoutFailed == true diff --git a/mobile/lib/features/exams/exams_page.dart b/mobile/lib/features/exams/exams_page.dart index 6be875d..31d46e7 100644 --- a/mobile/lib/features/exams/exams_page.dart +++ b/mobile/lib/features/exams/exams_page.dart @@ -118,7 +118,7 @@ class ExamsPage extends StatelessWidget { ), const SizedBox(height: 12), const Text( - '连接研究生系统，或导入学校考试页面的 HTML。', + '选择学校连接教务系统，或导入学校考试页面的 HTML。', textAlign: TextAlign.center, style: TextStyle(fontSize: 13, height: 1.8), ), diff --git a/mobile/lib/features/profile/profile_page.dart b/mobile/lib/features/profile/profile_page.dart index 648edb2..26ee75d 100644 --- a/mobile/lib/features/profile/profile_page.dart +++ b/mobile/lib/features/profile/profile_page.dart @@ -18,6 +18,7 @@ class ProfilePage extends StatelessWidget { super.key, required this.controller, required this.onLogin, + this.schoolName, this.authStatus = '未登录', this.onLogout, this.logoutLabel = '退出学校登录', @@ -26,6 +27,7 @@ class ProfilePage extends StatelessWidget { }); final AppController controller; final VoidCallback onLogin; + final String? schoolName; final VoidCallback? onLogout; final VoidCallback? onUpdateTerm; final String authStatus, logoutLabel; @@ -98,12 +100,12 @@ class ProfilePage extends StatelessWidget { ), const SizedBox(height: 16), const Text( - '连接学校课表', + '学校课表', style: TextStyle(fontSize: 20, fontWeight: FontWeight.w700), ), const SizedBox(height: 7), Text( - '电子科技大学 · 研究生\n$authStatus', + '${schoolName ?? '选择学校后连接教务系统'}\n$authStatus', style: TextStyle( fontSize: 12, height: 1.8, @@ -115,7 +117,7 @@ class ProfilePage extends StatelessWidget { width: double.infinity, child: FilledButton( onPressed: onLogin, - child: Text(onLogout == null ? '登录学校账户' : '打开学校课表'), + child: const Text('选择学校'), ), ), if (onLogout != null) diff --git a/mobile/lib/features/school/school_selection_page.dart b/mobile/lib/features/school/school_selection_page.dart new file mode 100644 index 0000000..95aea94 --- /dev/null +++ b/mobile/lib/features/school/school_selection_page.dart @@ -0,0 +1,60 @@ +import 'package:flutter/material.dart'; + +import '../../app/app_theme.dart'; + +/// Only list schools whose login and import workflow is available. +enum SupportedSchool { + uestcGraduate('电子科技大学（研究生）', '研究生课表与考试安排'); + + const SupportedSchool(this.label, this.description); + final String label, description; +} + +class SchoolSelectionPage extends StatelessWidget { + const SchoolSelectionPage({super.key, this.selected}); + + final SupportedSchool? selected; + + @override + Widget build(BuildContext context) => Scaffold( + appBar: AppBar(title: const Text('选择学校')), + body: SafeArea( + top: false, + child: ListView( + padding: const EdgeInsets.fromLTRB(22, 16, 22, 24), + children: [ + Text( + '选择你的学校，登录后导入课表和考试。', + style: TextStyle(fontSize: 13, color: ink.withValues(alpha: 0.6)), + ), + const SizedBox(height: 20), + for (final school in SupportedSchool.values) ...[ + SurfaceCard( + padding: EdgeInsets.zero, + child: ListTile( + contentPadding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 12, + ), + leading: const Icon(Icons.school_rounded, color: river), + title: Text( + school.label, + style: const TextStyle(fontWeight: FontWeight.w600), + ), + subtitle: Text(school.description), + trailing: Icon( + school == selected + ? Icons.check_circle_rounded + : Icons.chevron_right_rounded, + color: river, + ), + onTap: () => Navigator.pop(context, school), + ), + ), + const SizedBox(height: 12), + ], + ], + ), + ), + ); +} diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index ea67128..1482e7c 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -1,7 +1,7 @@ name: hepan_everyday description: TPSchedule 学生课表 publish_to: none -version: 0.6.1+16 +version: 0.6.2+17 environment: sdk: ^3.13.5 dependencies: diff --git a/mobile/test/widgets/glass_dock_test.dart b/mobile/test/widgets/glass_dock_test.dart index 6198458..ef8d1ae 100644 --- a/mobile/test/widgets/glass_dock_test.dart +++ b/mobile/test/widgets/glass_dock_test.dart @@ -28,16 +28,16 @@ void main() { await tester.drag(find.text('周三'), const Offset(-250, 0)); await tester.pumpAndSettle(); expect(find.text('第 2 周'), findsOneWidget); - expect(find.text('登录学校账户'), findsNothing); + expect(find.text('选择学校'), findsNothing); await tester.drag( find.byKey(const Key('dock-cursor')), const Offset(185, 0), ); await tester.pumpAndSettle(); - expect(find.text('登录学校账户'), findsOneWidget); - await tester.drag(find.text('连接学校课表'), const Offset(250, 0)); + expect(find.text('选择学校'), findsOneWidget); + await tester.drag(find.text('学校课表'), const Offset(250, 0)); await tester.pumpAndSettle(); - expect(find.text('登录学校账户'), findsOneWidget); + expect(find.text('选择学校'), findsOneWidget); await tester.drag( find.byKey(const Key('dock-cursor')), const Offset(-185, 0), @@ -46,7 +46,7 @@ void main() { expect(find.text('示例课表'), findsOneWidget); await tester.tap(find.text('我的')); await tester.pumpAndSettle(); - expect(find.text('登录学校账户'), findsOneWidget); + expect(find.text('选择学校'), findsOneWidget); c.dispose(); }); testWidgets('cancelled cursor drag keeps selected tab', (tester) async { diff --git a/mobile/test/widgets/navigation_test.dart b/mobile/test/widgets/navigation_test.dart index fa36e2a..5281d68 100644 --- a/mobile/test/widgets/navigation_test.dart +++ b/mobile/test/widgets/navigation_test.dart @@ -24,7 +24,7 @@ void main() { expect(find.bySemanticsLabel('个人设置'), findsOneWidget); await tester.tap(find.bySemanticsLabel('个人设置')); await tester.pumpAndSettle(); - expect(find.text('登录学校账户'), findsOneWidget); + expect(find.text('选择学校'), findsOneWidget); expect(find.text('课表设置'), findsOneWidget); await tester.tap(find.bySemanticsLabel('课表')); await tester.pumpAndSettle(); diff --git a/mobile/test/widgets/rschedule_navigation_test.dart b/mobile/test/widgets/rschedule_navigation_test.dart index fff3a4a..f342c9e 100644 --- a/mobile/test/widgets/rschedule_navigation_test.dart +++ b/mobile/test/widgets/rschedule_navigation_test.dart @@ -40,7 +40,7 @@ void main() { expect(find.text('考试安排'), findsOneWidget); await tester.tap(find.bySemanticsLabel('个人设置')); await tester.pumpAndSettle(); - expect(find.text('登录学校账户'), findsOneWidget); + expect(find.text('选择学校'), findsOneWidget); c.dispose(); }); } diff --git a/mobile/test/widgets/school_selection_test.dart b/mobile/test/widgets/school_selection_test.dart new file mode 100644 index 0000000..6fd583e --- /dev/null +++ b/mobile/test/widgets/school_selection_test.dart @@ -0,0 +1,142 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:timezone/data/latest.dart' as tzdata; +import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart'; +import 'package:hepan_everyday/app/hepan_app.dart'; +import 'package:hepan_everyday/domain/school_term.dart'; +import 'package:hepan_everyday/features/school/school_session.dart'; + +import '../support/fake_school_web.dart'; +import 'navigation_test.dart' show uiController; + +void main() { + setUpAll(tzdata.initializeTimeZones); + + testWidgets('cancelling school selection never starts authentication', ( + tester, + ) async { + WebViewPlatform.instance = FakeSchoolPlatform(); + final session = SchoolSession(); + final controller = uiController(); + await controller.initialize(); + addTearDown(session.dispose); + addTearDown(controller.dispose); + await tester.pumpWidget( + HepanApp( + controller: controller, + school: session, + schoolBuilder: () => const Scaffold(body: Text('学校认证页面')), + ), + ); + await tester.pumpAndSettle(); + await tester.tap(find.bySemanticsLabel('个人设置')); + await tester.pumpAndSettle(); + await tester.tap(find.widgetWithText(FilledButton, '选择学校')); + await tester.pumpAndSettle(); + expect(find.text('电子科技大学（研究生）'), findsOneWidget); + expect(session.hasOpened, isFalse); + expect(find.text('学校认证页面'), findsNothing); + await tester.tap(find.byType(BackButton)); + await tester.pumpAndSettle(); + expect(session.hasOpened, isFalse); + expect(find.widgetWithText(FilledButton, '选择学校'), findsOneWidget); + expect(controller.snapshot.courses, isEmpty); + }); + + testWidgets('selecting UESTC graduate enters its existing authentication', ( + tester, + ) async { + final platform = FakeSchoolPlatform(); + WebViewPlatform.instance = platform; + final session = SchoolSession(); + final controller = uiController(); + await controller.initialize(); + addTearDown(session.dispose); + addTearDown(controller.dispose); + await tester.pumpWidget( + HepanApp( + controller: controller, + school: session, + schoolBuilder: () => const Scaffold(body: Text('学校认证页面')), + ), + ); + await tester.pumpAndSettle(); + await tester.tap(find.bySemanticsLabel('个人设置')); + await tester.pumpAndSettle(); + await tester.tap(find.widgetWithText(FilledButton, '选择学校')); + await tester.pumpAndSettle(); + expect(session.hasOpened, isFalse); + await tester.tap(find.text('电子科技大学（研究生）')); + await tester.pumpAndSettle(); + expect(find.text('学校认证页面'), findsOneWidget); + expect(session.hasOpened, isTrue); + expect(platform.web.loads, ['https://yjsjy.uestc.edu.cn/pyxx/jzsso/login']); + Navigator.pop(tester.element(find.text('学校认证页面'))); + await tester.pumpAndSettle(); + expect(find.textContaining('电子科技大学（研究生）'), findsOneWidget); + }); + + testWidgets('first exam sync selects school before opening exam workflow', ( + tester, + ) async { + WebViewPlatform.instance = FakeSchoolPlatform(); + final session = SchoolSession(); + final controller = uiController(); + await controller.initialize(); + addTearDown(session.dispose); + addTearDown(controller.dispose); + await tester.pumpWidget( + HepanApp( + controller: controller, + school: session, + schoolBuilder: () => const Scaffold(body: Text('学校认证页面')), + ), + ); + await tester.pumpAndSettle(); + await tester.tap(find.bySemanticsLabel('考试')); + await tester.pumpAndSettle(); + await tester.tap(find.byTooltip('从学校更新考试')); + await tester.pumpAndSettle(); + expect(find.text('电子科技大学（研究生）'), findsOneWidget); + expect(session.hasOpened, isFalse); + await tester.tap(find.text('电子科技大学（研究生）')); + await tester.pumpAndSettle(); + expect(session.requestingExams, isTrue); + expect(find.text('学校认证页面'), findsOneWidget); + }); + + testWidgets('connected refresh keeps the school and imported semester', ( + tester, + ) async { + final platform = FakeSchoolPlatform(); + WebViewPlatform.instance = platform; + final session = SchoolSession(); + await session.openTimetable(term: SchoolTerm(72)); + session.connectionState = SchoolConnectionState.connected; + final controller = uiController(); + await controller.initialize(); + controller.snapshot = controller.snapshot.copyWith( + schoolTerm: SchoolTerm(72), + ); + addTearDown(session.dispose); + addTearDown(controller.dispose); + await tester.pumpWidget( + HepanApp( + controller: controller, + school: session, + schoolBuilder: () => const Scaffold(body: Text('学校认证页面')), + ), + ); + await tester.pumpAndSettle(); + await tester.tap(find.byTooltip('刷新课表')); + await tester.pumpAndSettle(); + expect(find.text('学校认证页面'), findsOneWidget); + expect(find.text('电子科技大学（研究生）'), findsNothing); + expect( + platform.web.loads.last, + 'https://yjsjy.uestc.edu.cn/pyxx/pygl/xskbcx/index/72', + ); + expect(session.selectedTerm, SchoolTerm(72)); + session.setReadingActive(false); + }); +}