feat(client): 网络恢复自动刷新 + 离线嗅探 + 连通性感知登录

网络嗅探与自动恢复:
- ConnectivityNotifier:在线时 30s 检测,离线时切换为 1min 嗅探
- 新增 networkRecoveryCountProvider:网络恢复时自增,各数据 provider
  通过 ref.watch 实现自动重新加载
- inventory/product/stock_in/stock_out/partner provider 均已接入

FutureBuilder 类屏幕:
- finance_screen + batch_tracking_screen 通过 ref.listen 监听恢复事件

修复问题 1:API 超时 10s/30s → 5s/15s,减少无网络时等待
修复问题 2:offline banner 文字由"写操作已禁用"改为实际行为描述

连通性感知:
- app 启动时(_AppBootstrap)立即 forceCheck,路由跳转前状态已就绪
- 登录页:watch connectivityProvider,离线时显示警告 banner
- 登录按钮:离线状态下直接提示,不等待超时

测试:
- login_screen_test + login_flow_test 通过 ConnectivityNotifier(skipInit: true)
  覆盖 provider,避免测试环境中 pending HTTP timer

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-04-18 19:52:17 +08:00
parent 3bf99966db
commit 5dd7c07138
23 changed files with 822 additions and 29 deletions
+11 -9
View File
@@ -49,14 +49,16 @@ void main() {
'data': [
{
'warehouse_id': 1,
'warehouse_name': '主仓库',
'product_id': 1,
'product_name': '五粮液',
'product_code': 'P001',
'product_spec': '500ml',
'product_unit': '',
'product_brand': '五粮液集团',
'min_stock': 10,
'warehouse': {'name': '主仓库'},
'product': {
'name': '五粮液',
'code': 'P001',
'spec': '500ml',
'unit': '',
'brand': '五粮液集团',
'min_stock': 10,
},
'quantity': 50.0,
}
],
@@ -171,9 +173,9 @@ void main() {
'data': [
{
'warehouse_id': 1,
'warehouse_name': '主仓库',
'product_id': 1,
'product_name': '五粮液',
'warehouse': {'name': '主仓库'},
'product': {'name': '五粮液'},
'direction': 'in',
'quantity': 20.0,
'qty_before': 30.0,
+91
View File
@@ -0,0 +1,91 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:jiu_client/core/auth/auth_state.dart';
import 'package:jiu_client/providers/connectivity_provider.dart';
import 'package:jiu_client/repositories/auth_repository.dart';
import 'package:jiu_client/screens/auth/login_screen.dart';
import 'package:shared_preferences/shared_preferences.dart';
Widget _buildApp() {
final router = GoRouter(
initialLocation: '/login',
routes: [
GoRoute(
path: '/login',
builder: (_, __) => const LoginScreen(),
),
GoRoute(
path: '/stock-in',
builder: (_, __) => const Scaffold(body: Text('stock-in home')),
),
],
);
return ProviderScope(
overrides: [
connectivityProvider.overrideWith(
(_) => ConnectivityNotifier(skipInit: true),
),
],
child: MaterialApp.router(routerConfig: router),
);
}
void main() {
setUp(() {
SharedPreferences.setMockInitialValues({});
AuthRepository.loginOverride = null;
});
tearDown(() {
AuthRepository.loginOverride = null;
});
testWidgets('login success navigates to stock-in home', (tester) async {
tester.view.physicalSize = const Size(1280, 800);
tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.resetPhysicalSize);
AuthRepository.loginOverride = ({
required String shopCode,
required String username,
required String password,
}) async {
expect(shopCode, 'S001');
expect(username, 'admin');
expect(password, 'password123');
return const AuthUser(
accessToken: 'access-token',
refreshToken: 'refresh-token',
username: 'admin',
realName: '管理员',
shopNo: 'S001',
shopId: 1,
);
};
await tester.pumpWidget(_buildApp());
await tester.pumpAndSettle();
await tester.enterText(
find.widgetWithText(TextFormField, '请输入门店编号'),
'S001',
);
await tester.enterText(
find.widgetWithText(TextFormField, '请输入用户名'),
'admin',
);
await tester.enterText(
find.widgetWithText(TextFormField, '请输入密码'),
'password123',
);
await tester.tap(find.text('登 录'));
await tester.pump();
await tester.pumpAndSettle();
expect(find.text('stock-in home'), findsOneWidget);
});
}
+37
View File
@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:jiu_client/providers/connectivity_provider.dart';
import 'package:jiu_client/screens/auth/login_screen.dart';
import 'package:shared_preferences/shared_preferences.dart';
/// Wrap the screen in the minimum required providers.
Widget _buildTestApp() {
@@ -21,11 +23,21 @@ Widget _buildTestApp() {
);
return ProviderScope(
overrides: [
// skipInit=true:避免测试环境中发起真实 HTTP 请求导致 pending timer
connectivityProvider.overrideWith(
(_) => ConnectivityNotifier(skipInit: true),
),
],
child: MaterialApp.router(routerConfig: router),
);
}
void main() {
setUp(() {
SharedPreferences.setMockInitialValues({});
});
group('LoginScreen UI', () {
testWidgets('renders all three input fields and login button',
(tester) async {
@@ -99,5 +111,30 @@ void main() {
final btn = tester.widget<ElevatedButton>(find.byType(ElevatedButton));
expect(btn.onPressed, isNotNull);
});
testWidgets('selecting history item fills shop code input', (tester) async {
SharedPreferences.setMockInitialValues({
'login_history_hotels': ['S001', 'H001'],
});
tester.view.physicalSize = const Size(1280, 800);
tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.resetPhysicalSize);
await tester.pumpWidget(_buildTestApp());
await tester.pumpAndSettle();
await tester.tap(find.widgetWithText(TextFormField, '请输入门店编号'));
await tester.pumpAndSettle();
expect(find.text('S001'), findsOneWidget);
await tester.tap(find.text('S001').last);
await tester.pumpAndSettle();
final field = tester.widget<TextFormField>(
find.byType(TextFormField).first,
);
expect(field.controller!.text, 'S001');
});
});
}
+1 -1
View File
@@ -133,7 +133,7 @@ void main() {
);
await tester.pump();
expect(find.textContaining('加载失败'), findsOneWidget);
expect(find.text('暂无数据,网络不可用'), findsOneWidget);
expect(find.text('重试'), findsOneWidget);
});
+82
View File
@@ -0,0 +1,82 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:jiu_client/core/models/page_result.dart';
import 'package:jiu_client/models/product.dart';
import 'package:jiu_client/providers/product_provider.dart';
import 'package:jiu_client/screens/products/products_screen.dart';
class _DelayedProductNotifier extends ProductListNotifier {
final Completer<PageResult<Product>> completer;
_DelayedProductNotifier(this.completer);
@override
Future<PageResult<Product>> build() => completer.future;
@override
void reload() {}
@override
void setKeyword(String keyword) {}
@override
void setPage(int page) {}
@override
Future<void> createProduct(Map<String, dynamic> data) async {}
@override
Future<void> updateProduct(int id, Map<String, dynamic> data) async {}
@override
Future<void> deleteProduct(int id) async {}
}
void main() {
testWidgets('products screen auto loads and renders product list',
(tester) async {
tester.view.physicalSize = const Size(1280, 800);
tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.resetPhysicalSize);
final completer = Completer<PageResult<Product>>();
await tester.pumpWidget(
ProviderScope(
overrides: [
productListProvider.overrideWith(
() => _DelayedProductNotifier(completer),
),
],
child: const MaterialApp(
home: Scaffold(body: ProductsScreen()),
),
),
);
await tester.pump();
expect(find.byType(CircularProgressIndicator), findsOneWidget);
completer.complete(
const PageResult<Product>(
data: [
Product(id: 1, code: 'P001', name: '五粮液', unit: ''),
Product(id: 2, code: 'P002', name: '茅台', unit: ''),
],
total: 2,
page: 1,
pageSize: 20,
),
);
await tester.pumpAndSettle();
expect(find.text('五粮液'), findsOneWidget);
expect(find.text('茅台'), findsOneWidget);
expect(find.text('P001'), findsOneWidget);
expect(find.text('P002'), findsOneWidget);
});
}
+1 -1
View File
@@ -113,7 +113,7 @@ void main() {
);
await tester.pump();
expect(find.textContaining('加载失败'), findsOneWidget);
expect(find.text('暂无数据,网络不可用'), findsOneWidget);
expect(find.text('重试'), findsOneWidget);
});
@@ -0,0 +1,68 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:jiu_client/core/exceptions.dart';
import 'package:jiu_client/core/models/page_result.dart';
import 'package:jiu_client/models/product.dart';
import 'package:jiu_client/providers/product_provider.dart';
import 'package:jiu_client/screens/products/products_screen.dart';
class _ReadonlyProductNotifier extends ProductListNotifier {
@override
Future<PageResult<Product>> build() async {
return const PageResult(data: [], total: 0, page: 1, pageSize: 20);
}
@override
void reload() {}
@override
void setKeyword(String keyword) {}
@override
void setPage(int page) {}
@override
Future<void> createProduct(Map<String, dynamic> data) async {
throw const AppException('readonly user', statusCode: 403);
}
@override
Future<void> updateProduct(int id, Map<String, dynamic> data) async {}
@override
Future<void> deleteProduct(int id) async {}
}
void main() {
testWidgets('write operation shows forbidden error for readonly user',
(tester) async {
tester.view.physicalSize = const Size(1280, 800);
tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.resetPhysicalSize);
await tester.pumpWidget(
ProviderScope(
overrides: [
productListProvider.overrideWith(() => _ReadonlyProductNotifier()),
],
child: const MaterialApp(
home: Scaffold(body: ProductsScreen()),
),
),
);
await tester.pumpAndSettle();
await tester.tap(find.text('新建'));
await tester.pumpAndSettle();
await tester.enterText(find.byType(TextFormField).at(0), '测试商品');
await tester.enterText(find.byType(TextFormField).at(1), 'P999');
await tester.tap(find.text('保存'));
await tester.pump();
await tester.pumpAndSettle();
expect(find.textContaining('保存失败:readonly user'), findsOneWidget);
});
}
@@ -0,0 +1,183 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:jiu_client/core/models/page_result.dart';
import 'package:jiu_client/models/partner.dart';
import 'package:jiu_client/models/product.dart';
import 'package:jiu_client/models/stock_in.dart';
import 'package:jiu_client/models/warehouse.dart';
import 'package:jiu_client/providers/partner_provider.dart';
import 'package:jiu_client/providers/product_provider.dart';
import 'package:jiu_client/providers/stock_in_provider.dart';
import 'package:jiu_client/providers/warehouse_provider.dart';
import 'package:jiu_client/screens/stock_in/stock_in_form_screen.dart';
class _FakeWarehouseNotifier extends WarehouseListNotifier {
@override
Future<List<Warehouse>> build() async {
return const [
Warehouse(id: 1, name: '主仓库', isDefault: true),
];
}
@override
Future<void> reload() async {}
}
class _FakeSupplierNotifier extends PartnerListNotifier {
_FakeSupplierNotifier() : super(type: 'supplier');
@override
Future<PageResult<Partner>> build() async {
return const PageResult(
data: [
Partner(id: 1, name: '张家酒水', type: 'supplier'),
],
total: 1,
page: 1,
pageSize: 20,
);
}
@override
void reload() {}
}
class _FakeProductNotifier extends ProductListNotifier {
@override
Future<PageResult<Product>> build() async {
return const PageResult(
data: [
Product(
id: 1,
code: 'P001',
name: '五粮液',
spec: '500ml',
unit: '',
purchasePrice: 100,
),
],
total: 1,
page: 1,
pageSize: 20,
);
}
@override
void reload() {}
@override
void setKeyword(String keyword) {}
@override
void setPage(int page) {}
@override
Future<void> createProduct(Map<String, dynamic> data) async {}
@override
Future<void> updateProduct(int id, Map<String, dynamic> data) async {}
@override
Future<void> deleteProduct(int id) async {}
}
class _CapturingStockInNotifier extends StockInListNotifier {
Map<String, dynamic>? capturedData;
@override
Future<PageResult<StockInOrder>> build() async {
return const PageResult(data: [], total: 0, page: 1, pageSize: 20);
}
@override
void reload() {}
@override
void setPage(int page) {}
@override
void setStatus(String status) {}
@override
void setDateRange(String? startDate, String? endDate) {}
@override
Future<void> createOrder(Map<String, dynamic> data) async {
capturedData = data;
}
@override
Future<void> submitOrder(int id) async {}
@override
Future<void> approveOrder(int id) async {}
@override
Future<void> rejectOrder(int id) async {}
}
void main() {
testWidgets('stock-in form creates and submits a pending order',
(tester) async {
tester.view.physicalSize = const Size(1440, 1200);
tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.resetPhysicalSize);
final stockInNotifier = _CapturingStockInNotifier();
final router = GoRouter(
initialLocation: '/stock-in/new',
routes: [
GoRoute(
path: '/stock-in',
builder: (_, __) => const Scaffold(body: Text('stock-in list')),
),
GoRoute(
path: '/stock-in/new',
builder: (_, __) => const StockInFormScreen(),
),
],
);
await tester.pumpWidget(
ProviderScope(
overrides: [
warehouseListProvider.overrideWith(() => _FakeWarehouseNotifier()),
supplierListProvider.overrideWith(() => _FakeSupplierNotifier()),
productListProvider.overrideWith(() => _FakeProductNotifier()),
stockInListProvider.overrideWith(() => stockInNotifier),
],
child: MaterialApp.router(routerConfig: router),
),
);
await tester.pumpAndSettle();
await tester.tap(find.byType(DropdownButtonFormField<int>).at(0));
await tester.pumpAndSettle();
await tester.tap(find.text('主仓库').last);
await tester.pumpAndSettle();
await tester.tap(find.byType(DropdownButtonFormField<int>).at(2));
await tester.pumpAndSettle();
await tester.tap(find.text('五粮液(500ml').last);
await tester.pumpAndSettle();
await tester.enterText(find.byType(TextFormField).at(1), '10');
await tester.enterText(find.byType(TextFormField).at(2), '100');
await tester.tap(find.text('提交审核'));
await tester.pump();
await tester.pumpAndSettle();
expect(find.text('stock-in list'), findsOneWidget);
expect(stockInNotifier.capturedData, isNotNull);
expect(stockInNotifier.capturedData!['warehouse_id'], 1);
expect(stockInNotifier.capturedData!['status'], 'pending');
expect((stockInNotifier.capturedData!['items'] as List).length, 1);
expect(
(stockInNotifier.capturedData!['items'] as List).first['product_id'],
1,
);
});
}
+7 -5
View File
@@ -175,7 +175,7 @@ void main() {
);
await tester.pump();
expect(find.textContaining('加载失败'), findsOneWidget);
expect(find.text('暂无数据,网络不可用'), findsOneWidget);
expect(find.text('重试'), findsOneWidget);
});
@@ -226,7 +226,7 @@ void main() {
await tester.pumpWidget(_buildApp(const AsyncValue.data(empty)));
await tester.pump();
expect(find.text('新建入库单'), findsOneWidget);
expect(find.text('新建入库审核'), findsOneWidget);
});
testWidgets('tapping 新建入库单 navigates to new order route', (tester) async {
@@ -240,7 +240,7 @@ void main() {
await tester.pumpWidget(_buildApp(const AsyncValue.data(empty)));
await tester.pump();
await tester.tap(find.text('新建入库单'));
await tester.tap(find.text('新建入库审核'));
await tester.pumpAndSettle();
expect(find.text('new order form'), findsOneWidget);
@@ -349,7 +349,9 @@ void main() {
await tester.pumpWidget(_buildApp(const AsyncValue.data(empty)));
await tester.pump();
// The dropdown shows 全部状态 by default
await tester.tap(find.text('入库单'));
await tester.pumpAndSettle();
expect(find.text('全部状态'), findsOneWidget);
});
@@ -365,7 +367,7 @@ void main() {
await tester.pumpWidget(_buildApp(AsyncValue.data(result)));
await tester.pump();
expect(find.textContaining('35'), findsAtLeastNWidgets(1));
expect(find.textContaining('共 1 条记录'), findsOneWidget);
});
});
}
@@ -0,0 +1,214 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:jiu_client/core/api/api_client.dart';
import 'package:jiu_client/core/exceptions.dart';
import 'package:jiu_client/core/models/page_result.dart';
import 'package:jiu_client/models/inventory.dart';
import 'package:jiu_client/models/partner.dart';
import 'package:jiu_client/models/product.dart';
import 'package:jiu_client/models/stock_out.dart';
import 'package:jiu_client/models/warehouse.dart';
import 'package:jiu_client/providers/inventory_provider.dart';
import 'package:jiu_client/providers/partner_provider.dart';
import 'package:jiu_client/providers/product_provider.dart';
import 'package:jiu_client/providers/stock_out_provider.dart';
import 'package:jiu_client/providers/warehouse_provider.dart';
import 'package:jiu_client/repositories/inventory_repository.dart';
import 'package:jiu_client/screens/stock_out/stock_out_form_screen.dart';
class _FakeWarehouseNotifier extends WarehouseListNotifier {
@override
Future<List<Warehouse>> build() async {
return const [
Warehouse(id: 1, name: '主仓库', isDefault: true),
];
}
@override
Future<void> reload() async {}
}
class _FakeCustomerNotifier extends PartnerListNotifier {
_FakeCustomerNotifier() : super(type: 'customer');
@override
Future<PageResult<Partner>> build() async {
return const PageResult(
data: [
Partner(id: 2, name: '王记饭店', type: 'customer'),
],
total: 1,
page: 1,
pageSize: 20,
);
}
@override
void reload() {}
}
class _FakeProductNotifier extends ProductListNotifier {
@override
Future<PageResult<Product>> build() async {
return const PageResult(
data: [
Product(
id: 1,
code: 'P001',
name: '五粮液',
spec: '500ml',
unit: '',
salePrice: 120,
),
],
total: 1,
page: 1,
pageSize: 20,
);
}
@override
void reload() {}
@override
void setKeyword(String keyword) {}
@override
void setPage(int page) {}
@override
Future<void> createProduct(Map<String, dynamic> data) async {}
@override
Future<void> updateProduct(int id, Map<String, dynamic> data) async {}
@override
Future<void> deleteProduct(int id) async {}
}
class _FakeInventoryRepository extends InventoryRepository {
_FakeInventoryRepository() : super(_DummyApiClient());
@override
Future<PageResult<Inventory>> listInventory({
int? warehouseId,
String? keyword,
int page = 1,
int pageSize = 50,
}) async {
return const PageResult(
data: [
Inventory(
warehouseId: 1,
warehouseName: '主仓库',
productId: 1,
productName: '五粮液',
productUnit: '',
quantity: 1,
),
],
total: 1,
page: 1,
pageSize: 50,
);
}
}
class _DummyApiClient extends ApiClient {
_DummyApiClient() : super(token: 'test-token');
}
class _FailingStockOutNotifier extends StockOutListNotifier {
@override
Future<PageResult<StockOutOrder>> build() async {
return const PageResult(data: [], total: 0, page: 1, pageSize: 20);
}
@override
void reload() {}
@override
void setPage(int page) {}
@override
void setStatus(String status) {}
@override
void setDateRange(String? startDate, String? endDate) {}
@override
Future<void> createOrder(Map<String, dynamic> data) async {
throw const AppException('库存不足:五粮液 当前库存 1,需要 5', statusCode: 400);
}
@override
Future<void> deleteOrder(int id) async {}
@override
Future<void> submitOrder(int id) async {}
@override
Future<void> approveOrder(int id) async {}
@override
Future<void> rejectOrder(int id) async {}
}
void main() {
testWidgets('stock-out form shows insufficient stock error on submit',
(tester) async {
tester.view.physicalSize = const Size(1440, 1200);
tester.view.devicePixelRatio = 1.0;
addTearDown(tester.view.resetPhysicalSize);
final router = GoRouter(
initialLocation: '/stock-out/new',
routes: [
GoRoute(
path: '/stock-out',
builder: (_, __) => const Scaffold(body: Text('stock-out list')),
),
GoRoute(
path: '/stock-out/new',
builder: (_, __) => const StockOutFormScreen(),
),
],
);
await tester.pumpWidget(
ProviderScope(
overrides: [
warehouseListProvider.overrideWith(() => _FakeWarehouseNotifier()),
customerListProvider.overrideWith(() => _FakeCustomerNotifier()),
productListProvider.overrideWith(() => _FakeProductNotifier()),
stockOutListProvider.overrideWith(() => _FailingStockOutNotifier()),
inventoryRepositoryProvider.overrideWith(
(ref) => _FakeInventoryRepository(),
),
],
child: MaterialApp.router(routerConfig: router),
),
);
await tester.pumpAndSettle();
await tester.tap(find.byType(DropdownButtonFormField<int>).at(0));
await tester.pumpAndSettle();
await tester.tap(find.text('主仓库').last);
await tester.pumpAndSettle();
await tester.tap(find.byType(DropdownButtonFormField<int>).at(2));
await tester.pumpAndSettle();
await tester.tap(find.text('五粮液(500ml').last);
await tester.pumpAndSettle();
await tester.enterText(find.byType(TextFormField).at(1), '5');
await tester.tap(find.text('提交审核'));
await tester.pump();
await tester.pumpAndSettle();
expect(find.textContaining('库存不足'), findsOneWidget);
expect(find.text('stock-out list'), findsNothing);
});
}