修复获取个人信息异常问题; 修改底部导航栏颜色; 保存二维码增加单号;

lib/base/base_state.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/config/pics.dart';
 
 export 'package:lszlgl/config/pics.dart';
@@ -27,6 +28,8 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
     PreferredSizeWidget? bottom,
     double? toolbarHeight,
     List<Widget>? actions,
+    Color? naviBarColor,
+    Brightness? naviBarBrightness,
   }) {
     return AppBar(
       title: Text(title),
@@ -34,7 +37,10 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
       automaticallyImplyLeading: autoLeading,
       toolbarHeight: toolbarHeight,
       actions: actions,
-      systemOverlayStyle: SystemUiOverlayStyle.light.copyWith(systemNavigationBarColor: Colors.transparent),
+      systemOverlayStyle: SystemUiOverlayStyle.light.copyWith(
+        systemNavigationBarColor: naviBarColor ?? MyColor.c_background,
+        systemNavigationBarIconBrightness: naviBarBrightness ?? Brightness.dark,
+      ),
     );
   }
 

lib/config/colors.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 class MyColor {
   MyColor._();
 
+  static const Color c_background = Color(0xFFF5F5F5);
   static const Color c_333333 = Color(0xFF333333);
   static const Color c_666666 = Color(0xFF666666);
 

lib/main.dart

@@ -1,11 +1,10 @@
 import 'dart:async';
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:logger/logger.dart';
+import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/router/my_navigator.dart';
 
 late Logger logger;
@@ -14,9 +13,6 @@ void main() async {
   logger = Logger(printer: PrettyPrinter(methodCount: 0));
   initReportException(() async {
     SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle.light.copyWith(statusBarColor: Colors.transparent));
-    if (Platform.isAndroid) {
-      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-    }
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.portraitUp,
       DeviceOrientation.portraitDown,
@@ -65,7 +61,7 @@ class MyApp extends StatelessWidget {
         colorScheme: ColorScheme.fromSeed(
           seedColor: Colors.blue,
         ),
-        scaffoldBackgroundColor: const Color(0xFFF5F5F5),
+        scaffoldBackgroundColor: MyColor.c_background,
         // navigationBarTheme: const NavigationBarThemeData(height: 56),
         appBarTheme: const AppBarTheme(
           centerTitle: true,

lib/model/rsp/user_rsp.dart

@@ -85,7 +85,7 @@ class UserRsp {
 
 @JsonSerializable()
 class DepartmentRsp {
-  final num? id;
+  final String? id;
   final String? name;
   final num? parentId;
 

lib/model/rsp/user_rsp.g.dart

@@ -46,7 +46,7 @@ Map<String, dynamic> _$UserRspToJson(UserRsp instance) => <String, dynamic>{
 
 DepartmentRsp _$DepartmentRspFromJson(Map<String, dynamic> json) =>
     DepartmentRsp(
-      id: json['id'] as num?,
+      id: json['id'] as String?,
       name: json['name'] as String?,
       parentId: json['parentId'] as num?,
     );

lib/page/home/home_page.dart

@@ -42,7 +42,11 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
   Widget buildBody() {
     return Column(
       children: [
-        myAppBar(title: '质量安全检验监测', autoLeading: false),
+        myAppBar(
+          title: '质量安全检验监测',
+          autoLeading: false,
+          naviBarColor: Colors.white,
+        ),
         Expanded(
           child: SingleChildScrollView(
             physics: const BouncingScrollPhysics(),

lib/page/login/login_page.dart

@@ -40,8 +40,10 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       await UserService.get().saveLogin(login.data);
       getSystemData();
     } on DioException catch (_) {
-      MyNavigator.dismissLoading();
+    } catch (_) {
+      MyNavigator.showToast('获取数据失败');
     }
+    MyNavigator.dismissLoading();
   }
 
   /// 获取基础数据
@@ -59,9 +61,10 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       MyNavigator.dismissLoading();
       startHome();
     } on DioException catch (_) {
-      // 获取数据失败
-      MyNavigator.dismissLoading();
+    } catch (_) {
+      MyNavigator.showToast('获取数据失败');
     }
+    MyNavigator.dismissLoading();
   }
 
   /// 进入主页
@@ -78,6 +81,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
   @override
   void onFirstShow(Duration timeStamp) async {
     MyNavigator.showLoading();
+
     /// 初始化基础库 start
     BaseDio.get().init();
     await SPUtils.getInstance().init();
@@ -85,6 +89,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     LocationUtils.updatePrivacyShow(true, true);
     LocationUtils.updatePrivacyAgree(true);
     LocationUtils.setApiKey('2c783509376e267b24d63b21681686fa', '');
+
     /// 初始化基础库 end
     MyNavigator.dismissLoading();
     // 已登录

lib/page/main_tab_page.dart

@@ -94,6 +94,7 @@ class _MainTabPageState extends State<MainTabPage> {
       selectedIndex: selectedIndex,
       surfaceTintColor: Colors.white,
       onDestinationSelected: (index) => refreshTab(index, refreshPage: true),
+      backgroundColor: Colors.white,
       destinations: List.generate(
         tabTextList.length,
         (index) => GestureDetector(

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:image_gallery_saver/image_gallery_saver.dart';
@@ -144,6 +143,8 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     ];
   }
 
+  GlobalKey ewmKey = GlobalKey();
+
   /// 查看二维码
   void startQRCode() {
     UrlItem picInfo = pageStatus.value.data!.ewmfilePictureList!.first;
@@ -158,25 +159,35 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            CachedNetworkImage(
-              width: double.infinity,
-              fit: BoxFit.cover,
-              imageUrl: picInfo.url!,
-              placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
-              errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 16),
-              child: Text(
-                picInfo.name ?? '',
-                style: const TextStyle(fontSize: 16, color: MyColor.c_333333),
+            RepaintBoundary(
+              key: ewmKey,
+              child: Container(
+                color: Colors.white,
+                child: Column(
+                  children: [
+                    CachedNetworkImage(
+                      width: double.infinity,
+                      fit: BoxFit.cover,
+                      imageUrl: picInfo.url!,
+                      placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
+                      errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                      child: Text(
+                        picInfo.name ?? '',
+                        style: const TextStyle(fontSize: 18, color: MyColor.c_333333),
+                      ),
+                    ),
+                  ],
+                ),
               ),
             ),
             Row(
               children: [
                 const Expanded(child: MyButton('打印')),
                 const SizedBox(width: 16),
-                Expanded(child: MyButton('保存图片', onTap: savePic)),
+                Expanded(child: MyButton('保存图片', onTap: () => savePic(picInfo.name))),
               ],
             ),
           ],
@@ -185,12 +196,15 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     );
   }
 
-  void savePic() async {
+  void savePic(String? name) async {
     MyNavigator.showLoading(msg: '保存中...');
-    var response = await Dio().get(
-        'https://gd-hbimg.huaban.com/c7a22fb15d70a0a976e20fb810c048ec11c76fc31ac08-hajElf_fw658webp',
-        options: Options(responseType: ResponseType.bytes));
-    final result = await ImageGallerySaver.saveImage(Uint8List.fromList(response.data), quality: 60, name: "hello");
+    Uint8List? bytes = await FileUtils.getBitmapFromContext(ewmKey.currentContext);
+    if (bytes == null) {
+      MyNavigator.dismiss();
+      MyNavigator.showToast('保存失败');
+      return;
+    }
+    final result = await ImageGallerySaver.saveImage(bytes, quality: 60, name: name);
     MyNavigator.dismiss();
     if (result['isSuccess']) {
       MyNavigator.showToast('保存成功');
@@ -338,13 +352,14 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
 
   Widget buildButton() {
     Widget child;
-    EdgeInsets margin = EdgeInsets.only(left: 16, right: 16, top: 12, bottom: getBottomPadding(12));
+    EdgeInsets margin = EdgeInsets.only(left: 8, right: 8, top: 12, bottom: getBottomPadding(12));
+    Widget ewmWidget = (pageStatus.value.data?.ewmfilePictureList ?? []).isEmpty
+        ? const SizedBox.shrink()
+        : Expanded(child: MyButton('查看二维码', onTap: startQRCode, margin: margin));
     if (args.detail) {
       child = Row(
         children: [
-          (pageStatus.value.data?.ewmfilePictureList ?? []).isEmpty
-              ? const SizedBox.shrink()
-              : Expanded(child: MyButton('查看二维码', onTap: startQRCode, margin: margin)),
+          ewmWidget,
           Expanded(child: MyButton('重新录入', onTap: startEdit, margin: margin)),
         ],
       );
@@ -357,7 +372,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
           return Row(
             children: [
               Expanded(child: MyButton('上一步', onTap: previous, margin: margin)),
-              const SizedBox(width: 32),
+              ewmWidget,
               Expanded(child: MyButton('提交', onTap: submit, margin: margin)),
             ],
           );
@@ -365,7 +380,6 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
         return Row(
           children: [
             Expanded(child: MyButton('上一步', onTap: previous, margin: margin)),
-            const SizedBox(width: 32),
             Expanded(child: MyButton('下一步', onTap: next, margin: margin)),
           ],
         );
@@ -373,6 +387,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     }
     return Container(
       color: const Color(0xFFF1F7F6),
+      padding: const EdgeInsets.symmetric(horizontal: 8),
       child: child,
     );
   }

lib/page/sample_task/sample_task_list_tab_page.dart

@@ -105,6 +105,7 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
         myAppBar(
           title: widget.args.type.title,
           actions: [buildFilter()],
+          naviBarColor: Colors.white,
         ),
         buildTab(),
         const SizedBox(height: 12),

lib/page/user_center/user_center_page.dart

@@ -49,7 +49,11 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
   Widget buildBody() {
     return Column(
       children: [
-        myAppBar(title: '用户中心', autoLeading: false),
+        myAppBar(
+          title: '用户中心',
+          autoLeading: false,
+          naviBarColor: Colors.white,
+        ),
         Expanded(
           child: EasyRefresh(
             onRefresh: onRefresh,

lib/utils/file_utils.dart

@@ -1,6 +1,9 @@
 import 'dart:io';
 import 'dart:typed_data';
+import 'dart:ui' as ui;
 
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/rendering.dart';
 import 'package:path_provider/path_provider.dart';
 
 class FileUtils {
@@ -11,4 +14,16 @@ class FileUtils {
     await file.writeAsBytes(data);
     return file;
   }
+
+  /// 从Context中获取图片
+  static Future<Uint8List?> getBitmapFromContext(
+    BuildContext? context, {
+    double pixelRatio = 3.0,
+  }) async {
+    if (context == null) return null;
+    RenderRepaintBoundary render = context.findRenderObject() as RenderRepaintBoundary;
+    ui.Image image = await render.toImage(pixelRatio: pixelRatio);
+    ByteData? bytes = await image.toByteData(format: ui.ImageByteFormat.png);
+    return bytes?.buffer.asUint8List();
+  }
 }