集成接口 开始执行任务的领域层和数据层和UI层的开发啊(待测试)
集成功能 暂停 取消功能 恢复功能的接口的领域层和数据层的开发 下一步待集成到页面上 优化功能,优化了接口异常和未知异常对页面渲染的影响对用户的体验的不好情况。具体通过弹窗友好提示! 优化更新了tcp指示灯点击出现机器状态中添加选中设备的编号 方便用户使用的明白明了!。 优化更新关闭了tcp重连操作内链条中的获取用户设备和切换设备操作项。 调整了获取无人机状态信息的更新频率 为14秒一次
This commit is contained in:
145
lib/main.dart
145
lib/main.dart
@@ -1,16 +1,12 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/scheduler.dart';
|
||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_patcher/flutter_patcher.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:get_it/get_it.dart';
|
||||
|
||||
// 悬浮条相关
|
||||
import 'features/v2/device_list/presentation/float_bar/float_bar_controller.dart';
|
||||
import 'features/v2/device_list/presentation/float_bar/simple_float_bar.dart';
|
||||
|
||||
import 'package:maibu_satabot_v2/core/app/app_user_cubit.dart';
|
||||
import 'package:maibu_satabot_v2/core/infrastructure/logging/app_bloc_observer.dart';
|
||||
import 'package:maibu_satabot_v2/core/logging/i_logger_service.dart';
|
||||
@@ -23,22 +19,15 @@ import 'package:maibu_satabot_v2/features/auth/presentation/bloc/auth_cubit.dart
|
||||
import 'package:maibu_satabot_v2/features/devices/presentation/bloc/devices_cubit.dart';
|
||||
import 'package:maibu_satabot_v2/features/main_container/presentation/cubit/tab_config_cubit.dart';
|
||||
import 'package:maibu_satabot_v2/features/main_container/presentation/main_wrapper.dart';
|
||||
// 🔥 导入悬浮条管理器和设置服务
|
||||
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/manager/float_bar_manager.dart';
|
||||
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/view/float_bar_widget.dart';
|
||||
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/cubit/float_bar_setting_cubit.dart';
|
||||
|
||||
import 'core/di/injection.dart';
|
||||
import 'core/router/route_paths.dart';
|
||||
import 'core/localization/app_localizations.dart';
|
||||
import 'core/localization/locale_cubit.dart';
|
||||
import 'features/auth/presentation/bloc/auth_state.dart';
|
||||
import 'features/auth/presentation/bloc/login_cubit.dart';
|
||||
import 'features/devices/presentation/bloc/device_status_bloc.dart';
|
||||
import 'features/home/presentation/bloc/permission_request_bloc.dart';
|
||||
|
||||
// 🔥 全局 GetIt 实例
|
||||
final sl = GetIt.instance;
|
||||
import 'features/remote_control/presentation/bloc/remote_control_cubit.dart';
|
||||
|
||||
// 🔥 定义全局 Navigator Key
|
||||
final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
|
||||
@@ -50,17 +39,10 @@ void main() async {
|
||||
|
||||
await FlutterPatcher.init();
|
||||
await init();
|
||||
|
||||
final logger = sl<ILoggerService>();
|
||||
await logger.init();
|
||||
Bloc.observer = AppBlocObserver(logger);
|
||||
|
||||
// 🔥 确保 FloatBarSettingService 被初始化,这样 settingNotifier 才不会是 null
|
||||
sl<FloatBarSettingService>();
|
||||
debugPrint(
|
||||
'🔍 [FloatBar] FloatBarSettingService 已初始化,settingNotifier: ${FloatBarSettingService.settingNotifier}',
|
||||
);
|
||||
|
||||
// ⚠️ 注意:不要在启动时清除补丁版本记录!
|
||||
// 补丁版本记录只在整包更新成功后才清除
|
||||
// 如果在启动时清除,会导致差量更新后划掉App再进入时循环更新
|
||||
@@ -104,6 +86,9 @@ class MyApp extends StatelessWidget {
|
||||
BlocProvider<UpdateCubit>(
|
||||
create: (_) => UpdateCubit(VersionCheckService()),
|
||||
),
|
||||
BlocProvider<RemoteControlCubit>(
|
||||
create: (_) => sl<RemoteControlCubit>(),
|
||||
),
|
||||
],
|
||||
child: BlocBuilder<LocaleCubit, Locale>(
|
||||
bloc: localeCubit,
|
||||
@@ -121,23 +106,7 @@ class MyApp extends StatelessWidget {
|
||||
theme: AppTheme.lightTheme,
|
||||
routerConfig: sl<GoRouter>(),
|
||||
builder: (context, child) {
|
||||
// 🔥 初始化悬浮条管理器并显示悬浮条
|
||||
debugPrint(
|
||||
'======== [FloatBar] MaterialApp.builder START ========',
|
||||
);
|
||||
debugPrint('🔍 [FloatBar] child: $child');
|
||||
debugPrint(
|
||||
'🔍 [FloatBar] settingNotifier: ${FloatBarSettingService.settingNotifier}',
|
||||
);
|
||||
debugPrint(
|
||||
'🔍 [FloatBar] isEnabled: ${FloatBarSettingService.isEnabled}',
|
||||
);
|
||||
debugPrint(
|
||||
'======== [FloatBar] MaterialApp.builder END ========',
|
||||
);
|
||||
return _FloatBarInitializer(
|
||||
child: _LifecycleListener(child: _UpdateChecker(child: child!)),
|
||||
);
|
||||
return _LifecycleListener(child: _UpdateChecker(child: child!));
|
||||
},
|
||||
);
|
||||
},
|
||||
@@ -146,35 +115,6 @@ class MyApp extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// 悬浮条初始化组件 - 极简版
|
||||
class _FloatBarInitializer extends StatelessWidget {
|
||||
final Widget child;
|
||||
|
||||
const _FloatBarInitializer({required this.child});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ValueListenableBuilder<bool>(
|
||||
valueListenable: FloatBarController.visibilityNotifier,
|
||||
builder: (context, isVisible, child) {
|
||||
return Stack(
|
||||
children: [
|
||||
child!,
|
||||
if (isVisible)
|
||||
const Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
child: SimpleFloatBar(),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
child: child,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _LifecycleListener extends StatefulWidget {
|
||||
final Widget? child;
|
||||
const _LifecycleListener({required this.child});
|
||||
@@ -302,16 +242,15 @@ class _UpdateCheckerState extends State<_UpdateChecker> {
|
||||
Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.blue.shade50,
|
||||
color: Colors.orange.shade50,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(
|
||||
color: Colors.blue.shade200,
|
||||
color: Colors.orange.shade200,
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 💡 选择下载方式
|
||||
const Text(
|
||||
'💡 选择下载方式',
|
||||
style: TextStyle(
|
||||
@@ -321,8 +260,8 @@ class _UpdateCheckerState extends State<_UpdateChecker> {
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
const Text(
|
||||
'• 自动安装:App 内下载并调起系统安装\n'
|
||||
'• 手动下载:在浏览器中下载安装',
|
||||
'• 浏览器下载(推荐):打开浏览器下载,手动安装并卸载旧版本\n'
|
||||
'• App 内下载:App 内下载 APK,调起系统安装界面',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
height: 1.5,
|
||||
@@ -366,20 +305,24 @@ class _UpdateCheckerState extends State<_UpdateChecker> {
|
||||
onPressed: () {
|
||||
final info = state.versionInfo;
|
||||
if (info.apkUrl != null) {
|
||||
// 🔥 浏览器下载 + 引导弹窗
|
||||
context
|
||||
.read<UpdateCubit>()
|
||||
.downloadAndInstallApk(
|
||||
.fullApkUpdateWithBrowser(
|
||||
info.apkUrl!,
|
||||
);
|
||||
// 显示引导弹窗
|
||||
showBrowserDownloadGuide(context);
|
||||
}
|
||||
},
|
||||
child: const Text('手动下载'),
|
||||
child: const Text('浏览器下载'),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
ElevatedButton(
|
||||
onPressed: () {
|
||||
final info = state.versionInfo;
|
||||
if (info.apkUrl != null) {
|
||||
// App 内下载(保留备用)
|
||||
context
|
||||
.read<UpdateCubit>()
|
||||
.downloadAndInstallApk(
|
||||
@@ -387,7 +330,7 @@ class _UpdateCheckerState extends State<_UpdateChecker> {
|
||||
);
|
||||
}
|
||||
},
|
||||
child: const Text('自动安装'),
|
||||
child: const Text('App 内下载'),
|
||||
),
|
||||
],
|
||||
],
|
||||
@@ -624,3 +567,55 @@ class _UpdateCheckerState extends State<_UpdateChecker> {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 显示浏览器下载引导弹窗(全局方法)
|
||||
void showBrowserDownloadGuide(BuildContext context) {
|
||||
Future.delayed(const Duration(milliseconds: 500), () {
|
||||
showDialog(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (ctx) => AlertDialog(
|
||||
title: const Text('🔔 重要提示'),
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text(
|
||||
'请在浏览器中完成以下操作:',
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
const Text('✅ 等待 APK 下载完成'),
|
||||
const SizedBox(height: 8),
|
||||
const Text('✅ 点击 APK 文件进行安装'),
|
||||
const SizedBox(height: 8),
|
||||
const Text('✅ 安装完成后,卸载当前旧版本'),
|
||||
const SizedBox(height: 8),
|
||||
const Text('✅ 重新打开新版本 APP'),
|
||||
const SizedBox(height: 12),
|
||||
Container(
|
||||
padding: const EdgeInsets.all(10),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.red.shade50,
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
border: Border.all(color: Colors.red.shade200),
|
||||
),
|
||||
child: const Text(
|
||||
'⚠️ 注意:必须先卸载旧版本,否则无法正常使用新功能!',
|
||||
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
ElevatedButton(
|
||||
onPressed: () {
|
||||
Navigator.of(ctx).pop();
|
||||
},
|
||||
child: const Text('我知道了'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user