增加版本更新功能

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application
         android:label="粮食质量管理"
         android:name="${applicationName}"

lib/base/base_lifecycle_state.dart

@@ -56,7 +56,6 @@ abstract class BaseLifecycleState<T extends StatefulWidget> extends BaseState<T>
   /// app在后台
   bool appPause = false;
 
-
   /// ************** 生命周期 **************
   /// 初始化
   void onInit() {}
@@ -87,7 +86,9 @@ abstract class BaseLifecycleState<T extends StatefulWidget> extends BaseState<T>
     // 绘制完成监听
     ServicesBinding.instance.addPostFrameCallback((timeStamp) {
       // 路由监听
-      MyNavigator.routeObs.subscribe(this, ModalRoute.of(context)!);
+      if (ModalRoute.of(context) != null) {
+        MyNavigator.routeObs.subscribe(this, ModalRoute.of(context)!);
+      }
       debugPrint('onFistShow: $runtimeType');
       onFirstShow(timeStamp);
       isShow = true;
@@ -141,7 +142,6 @@ abstract class BaseLifecycleState<T extends StatefulWidget> extends BaseState<T>
     super.didPushNext();
   }
 
-
   /// 已回到当前页（注意：不建议直接使用此函数），可使用 [onShow] 方法
   @override
   void didPopNext() {
@@ -150,14 +150,13 @@ abstract class BaseLifecycleState<T extends StatefulWidget> extends BaseState<T>
     onShow();
   }
 
-
   /// App 生命周期监听（注意：不建议直接使用此函数）
   ///
   /// 请使用 onAppBackstage/onAppBackToFront 等生命周期 API
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     switch (state) {
-      case AppLifecycleState.resumed:   // App 可见
+      case AppLifecycleState.resumed: // App 可见
         if (appPause) {
           debugPrint('onAppBackToFront: $runtimeType');
           appPause = false;
@@ -168,7 +167,7 @@ abstract class BaseLifecycleState<T extends StatefulWidget> extends BaseState<T>
         break;
       case AppLifecycleState.hidden: // App 不可见
         break;
-      case AppLifecycleState.paused:   // App 在后台暂停运行
+      case AppLifecycleState.paused: // App 在后台暂停运行
         debugPrint('onBackstage: $runtimeType');
         appPause = true;
         onAppBackstage();

lib/network/api.dart

@@ -32,4 +32,8 @@ abstract class Api {
   /// 扦样任务单列表
   @GET('/admin-api/zj/code-sampling-task-details-sgjc/sampling_task_detail_page')
   Future<ApiRsp<SampleTaskListRsp>> sampleTaskList(@Queries() Map<String, dynamic> map);
+
+  /// 获取app下载地址
+  @GET('/admin-api/zj/base-file/getAppDownLoadUrl')
+  Future<ApiRsp<String?>> getAppDownloadUrl();
 }

lib/network/base_dio.dart

@@ -1,6 +1,6 @@
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:dio/dio.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/main.dart';
 import 'package:lszlgl/service/user_service.dart';
 
@@ -131,12 +131,13 @@ class MyInterceptor extends Interceptor {
     // 响应
     Map<String, Object?> map = {};
     map['url'] = err.requestOptions.uri;
+    map['errorType'] = err.type;
     map['statusCode'] = err.response?.statusCode;
     map['data'] = err.response?.data;
     map['msg'] = appException.message;
     if (err.response?.extra.isNotEmpty ?? false) map['extra'] = err.response?.extra;
     logger.e('ApiError: $map');
-    SmartDialog.showToast(appException.message ?? '');
+    MyNavigator.showToast(appException.message ?? '');
     handler.next(err);
   }
 }
@@ -167,7 +168,7 @@ class AppException implements Exception {
       case DioExceptionType.badCertificate:
         return AppException(-1, '证书错误');
       case DioExceptionType.badResponse:
-        var code = error.response?.data['code'];
+        var code = error.response?.data['code'] ?? -1;
         if (code == 401) UserService.get().logout();
         return AppException(code, error.response?.data['msg'] ?? '');
       case DioExceptionType.cancel:

lib/page/login/login_page.dart

@@ -1,16 +1,14 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/model/req/login_req.dart';
 import 'package:lszlgl/network/api.dart';
 import 'package:lszlgl/service/dict_service.dart';
+import 'package:lszlgl/service/upgrade_service.dart';
 import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/button.dart';
 
-import '../../base/base_state.dart';
-
 /// 登录页面
 class LoginPage extends StatefulWidget {
   const LoginPage({Key? key}) : super(key: key);
@@ -27,23 +25,23 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     var account = accountCtrl.text;
     var pwd = pwdCtrl.text;
     if (account.isEmpty || pwd.isEmpty) {
-      SmartDialog.showToast('请输入账号和密码');
+      MyNavigator.showToast('请输入账号和密码');
       return;
     }
-    SmartDialog.showLoading(clickMaskDismiss: false, backDismiss: false);
+    MyNavigator.showLoading(clickDismiss: false);
     try {
       // 登录
       var login = await Api().login(LoginReq(username: account, password: pwd));
       await UserService.get().saveLogin(login.data);
       getSystemData();
     } on DioException catch (_) {
-      SmartDialog.dismiss(status: SmartStatus.loading);
+      MyNavigator.dismissLoading();
     }
   }
 
   /// 获取基础数据
   void getSystemData() async {
-    SmartDialog.showLoading(clickMaskDismiss: false, backDismiss: false);
+    MyNavigator.showLoading(clickDismiss: false);
     try {
       // 获取用户数据
       var user = await Api().userProfile();
@@ -51,12 +49,13 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       // 获取字典
       var dictData = await Api().getAllDict();
       DictService.saveDictList(dictData.data);
+      UpgradeService.checkUpgrade(false);
       // 进入主页
-      SmartDialog.dismiss(status: SmartStatus.loading);
+      MyNavigator.dismissLoading();
       startHome();
     } on DioException catch (_) {
       // 获取数据失败
-      SmartDialog.dismiss(status: SmartStatus.loading);
+      MyNavigator.dismissLoading();
     }
   }
 

lib/page/main_tab_page.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/page/home/home_page.dart';
 import 'package:lszlgl/page/user_center/user_center_page.dart';
@@ -66,7 +65,7 @@ class _MainTabPageState extends State<MainTabPage> {
           child: child,
           onPopInvoked: (didPop) {
             if (didPop) return;
-            SmartDialog.showToast('再试一次退出');
+            MyNavigator.showToast('再试一次退出');
             popState.value = true;
             // 2秒后不可退出
             Timer(

lib/page/sample_task/reap_sample_task/reap_sample_task_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
@@ -68,7 +67,7 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
 
   void submit() {
     MyNavigator.pop();
-    SmartDialog.showToast('提交成功');
+    MyNavigator.showToast('提交成功');
   }
 
   @override

lib/page/user_center/change_pwd_page.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
@@ -31,7 +30,7 @@ class _ChangePwdPageState extends BaseState<ChangePwdPage> {
   }
 
   void onChange() {
-    SmartDialog.showToast('修改成功');
+    MyNavigator.showToast('修改成功');
     MyNavigator.pop();
   }
 

lib/page/user_center/setting_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/service/upgrade_service.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -19,10 +19,14 @@ class _SettingPageState extends BaseState<SettingPage> {
   String version = '';
 
   void onSave() {
-    SmartDialog.showToast('保存成功');
+    MyNavigator.showToast('保存成功');
     MyNavigator.pop();
   }
 
+  void onVersionTap() async {
+    UpgradeService.checkUpgrade(true);
+  }
+
   @override
   void initState() {
     super.initState();
@@ -75,7 +79,7 @@ class _SettingPageState extends BaseState<SettingPage> {
             rightChild: buildSwitch(shake, (value) => setState(() => shake = value)),
             bottomLine: true,
           ),
-          CardItemWidget('版本信息', rightText: 'V$version'),
+          CardItemWidget('版本信息', rightText: 'V$version', onTap: onVersionTap),
         ],
       ),
     );

lib/router/my_navigator.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/page/unknow_page.dart';
-import 'package:flutter_smart_dialog/src/data/animation_param.dart' as dialog;
 
 /// 路由监听
 class NavigatorPageObserver extends NavigatorObserver {
@@ -295,25 +294,18 @@ class MyNavigator {
   }
 
   /// 显示Dialog
-  static Future<T?> pushDialog<T>({
+  static Future<T?> showDialog<T>({
     required WidgetBuilder builder,
     SmartDialogController? controller,
     Alignment? alignment,
-    bool? clickMaskDismiss,
+    bool? clickDismiss,
     bool? usePenetrate,
-    bool? useAnimation,
-    SmartAnimationType? animationType,
-    List<SmartNonAnimationType>? nonAnimationTypes,
-    dialog.AnimationBuilder? animationBuilder,
-    Duration? animationTime,
     Color? maskColor,
     Widget? maskWidget,
-    bool? debounce,
     VoidCallback? onDismiss,
     VoidCallback? onMask,
     Duration? displayTime,
     String? tag,
-    bool? backDismiss,
     bool? keepSingle,
     bool? permanent,
     bool? useSystem,
@@ -325,21 +317,20 @@ class MyNavigator {
       builder: builder,
       controller: controller,
       alignment: alignment,
-      clickMaskDismiss: clickMaskDismiss,
+      clickMaskDismiss: clickDismiss,
       usePenetrate: usePenetrate,
-      useAnimation: useAnimation,
-      animationType: animationType,
-      nonAnimationTypes: nonAnimationTypes,
-      animationBuilder: animationBuilder,
-      animationTime: animationTime,
+      useAnimation: null,
+      animationType: null,
+      nonAnimationTypes: null,
+      animationBuilder: null,
+      animationTime: null,
       maskColor: maskColor,
       maskWidget: maskWidget,
-      debounce: debounce,
       onDismiss: onDismiss,
       onMask: onMask,
       displayTime: displayTime,
       tag: tag,
-      backDismiss: backDismiss,
+      backDismiss: clickDismiss,
       keepSingle: keepSingle,
       permanent: permanent,
       useSystem: useSystem,
@@ -348,6 +339,97 @@ class MyNavigator {
       ignoreArea: ignoreArea,
     );
   }
+
+  static Future<void> showToast(
+    String msg, {
+    SmartDialogController? controller,
+    Duration? displayTime,
+    Alignment? alignment,
+    bool? clickMaskDismiss,
+    Color? maskColor,
+    Widget? maskWidget,
+    VoidCallback? onDismiss,
+    SmartToastType? displayType,
+  }) =>
+      SmartDialog.showToast(
+        msg,
+        controller: controller,
+        displayTime: displayTime,
+        alignment: alignment,
+        clickMaskDismiss: clickMaskDismiss,
+        animationType: null,
+        nonAnimationTypes: null,
+        animationBuilder: null,
+        usePenetrate: null,
+        useAnimation: null,
+        animationTime: null,
+        maskColor: maskColor,
+        maskWidget: maskWidget,
+        onDismiss: onDismiss,
+        onMask: null,
+        consumeEvent: null,
+        debounce: null,
+        displayType: displayType,
+        builder: null,
+      );
+
+  static Future<T?> showLoading<T>({
+    String msg = '加载中',
+    bool? clickDismiss,
+    SmartDialogController? controller,
+    Alignment? alignment,
+    bool? usePenetrate,
+    Color? maskColor,
+    Widget? maskWidget,
+    VoidCallback? onDismiss,
+    VoidCallback? onMask,
+    Duration? displayTime,
+  }) {
+    return SmartDialog.showLoading(
+      msg: msg,
+      controller: controller,
+      alignment: alignment,
+      clickMaskDismiss: clickDismiss,
+      animationType: null,
+      nonAnimationTypes: null,
+      animationBuilder: null,
+      usePenetrate: usePenetrate,
+      useAnimation: null,
+      animationTime: null,
+      maskColor: maskColor,
+      maskWidget: maskWidget,
+      onDismiss: onDismiss,
+      onMask: onMask,
+      displayTime: displayTime,
+      backDismiss: clickDismiss,
+      builder: null,
+    );
+  }
+
+  static Future<void> dismiss<T>({
+    SmartStatus status = SmartStatus.smart,
+    String? tag,
+    T? result,
+    bool force = false,
+  }) =>
+      SmartDialog.dismiss(
+        status: status,
+        tag: tag,
+        result: result,
+        force: force,
+      );
+
+  static Future<void> dismissLoading<T>({
+    String? tag,
+    T? result,
+    bool force = false,
+  }) =>
+      SmartDialog.dismiss(
+        status: SmartStatus.loading,
+        tag: tag,
+        result: result,
+        force: force,
+      );
 }
 
 /// 页面设置信息

lib/service/upgrade_service.dart

@@ -0,0 +1,87 @@
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:install_plugin/install_plugin.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+import '../main.dart';
+import '../network/api.dart';
+import '../router/my_navigator.dart';
+import '../widget/upgrade_dialog.dart';
+
+class UpgradeService {
+  UpgradeService._();
+
+  static Future<Response> download(String apkUrl, String apkName, ProgressCallback progress) async {
+    String savePath = '${await getApkDirectoryPath()}/$apkName';
+    var rsp = await Dio().download(
+      apkUrl,
+      savePath,
+      onReceiveProgress: (count, total) {
+        if (total < 0) return;
+        progress.call(count, total);
+      },
+    );
+    return rsp;
+  }
+
+  /// 获取apk文件夹路径
+  static Future<String> getApkDirectoryPath() async {
+    return '${(await getApplicationSupportDirectory()).path}/apk';
+  }
+
+  /// 获取apk文件
+  static Future<File> getApkFile(String apkName) async {
+    return File('${await getApkDirectoryPath()}/$apkName');
+  }
+
+  /// 安装APK
+  static Future<bool> installApk(String path) async {
+    var status = await Permission.requestInstallPackages.status;
+    if (!status.isGranted) {
+      Permission.requestInstallPackages.request();
+      return false;
+    }
+    await InstallPlugin.install(path);
+    return true;
+  }
+
+  /// 从路径中获取文件名
+  static String getName(String path) {
+    var pathSplit = path.split('/');
+    return pathSplit[pathSplit.length - 1];
+  }
+
+  static bool checking = false;
+
+  /// 检查版本更新
+  static Future<void> checkUpgrade(bool showLoading) async {
+    if (!Platform.isAndroid) return;
+    if (checking) return;
+    checking = true;
+    if (showLoading) MyNavigator.showLoading();
+    try {
+      // 获取apk下载地址
+      var path = (await Api().getAppDownloadUrl()).data;
+      if (showLoading) MyNavigator.dismissLoading();
+      if (path != null) {
+        // 获取线上版本
+        List<String> nameSplit = UpgradeService.getName(path).split('_');
+        int onlineCode = int.parse(nameSplit[nameSplit.length - 1].split('.').first);
+        int localCode = int.parse((await PackageInfo.fromPlatform()).buildNumber);
+        logger.d('localCode:$localCode onlineCode:$onlineCode');
+        if (localCode >= onlineCode) {
+          if (showLoading) MyNavigator.showToast('已是最新版本');
+        } else {
+          // 版本更新
+          UpgradeDialog.showDialog(path);
+        }
+      }
+    } catch (e) {
+      if (showLoading) MyNavigator.dismissLoading();
+    }
+    checking = false;
+  }
+}

lib/widget/upgrade_dialog.dart

@@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/service/upgrade_service.dart';
+import 'package:lszlgl/widget/button.dart';
+
+class UpgradeDialog extends StatefulWidget {
+  final String path;
+
+  const UpgradeDialog(this.path, {super.key});
+
+  static void showDialog(String path) {
+    MyNavigator.showDialog(
+      builder: (_) => UpgradeDialog(path),
+      tag: 'upgrade',
+      clickDismiss: false,
+    );
+  }
+
+  @override
+  State<UpgradeDialog> createState() => _UpgradeDialogState();
+}
+
+class _UpgradeDialogState extends BaseLifecycleState<UpgradeDialog> {
+  double progress = -1;
+
+  void dismiss() {
+    MyNavigator.dismiss(tag: 'upgrade');
+  }
+
+  void onDownload() async {
+    String urlPath = widget.path;
+
+    UpgradeService.getName(urlPath);
+    // 拆分文件名
+    var pathSplit = urlPath.split('/');
+    String apkName = pathSplit[pathSplit.length - 1];
+    logger.d('apkName:$apkName');
+
+    var file = await UpgradeService.getApkFile(apkName);
+    // 已有文件 直接安装
+    if (await file.exists()) {
+      installApk(file.path);
+      return;
+    }
+    // 无文件 去下载
+    try {
+      await UpgradeService.download(
+        urlPath,
+        apkName,
+        (count, total) {
+          setState(() {
+            progress = count / total;
+          });
+        },
+      );
+      installApk(file.path);
+    } catch (_) {
+      MyNavigator.showToast('下载失败,请重试');
+      setState(() {
+        progress = -1;
+      });
+    }
+  }
+
+  /// 安装apk
+  void installApk(String path) async {
+    bool success = await UpgradeService.installApk(path);
+    if (success) {
+      dismiss();
+    } else {
+      setState(() {
+        progress = -1;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 24),
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+      decoration: const BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.all(Radius.circular(8)),
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Row(
+            children: [
+              const Text(
+                '发现新版本',
+                style: TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
+              ),
+              const Spacer(),
+              progress == -1
+                  ? GestureDetector(
+                      onTap: dismiss,
+                      child: const Text(
+                        '取消',
+                        style: TextStyle(color: Color(0xFF333333), fontSize: 14),
+                      ),
+                    )
+                  : const SizedBox.shrink(),
+            ],
+          ),
+          const SizedBox(height: 24),
+          progress == -1 ? MyButton('立即下载安装', onTap: onDownload, alignment: null) : buildProgress(),
+        ],
+      ),
+    );
+  }
+
+  Widget buildProgress() {
+    int pre = (double.parse(progress.toStringAsFixed(2)) * 100).toInt();
+    return Row(
+      children: [
+        Expanded(flex: 6, child: LinearProgressIndicator(value: progress, borderRadius: BorderRadius.circular(8), minHeight: 8)),
+        Expanded(
+          child: Text(
+            '$pre%',
+            textAlign: TextAlign.right,
+            style: const TextStyle(color: Color(0xFF333333), fontSize: 14),
+          ),
+        )
+      ],
+    );
+  }
+}

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.2+2
+version: 0.0.3+3
 
 environment:
   sdk: '>=3.1.5 <4.0.0'
@@ -70,6 +70,14 @@ dependencies:
   easy_refresh: ^3.3.4
   # 依赖注入
   get_it: ^7.1.3
+  # 文件路径
+  path_provider: ^2.1.2
+  # intent
+  android_intent_plus: ^4.0.3
+  # 安装apk
+  install_plugin: ^2.1.0
+  # 权限管理
+  permission_handler: ^11.3.0
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -7,8 +7,11 @@
 #include "generated_plugin_registrant.h"
 
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <permission_handler_windows/permission_handler_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   ConnectivityPlusWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
 }

windows/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   connectivity_plus
+  permission_handler_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST