首页的权限交接的弹窗(关闭了释放权限)+添加日志过滤功能,支持通过 shouldLog参数控制日志输出

This commit is contained in:
2026-04-29 14:25:46 +08:00
parent c3c9db5447
commit 19add5ad51
8 changed files with 124 additions and 32 deletions

View File

@@ -8,8 +8,12 @@ import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/core/network/tcp/tcp_client.dart';
import 'package:maibu_satabot_v2/features/devices/presentation/bloc/devices_cubit.dart';
import 'package:maibu_satabot_v2/features/devices/presentation/bloc/devices_state.dart'; // 👈 必须加
import 'package:maibu_satabot_v2/features/remote_control/domain/repositories/remote_control_repository.dart';
import '../../../devices/domain/entities/device_entity.dart';
import '../bloc/permission_request_bloc.dart';
import '../bloc/permission_request_state.dart';
import '../bloc/permission_request_event.dart';
import '../widgets/ImmersionHeader.dart';
import '../widgets/quick_actions_grid.dart';
import '../widgets/work_params_card.dart';
@@ -63,7 +67,17 @@ class _HomePageState extends State<HomePage> {
tcpClient.connectBySwitch(host: TCPConsts.TCP_IP, port: TCPConsts.TCP_PORT, deviceName: firstDevice.deviceName).then((_) {
debugPrint('✅ [HomePage] TCP 连接成功');
tcpClient.startHeartbeat(interval: const Duration(seconds: 4));
// 🔥 关键:TCP 连接成功后,主动请求权限以激活服务器的推送机制
final remoteRepo = GetIt.instance<RemoteControlRepository>();
remoteRepo.requestControlPermission(firstDevice.deviceName, "app");
debugPrint('✅ [HomePage] 已发送权限请求,激活服务器推送');
});
} else {
// 🔥 TCP 已连接,也要发送权限请求
final remoteRepo = GetIt.instance<RemoteControlRepository>();
remoteRepo.requestControlPermission(firstDevice.deviceName, "app");
debugPrint('✅ [HomePage] TCP 已连接,已发送权限请求');
}
}
} catch (e) {
@@ -103,15 +117,68 @@ class _HomePageState extends State<HomePage> {
tenantName: '',
);
return Scaffold(
backgroundColor: const Color(0xFFF7F7F7),
body: CustomScrollView(
physics: const BouncingScrollPhysics(),
slivers: [
SliverToBoxAdapter(child: ImmersionHeader(device: currentDevice ?? defaultDevice)),
const SliverToBoxAdapter(child: QuickActionsGrid()),
SliverToBoxAdapter(child: WorkParamsCard()),
const SliverToBoxAdapter(child: SizedBox(height: 120)),
return BlocBuilder<PermissionRequestBloc, PermissionRequestState>(
buildWhen: (p, c) {
final shouldRebuild = p.runtimeType != c.runtimeType;
debugPrint('🔍 [HomePage-BlocBuilder] buildWhen 检查: previous=${p.runtimeType}, current=${c.runtimeType}, shouldRebuild=$shouldRebuild');
return shouldRebuild;
},
builder: (context, permissionState) {
debugPrint('🔍 [HomePage-BlocBuilder] builder 被调用,当前状态: ${permissionState.runtimeType}');
return Stack(
children: [
Scaffold(
backgroundColor: const Color(0xFFF7F7F7),
body: CustomScrollView(
physics: const BouncingScrollPhysics(),
slivers: [
SliverToBoxAdapter(child: ImmersionHeader(device: currentDevice ?? defaultDevice)),
const SliverToBoxAdapter(child: QuickActionsGrid()),
SliverToBoxAdapter(child: WorkParamsCard()),
const SliverToBoxAdapter(child: SizedBox(height: 120)),
],
),
),
if (permissionState is PermissionRequestDialogVisible)
_buildPermissionDialog(context, permissionState),
],
);
},
);
}
Widget _buildPermissionDialog(BuildContext context, PermissionRequestDialogVisible state) {
debugPrint('🔍 [HomePage] 🚨 弹窗正在显示!platform=${state.platform}');
final deviceId = context.read<DevicesCubit>().state.selectedDevice?.deviceName ?? "";
final permissionBloc = context.read<PermissionRequestBloc>();
return Container(
color: Colors.black54,
alignment: Alignment.center,
child: AlertDialog(
title: Text(AppLocalizations.of(context).translate('remote_control.permission_request_title')),
content: Text(AppLocalizations.of(context).translate('remote_control.permission_request_content')),
actions: [
TextButton(
onPressed: () {
permissionBloc.add(PermissionDialogDismissed(
agree: false,
deviceId: deviceId,
));
},
child: Text(AppLocalizations.of(context).translate('remote_control.refuse')),
),
TextButton(
onPressed: () {
permissionBloc.add(PermissionDialogDismissed(
agree: true,
deviceId: deviceId,
));
},
child: Text(AppLocalizations.of(context).translate('remote_control.agree')),
),
],
),
);

View File

@@ -8,6 +8,7 @@ import 'package:maibu_satabot_v2/features/home/presentation/pages/productDesc.da
import '../../../../core/di/injection.dart';
import '../../../../core/router/route_paths.dart';
import '../../../devices/presentation/bloc/device_status_bloc.dart';
import '../../presentation/bloc/permission_request_bloc.dart';
import '../../../remote_control/presentation/bloc/remote_control_cubit.dart';
import '../../../remote_control/presentation/pages/remote_control_page.dart';
import '../pages/route_plan_page.dart';
@@ -41,6 +42,12 @@ class HomeRoutes {
/// 2. 首页 Tab 分支(带导航栏)
/// 仅保留真正的首页入口
static StatefulShellBranch get branch => StatefulShellBranch(
routes: [GoRoute(path: RoutePaths.home, builder: (context, state) => const HomePage())],
routes: [GoRoute(
path: RoutePaths.home,
builder: (context, state) => BlocProvider.value(
value: sl<PermissionRequestBloc>(), // 使用全局单例,持久监听 0x12
child: const HomePage(),
),
)],
);
}