feat(profile): 实现个人资料编辑与策略本地缓存
- 将资料编辑页重构为可交互表单,支持昵称、签名编辑与头像更换 - 新增 DioClient 本地缓存读取与写入方法,支持离线读取策略快照 - 设备策略切换后自动使本地缓存失效,避免数据不一致 - Home Tab 切换时选中态跟随可见页面,滑动过程中实时更新底栏高亮 - 系统设置页引入 loading 遮罩层,防止切换开关时重复操作 - 个人资料页接入 profileController 展示真实用户信息与加载状态 - 适配深色模式,修正 home_tab 中头像与文字颜色硬编码问题
This commit is contained in:
1 parent
5f84a64c3e
commit
e06e12fbbc
30 files changed
+2059
-336
No files matched your search
@@ -46,6 +46,24 @@ void main() {
|
||||
await tester.pump();
|
||||
expect(tester.getCenter(home).dx, lessThan(initialX));
|
||||
expect(router.routeInformationProvider.value.uri.path, '/home');
|
||||
expect(
|
||||
tester.widget<GlassTabBar>(find.byType(GlassTabBar)).selectedIndex,
|
||||
1,
|
||||
);
|
||||
|
||||
// Reversing an unfinished swipe must restore the bar immediately.
|
||||
await gesture.moveBy(const Offset(200, 0));
|
||||
await tester.pump();
|
||||
expect(
|
||||
tester.widget<GlassTabBar>(find.byType(GlassTabBar)).selectedIndex,
|
||||
0,
|
||||
);
|
||||
await gesture.moveBy(const Offset(-200, 0));
|
||||
await tester.pump();
|
||||
expect(
|
||||
tester.widget<GlassTabBar>(find.byType(GlassTabBar)).selectedIndex,
|
||||
1,
|
||||
);
|
||||
|
||||
await gesture.up();
|
||||
await tester.pumpAndSettle();
|
||||
@@ -65,6 +83,10 @@ void main() {
|
||||
await tester.pump();
|
||||
expect(tester.getCenter(profile).dx, greaterThan(initialX));
|
||||
expect(router.routeInformationProvider.value.uri.path, '/profile');
|
||||
expect(
|
||||
tester.widget<GlassTabBar>(find.byType(GlassTabBar)).selectedIndex,
|
||||
1,
|
||||
);
|
||||
|
||||
await tester.pump(const Duration(milliseconds: 200));
|
||||
await tabDrag.up();
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:ttstd_family_care/features/device/data/device_api.dart';
|
||||
import 'package:ttstd_family_care/features/device/data/device_providers.dart';
|
||||
import 'package:ttstd_family_care/features/device/data/device_repository_impl.dart';
|
||||
import 'package:ttstd_family_care/features/device/domain/device_models.dart';
|
||||
import 'package:ttstd_family_care/features/home/presentation/system_settings_controller.dart';
|
||||
|
||||
class _Repository extends DeviceRepositoryImpl {
|
||||
_Repository() : super(const DeviceApi());
|
||||
DevicePolicy? cached = const DevicePolicy(bluetooth: 1);
|
||||
Completer<DevicePolicy?> response = Completer<DevicePolicy?>();
|
||||
Completer<String?> saved = Completer<String?>();
|
||||
int writes = 0;
|
||||
|
||||
@override
|
||||
Future<DevicePolicy?> getCachedPolicy(String sn) async => cached;
|
||||
|
||||
@override
|
||||
Future<DevicePolicy?> getPolicy(String sn) => response.future;
|
||||
|
||||
@override
|
||||
Future<String?> togglePolicy(String sn, String field, int value) {
|
||||
writes++;
|
||||
return saved.future;
|
||||
}
|
||||
}
|
||||
|
||||
void main() {
|
||||
late _Repository repository;
|
||||
late ProviderContainer container;
|
||||
final provider = systemSettingsControllerProvider('device-one');
|
||||
|
||||
setUp(() {
|
||||
repository = _Repository();
|
||||
container = ProviderContainer(overrides: [
|
||||
deviceRepositoryProvider.overrideWithValue(repository),
|
||||
]);
|
||||
container.listen(provider, (_, _) {});
|
||||
});
|
||||
tearDown(() => container.dispose());
|
||||
|
||||
test('cached switches remain visible and locked until network completes', () async {
|
||||
await pumpEventQueue();
|
||||
expect(container.read(provider).valueOrNull?.bluetooth, 1);
|
||||
expect(container.read(provider).isLoading, isTrue);
|
||||
await container.read(provider.notifier).toggle('bluetooth', false);
|
||||
expect(repository.writes, 0);
|
||||
repository.response.complete(const DevicePolicy(bluetooth: 0));
|
||||
await pumpEventQueue();
|
||||
expect(container.read(provider).isLoading, isFalse);
|
||||
expect(container.read(provider).valueOrNull?.bluetooth, 0);
|
||||
});
|
||||
|
||||
test('save and refresh stay locked and reject duplicate toggles', () async {
|
||||
repository.response.complete(const DevicePolicy(bluetooth: 1));
|
||||
await pumpEventQueue();
|
||||
repository.response = Completer<DevicePolicy?>();
|
||||
final pending = container.read(provider.notifier).toggle('bluetooth', false);
|
||||
await container.read(provider.notifier).toggle('bluetooth', false);
|
||||
expect(repository.writes, 1);
|
||||
repository.saved.complete(null);
|
||||
await pumpEventQueue();
|
||||
expect(container.read(provider).isLoading, isTrue);
|
||||
repository.response.complete(const DevicePolicy(bluetooth: 0));
|
||||
await pending;
|
||||
expect(container.read(provider).isLoading, isFalse);
|
||||
expect(container.read(provider).valueOrNull?.bluetooth, 0);
|
||||
});
|
||||
|
||||
test('failed load unlocks and clears cached switches', () async {
|
||||
await pumpEventQueue();
|
||||
repository.response.complete(null);
|
||||
await pumpEventQueue();
|
||||
expect(container.read(provider).isLoading, isFalse);
|
||||
expect(container.read(provider).valueOrNull, isNull);
|
||||
});
|
||||
|
||||
test('failed save unlocks with previous switches and exposes error', () async {
|
||||
repository.response.complete(const DevicePolicy(bluetooth: 1));
|
||||
await pumpEventQueue();
|
||||
final pending = container.read(provider.notifier).toggle('bluetooth', false);
|
||||
repository.saved.complete('保存失败');
|
||||
await pending;
|
||||
expect(container.read(provider).isLoading, isFalse);
|
||||
expect(container.read(provider).hasError, isTrue);
|
||||
expect(container.read(provider).valueOrNull?.bluetooth, 1);
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:ttstd_family_care/core/network/api_exception.dart';
|
||||
import 'package:ttstd_family_care/features/profile/data/profile_repository_impl.dart';
|
||||
import 'package:ttstd_family_care/features/profile/domain/profile_models.dart';
|
||||
import 'package:ttstd_family_care/features/profile/domain/profile_repository.dart';
|
||||
import 'package:ttstd_family_care/features/profile/presentation/profile_controller.dart';
|
||||
|
||||
class FakeProfileRepository implements ProfileRepository {
|
||||
final pendingLoad = Completer<UserProfile>();
|
||||
bool failSave = false;
|
||||
int saves = 0;
|
||||
|
||||
@override
|
||||
Future<UserProfile> load() => pendingLoad.future;
|
||||
|
||||
@override
|
||||
Future<UserProfile> save(String nickname, String signature) async {
|
||||
saves++;
|
||||
if (failSave) throw const ApiException(code: '400', message: 'Save failed');
|
||||
return UserProfile(id: '7', nickname: nickname, signature: signature);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<UserProfile?> chooseAvatar() async => null;
|
||||
}
|
||||
|
||||
void main() {
|
||||
test(
|
||||
'late loads cannot overwrite saved profile, failed saves retain data',
|
||||
() async {
|
||||
final repository = FakeProfileRepository();
|
||||
final container = ProviderContainer(
|
||||
overrides: [profileRepositoryProvider.overrideWithValue(repository)],
|
||||
);
|
||||
addTearDown(container.dispose);
|
||||
container.listen(profileControllerProvider, (_, _) {});
|
||||
await Future<void>.delayed(Duration.zero);
|
||||
final controller = container.read(profileControllerProvider.notifier);
|
||||
|
||||
expect(await controller.save(' 家人 ', ' 你好 '), isTrue);
|
||||
repository.pendingLoad.complete(
|
||||
const UserProfile(id: '7', nickname: 'old'),
|
||||
);
|
||||
await Future<void>.delayed(Duration.zero);
|
||||
expect(container.read(profileControllerProvider).profile?.nickname, '家人');
|
||||
expect(
|
||||
container.read(profileControllerProvider).profile?.signature,
|
||||
'你好',
|
||||
);
|
||||
|
||||
await controller.changeAvatar();
|
||||
expect(container.read(profileControllerProvider).profile?.nickname, '家人');
|
||||
expect(container.read(profileControllerProvider).saving, isFalse);
|
||||
|
||||
repository.failSave = true;
|
||||
expect(await controller.save('new', ''), isFalse);
|
||||
expect(container.read(profileControllerProvider).profile?.nickname, '家人');
|
||||
expect(container.read(profileControllerProvider).alert, 'Save failed');
|
||||
|
||||
final calls = repository.saves;
|
||||
expect(await controller.save(' ', ''), isFalse);
|
||||
expect(repository.saves, calls);
|
||||
expect(
|
||||
container.read(profileControllerProvider).issue,
|
||||
ProfileIssue.nicknameInvalid,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
test('numeric user IDs and absent optional profile fields decode', () {
|
||||
final profile = UserProfile.fromJson({
|
||||
'id': 7,
|
||||
'nickname': null,
|
||||
'signature': null,
|
||||
});
|
||||
expect(profile.id, '7');
|
||||
expect(profile.nickname, '');
|
||||
expect(profile.signature, '');
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:cupertino_ui/cupertino_ui.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:ttstd_family_care/app/app.dart';
|
||||
import 'package:ttstd_family_care/features/device/data/device_providers.dart';
|
||||
import 'package:ttstd_family_care/features/device/domain/device_models.dart';
|
||||
import 'package:ttstd_family_care/features/profile/data/profile_repository_impl.dart';
|
||||
import 'package:ttstd_family_care/features/profile/domain/profile_models.dart';
|
||||
import 'package:ttstd_family_care/features/profile/domain/profile_repository.dart';
|
||||
import 'package:ttstd_family_care/features/profile/presentation/profile_edit_page.dart';
|
||||
import 'package:ttstd_family_care/features/profile/presentation/profile_tab.dart';
|
||||
import 'package:ttstd_family_care/l10n/app_localizations.dart';
|
||||
|
||||
class _ProfileRepository implements ProfileRepository {
|
||||
Completer<UserProfile>? pendingLoad;
|
||||
UserProfile profile = const UserProfile(id: '7', nickname: 'Old name');
|
||||
|
||||
@override
|
||||
Future<UserProfile> load() async =>
|
||||
pendingLoad == null ? profile : await pendingLoad!.future;
|
||||
|
||||
@override
|
||||
Future<UserProfile> save(String nickname, String signature) async {
|
||||
profile = profile.copyWith(nickname: nickname, signature: signature);
|
||||
return profile;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<UserProfile?> chooseAvatar() async => null;
|
||||
}
|
||||
|
||||
void main() {
|
||||
for (final signature in ['', 'First line\nSecond line\nMore text']) {
|
||||
testWidgets(
|
||||
'profile and devices load without shifting sections ($signature)',
|
||||
(tester) async {
|
||||
final repository = _ProfileRepository()
|
||||
..pendingLoad = Completer<UserProfile>();
|
||||
final devices = Completer<List<DeviceBrief>>();
|
||||
final router = GoRouter(
|
||||
routes: [GoRoute(path: '/', builder: (_, _) => const ProfileTab())],
|
||||
);
|
||||
addTearDown(router.dispose);
|
||||
await tester.pumpWidget(
|
||||
ProviderScope(
|
||||
overrides: [
|
||||
profileRepositoryProvider.overrideWithValue(repository),
|
||||
myDevicesProvider.overrideWith((_) => devices.future),
|
||||
],
|
||||
child: App(router: router),
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
final l10n = AppLocalizations.of(
|
||||
tester.element(find.byType(ProfileTab)),
|
||||
);
|
||||
final boundBefore = tester.getTopLeft(find.text(l10n.deviceBound));
|
||||
final settingsBefore = tester.getTopLeft(find.text(l10n.settingsTitle));
|
||||
repository.pendingLoad!.complete(
|
||||
UserProfile(
|
||||
id: '123456789012345678901234567890',
|
||||
nickname: 'A very long nickname that must stay on one line',
|
||||
signature: signature,
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 100));
|
||||
expect(tester.getTopLeft(find.text(l10n.deviceBound)), boundBefore);
|
||||
expect(
|
||||
tester.getTopLeft(find.text(l10n.settingsTitle)),
|
||||
settingsBefore,
|
||||
);
|
||||
devices.complete([
|
||||
const DeviceBrief(
|
||||
serialno: 'one',
|
||||
snName: 'A very long device name that stays on one line',
|
||||
snModel: 'Tablet model',
|
||||
online: 1,
|
||||
),
|
||||
]);
|
||||
await tester.pumpAndSettle();
|
||||
expect(
|
||||
tester.getTopLeft(find.text(l10n.settingsTitle)),
|
||||
settingsBefore,
|
||||
);
|
||||
expect(tester.takeException(), isNull);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
testWidgets('editing from profile updates the header after saving', (
|
||||
tester,
|
||||
) async {
|
||||
final repository = _ProfileRepository();
|
||||
final router = GoRouter(
|
||||
initialLocation: '/profile',
|
||||
routes: [
|
||||
GoRoute(path: '/profile', builder: (_, _) => const ProfileTab()),
|
||||
GoRoute(
|
||||
path: '/profile/edit',
|
||||
builder: (_, _) => const ProfileEditPage(),
|
||||
),
|
||||
],
|
||||
);
|
||||
addTearDown(router.dispose);
|
||||
await tester.pumpWidget(
|
||||
ProviderScope(
|
||||
overrides: [
|
||||
profileRepositoryProvider.overrideWithValue(repository),
|
||||
myDevicesProvider.overrideWith((_) async => []),
|
||||
],
|
||||
child: App(router: router),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('Old name'), findsOneWidget);
|
||||
final l10n = AppLocalizations.of(tester.element(find.byType(ProfileTab)));
|
||||
await tester.tap(find.text(l10n.profileEdit));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final fields = find.byType(CupertinoTextField);
|
||||
await tester.enterText(fields.at(0), 'New name');
|
||||
await tester.enterText(fields.at(1), 'My signature');
|
||||
await tester.tap(find.text(l10n.commonSave));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(router.routeInformationProvider.value.uri.path, '/profile');
|
||||
expect(find.text('New name'), findsOneWidget);
|
||||
expect(find.text('My signature'), findsOneWidget);
|
||||
expect(repository.profile.nickname, 'New name');
|
||||
});
|
||||
}
|
||||
Reference in new issue
Block a user