Skip to content

Commit a282afd

Browse files
committed
FIX: 今日分享卡片改按本地日期请求,修复跨时区错日
客户端按本地日期缓存模板,服务端却按 UTC 选卡,北京用户凌晨拿到前一天的卡且整个本地日不刷新。 请求改为携带本地日历日 date=YYYY-MM-DD,并校验服务端回显的日期一致后才缓存。 后端需先上线,否则带 date 的请求会收到 400。
1 parent d0c93cd commit a282afd

7 files changed

Lines changed: 69 additions & 13 deletions

File tree

‎TASKS.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
55
## 本次完成
66

7+
- [x] BUG FIX:今日分享卡片跨时区错日(2026-11-10):客户端原先按本地日期缓存模板,服务端却按 UTC 日期选卡,北京用户凌晨打卡拿到前一天的卡且整个本地日不再刷新。现请求 `GET /api/v1/share-cards/today?date=<本地 YYYY-MM-DD>`,服务端回显 `date`,客户端校验回显一致后才缓存(不一致抛 `FormatException`)。后端配套改动见 fluency-frontend `apps/app/features/share-cards`。**部署顺序**:后端先上线(旧后端收到 `date` 会 400),旧版 App 不带 `date` 仍按 UTC 工作。测试:Flutter `test/features/daily_goal_check_in` 55 项通过,`flutter analyze` 改动范围无问题;后端 `share-card-api.test.ts` 28 项通过,biome 通过。**未验证**:`share-card-database.test.ts` 需要真实 PostgreSQL(`SHARE_CARDS_TEST_DATABASE_URL`),本机无 Postgres 服务且 Docker 未运行,尚未实跑。**完成时间**: 2026-11-10
8+
79
- [x] 开发者选项新增「评价提醒状态」只读弹窗(2026-11-10):设置页开发者分组新增入口,弹窗展示远程开关、商店安装(含安装来源原始值)、安装时长、有效学习天数(含统计起始日)、冷却剩余、跟读/复述完成时是否会请求,以及本次启动内 `RatingPrompt` 评估日志(最近 20 条)。协调器新增无副作用的 `inspect()`,与 `maybeRequest` 共用 `_readStatus` 组装快照,结论复用 `RatingPromptPolicy.allows`;`maybeRequest` 的早退分支(远程关闭、页面不可见、请求进行中)补充日志。仅查看,不写冷却、不调用系统评分。测试:协调器 `inspect` 用例 5 项(含与 `maybeRequest` 结论一致性),弹窗 widget 测试 1 项,`test/features/rating_prompt` 共 22 项通过;`test/screens/settings_screen_test.dart` 与 `settings_rating_entry_test.dart` 全部通过;改动文件 `flutter analyze` 无新增问题(既有 info 为原有构造函数写法)。**完成时间**: 2026-11-10 16:15
810

911
- [x] 显示设置变速开关文案与默认值调整(2026-11-10):设置项标题改为「显示倍速调节按钮」,副标题改为「在学习任务中显示倍速调节按钮。」(中文 ARB);英文 ARB 同步为 `Show playback speed button`。默认值由关闭改为开启:`learning_settings_provider.dart` 构造默认值与 SP 缺失时的读取回退、`local_user_preferences_store.dart` 默认值同步改为 `true`。已显式关闭的用户 SP 中有 `false`,不受影响。测试:provider 默认开启用例、显示设置页默认开启用例更新,`flutter analyze` 无问题。

‎docs/daily-check-in-share.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
唯一合成函数为 `lib/features/daily_goal_check_in/data/daily_check_in_share_image.dart` 中的 `generateDailyCheckInShareImage`。它返回 PNG 字节和已渲染预览,弹窗不需要再次解码或截图。修改布局、字体、Logo、统计排版均从此入口维护。
1616

1717
- 后端返回背景 URL、上下文字颜色和 word/sentence 文案。复用 today、random、shares 三个既有公开 API;客户端以登录状态限制功能。
18-
- 本地日期、总时长、听说明细和连续学习天数使用学习统计;UTC 日期仅影响服务端默认模板选择。
18+
- 本地日期、总时长、听说明细和连续学习天数使用学习统计;今日模板请求携带本地日历日(`date=YYYY-MM-DD`),服务端按该日期选卡并回显,客户端校验回显一致后才缓存。
1919
- Logo 固定为透明的 `app-icon-1024-alpha.png`,名称固定 `Echo Loop`。
2020
- 英语界面的单词/句子卡片不绘制译文,保留英文原文与单词音标;中文界面按母语设置选择译文。切换界面语言重新合成,继续复用背景和头像缓存。
2121
- 副标题按界面语言选择「英语听说 E 筋经」或「Listen. Speak. Grow.」。

‎lib/features/daily_goal_check_in/data/daily_share_background_repository.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class DailyShareBackgroundRepository {
5252
}
5353
final hit = result != null;
5454
if (result == null) {
55-
final template = await api.getToday();
55+
final template = await api.getToday(date);
5656
result = CachedDailyShareBackground(
5757
template,
5858
await api.downloadImage(template.imageUrl),

‎lib/features/daily_goal_check_in/data/share_card_api.dart‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import 'package:dio/dio.dart';
55
import '../domain/share_card_template.dart';
66

77
abstract interface class ShareCardRemoteDataSource {
8-
Future<ShareCardTemplate> getToday();
8+
/// [date] 为用户本地日历日;服务端按该日期选卡,使各时区同一天看到同一张卡。
9+
Future<ShareCardTemplate> getToday(DateTime date);
910
Future<ShareCardTemplate> getRandom(String excludeId);
1011
Future<Uint8List> downloadImage(String url);
1112
Future<void> recordShare(String id);
@@ -18,13 +19,27 @@ class ShareCardApi implements ShareCardRemoteDataSource {
1819
final Dio _images;
1920

2021
@override
21-
Future<ShareCardTemplate> getToday() => _get('/api/v1/share-cards/today');
22+
Future<ShareCardTemplate> getToday(DateTime date) async {
23+
final requested = _formatLocalDate(date);
24+
final body = await _getBody('/api/v1/share-cards/today', {
25+
'date': requested,
26+
});
27+
// 缓存按本地日期保存,服务端若回显其它日期必须拒绝,避免错日卡片被当作今日卡。
28+
if (body['date'] != requested) {
29+
throw const FormatException('分享卡片日期与请求不一致');
30+
}
31+
return ShareCardTemplate.fromJson(body['card']);
32+
}
2233

2334
@override
24-
Future<ShareCardTemplate> getRandom(String excludeId) =>
25-
_get('/api/v1/share-cards/random', {'excludeId': excludeId});
35+
Future<ShareCardTemplate> getRandom(String excludeId) async {
36+
final body = await _getBody('/api/v1/share-cards/random', {
37+
'excludeId': excludeId,
38+
});
39+
return ShareCardTemplate.fromJson(body['card']);
40+
}
2641

27-
Future<ShareCardTemplate> _get(
42+
Future<Map<String, Object?>> _getBody(
2843
String path, [
2944
Map<String, String>? query,
3045
]) async {
@@ -33,9 +48,14 @@ class ShareCardApi implements ShareCardRemoteDataSource {
3348
if (body is! Map<String, Object?>) {
3449
throw const FormatException('分享卡片响应无效');
3550
}
36-
return ShareCardTemplate.fromJson(body['card']);
51+
return body;
3752
}
3853

54+
static String _formatLocalDate(DateTime date) =>
55+
'${date.year.toString().padLeft(4, '0')}-'
56+
'${date.month.toString().padLeft(2, '0')}-'
57+
'${date.day.toString().padLeft(2, '0')}';
58+
3959
@override
4060
Future<Uint8List> downloadImage(String url) async {
4161
final response = await _images.get<List<int>>(

‎test/features/daily_goal_check_in/data/daily_share_background_repository_test.dart‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ void main() {
4343
expect(await restarted.getToday(date), same(restored));
4444
});
4545

46+
test('请求模板时使用本地日历日,而非 UTC 日期', () async {
47+
final repository = DailyShareBackgroundRepository(api, store);
48+
// 北京时间 1 月 1 日 00:30 对应 UTC 12 月 31 日,请求必须仍是本地 1 月 1 日。
49+
final localMidnight = DateTime(2027, 1, 1, 0, 30);
50+
await repository.getToday(localMidnight);
51+
expect(api.lastTodayDate, DateTime(2027, 1, 1));
52+
});
53+
4654
test('并发首次加载只请求一次,下一天重新加载并清理旧日', () async {
4755
final repository = DailyShareBackgroundRepository(api, store);
4856
final cards = await Future.wait([

‎test/features/daily_goal_check_in/data/share_card_api_test.dart‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void main() {
6161

6262
test('今日、随机及分享计数符合后端契约;公网下载不携带鉴权头', () async {
6363
final backendAdapter = _Adapter([
64-
_json(200, {'date': '2026-11-07', 'timezone': 'UTC', 'card': cardJson()}),
64+
_json(200, {'date': '2026-11-11', 'card': cardJson()}),
6565
_json(200, {'card': cardJson(word: true)}),
6666
ResponseBody.fromString('', 204),
6767
]);
@@ -76,12 +76,12 @@ void main() {
7676
)..httpClientAdapter = backendAdapter;
7777
final images = Dio()..httpClientAdapter = imagesAdapter;
7878
final api = ShareCardApi(backend, images);
79-
final today = await api.getToday();
79+
final today = await api.getToday(DateTime(2026, 11, 11, 1));
8080
await api.getRandom(today.id);
8181
await api.recordShare(today.id);
8282
expect(await api.downloadImage(today.imageUrl), [1, 2, 3]);
8383
expect(backendAdapter.requests[0].path, '/api/v1/share-cards/today');
84-
expect(backendAdapter.requests[0].queryParameters, isEmpty);
84+
expect(backendAdapter.requests[0].queryParameters, {'date': '2026-11-11'});
8585
expect(backendAdapter.requests[1].queryParameters, {'excludeId': today.id});
8686
expect(backendAdapter.requests[2].method, 'POST');
8787
expect(backendAdapter.requests[2].data, isNull);
@@ -93,6 +93,27 @@ void main() {
9393
images.close();
9494
});
9595

96+
test('今日请求使用本地日历日,并拒绝回显日期不一致的卡片', () async {
97+
final adapter = _Adapter([
98+
_json(200, {'date': '2026-01-05', 'card': cardJson()}),
99+
_json(200, {'date': '2026-01-05', 'card': cardJson()}),
100+
_json(200, {'date': '2026-01-04', 'card': cardJson()}),
101+
]);
102+
final backend = Dio(BaseOptions(baseUrl: 'https://api.test'))
103+
..httpClientAdapter = adapter;
104+
final api = ShareCardApi(backend, Dio());
105+
// 本地 1 月 5 日凌晨与深夜都必须按同一日历日补零格式请求。
106+
await api.getToday(DateTime(2026, 1, 5, 0, 30));
107+
await api.getToday(DateTime(2026, 1, 5, 23, 59));
108+
expect(adapter.requests[0].queryParameters, {'date': '2026-01-05'});
109+
expect(adapter.requests[1].queryParameters, {'date': '2026-01-05'});
110+
await expectLater(
111+
api.getToday(DateTime(2026, 1, 5)),
112+
throwsFormatException,
113+
);
114+
backend.close();
115+
});
116+
96117
test('空卡池及计数失败向调用方报告,POST 不重试', () async {
97118
final adapter = _Adapter([
98119
_json(404, {'code': 'no_available_cards', 'error': 'none'}),
@@ -102,7 +123,10 @@ void main() {
102123
..httpClientAdapter = adapter;
103124
final images = Dio();
104125
final api = ShareCardApi(backend, images);
105-
await expectLater(api.getToday(), throwsA(isA<DioException>()));
126+
await expectLater(
127+
api.getToday(DateTime(2026, 11, 11)),
128+
throwsA(isA<DioException>()),
129+
);
106130
await expectLater(api.recordShare('id'), throwsA(isA<DioException>()));
107131
expect(adapter.requests, hasLength(2));
108132
backend.close();

‎test/features/daily_goal_check_in/share_test_support.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,17 @@ class ShareTestProfile extends UserProfileNotifier {
5858

5959
class ShareTestApi implements ShareCardRemoteDataSource {
6060
int todayCalls = 0;
61+
DateTime? lastTodayDate;
6162
int downloadCalls = 0;
6263
int shareCalls = 0;
6364
Completer<ShareCardTemplate>? pendingTemplate;
6465
Object? randomFailure;
6566
Completer<Uint8List>? pendingAvatar;
6667
final template = ShareCardTemplate.fromJson(cardJson());
6768
@override
68-
Future<ShareCardTemplate> getToday() async {
69+
Future<ShareCardTemplate> getToday(DateTime date) async {
6970
todayCalls++;
71+
lastTodayDate = date;
7072
return pendingTemplate?.future ?? template;
7173
}
7274

0 commit comments

Comments
 (0)