增加多Flavor打包;

README.md

@@ -15,28 +15,8 @@ For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
 
-### 2024.03.14 app改动点：
-1. 扦样任务单状态新增：待领取, 检测机构收到扦样任务通知时，所有扦样人员都能看到所有任务单据，在app待扦样页面进行任务领取.√
-现在的开始扦样按钮改成任务领取，点击任务领取以后扦样任务单状态改成待扦样，列表页按钮变成开始扦样，点击扦样进行正常操作。√
-2. 扦样人员变成多选，后端提供人员接口，选择扦样人员；√
-3. 温度、湿度字段去掉，新增字段：天气情况：晴天/阴天/雨天，单选；√
-4. 扦样时间默认给当前时间；√
-5. 灾害污染情况给默认值：否；√
-6. 点击经纬度获取，自动代入省市县乡镇村；√
-7. 列表页显示字段修改：扦样任务单号/状态/检验指标/样品等级/采样品种；√
-
-### 2024.04.18 app改动点：
-1. 收获环节<扦样任务单列表>的筛选页面及功能.
-2. 扦样单列表：
-   1. <扦样人员>字段未显示的问题.√
-   2. <检验指标>和<扦样地区>位置互换.√
-   3. <检验指标>和<样品等级>为空时不展示.√
-3. 扦样单详情：
-   1. 扦样单位、监测类别、样品编号都去掉.√
-   2. 高德定位结果填入乡镇和村.√
-   3. 用药情况删除改为长按弹框确认删除.√
-   4. 用药情况的施药时间字段有数据时下拉箭头不显示.√
-   5. 下拉箭头颜色都改为高亮文本颜色.√
-4. 新增内容：
-   1. 电子签名：点击扦样单提交时跳出签名弹窗，根据扦样人数签名，按钮:重写、上一位、下一位、提交。
-   2. 电子签名图片上传接口：/infra/file/upload
+## App编译打包
+打包分为两个环境, 对应不同的后端服务器.
+Android打包方式如下:
+- 测试环境：flutter build apk --flavor develop --release
+- 生产环境：flutter build apk --flavor product --release

android/app/build.gradle

@@ -34,7 +34,7 @@ android {
 
     sourceSets {
         main {
-            jniLibs.srcDirs = ['jniLibs']
+            jniLibs.srcDirs = ['libs']
         }
     }
 
@@ -46,6 +46,10 @@ android {
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+
+//        ndk {
+//            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+//        }
     }
 
     println "targetSdkVersion: ${flutter.targetSdkVersion}"
@@ -67,34 +71,51 @@ android {
         release {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
-            manifestPlaceholders = [APP_NAME: "国粮质检"]
+
             shrinkResources false // 重要，打印机有so库，fix bug: https://github.com/flutter/flutter/issues/47527
             minifyEnabled false // 重要，打印机有so库，fix bug: https://github.com/flutter/flutter/issues/47527
         }
         profile {
             signingConfig signingConfigs.release
-            manifestPlaceholders = [APP_NAME: "国粮质检-测试"]
-            applicationIdSuffix ".debug"
             shrinkResources false // 重要，打印机有so库，fix bug: https://github.com/flutter/flutter/issues/47527
             minifyEnabled false // 重要，打印机有so库，fix bug: https://github.com/flutter/flutter/issues/47527
         }
         debug {
             signingConfig signingConfigs.release
-            manifestPlaceholders = [APP_NAME: "国粮质检-测试"]
-            applicationIdSuffix ".debug"
         }
     }
     android.applicationVariants.all {
         def buildType = it.buildType.name
+        def flavor = it.productFlavors[0].name
         def outputFile
         it.outputs.each {
             outputFile = it.outputFile
             // 名称_环境_版本名称_版本号.apk
             // lszlgl_release_0.0.2_2.apk
-            it.outputFileName = "lszlgl_${buildType}_${defaultConfig.versionName}_${defaultConfig.versionCode}.apk"
+            it.outputFileName = "lszlgl_${flavor}_${defaultConfig.versionName}_${defaultConfig.versionCode}.apk"
         }
     }
 
+    // 多渠道配置
+    flavorDimensions "default"
+
+    productFlavors {
+        develop {
+            dimension "default"
+            manifestPlaceholders = [APP_NAME: "国粮质检-测试"]
+            applicationIdSuffix ".debug"
+        }
+        product {
+            dimension "default"
+            manifestPlaceholders = [APP_NAME: "国粮质检"]
+        }
+    }
+
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+
     dependencies {
         implementation fileTree(include: ['*.jar'], dir: 'libs')
         implementation 'com.amap.api:location:5.6.0'

android/app/src/main/java/com/szls/lszlgl/MainActivity.java

@@ -8,6 +8,7 @@ import io.flutter.embedding.android.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.plugins.util.GeneratedPluginRegister;
 import io.flutter.plugins.BluetoothPlugin;
+import io.flutter.plugins.FlavorPlugin;
 
 public class MainActivity extends FlutterActivity {
 
@@ -23,5 +24,6 @@ public class MainActivity extends FlutterActivity {
 
         //插件实例的注册,就是自己写个类，然后实现Flutter提供的FlutterPlugin接口
         flutterEngine.getPlugins().add(new BluetoothPlugin(this));
+        flutterEngine.getPlugins().add(new FlavorPlugin());
     }
 }

android/app/src/main/java/io/flutter/plugins/FlavorPlugin.java

@@ -0,0 +1,53 @@
+package io.flutter.plugins;
+
+
+import androidx.annotation.NonNull;
+
+import com.szls.lszlgl.BuildConfig;
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+
+public class FlavorPlugin implements FlutterPlugin, MethodChannel.MethodCallHandler {
+
+    private MethodChannel mChannel;
+
+    public FlavorPlugin() {
+    }
+
+    @Override
+    public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
+        mChannel = new MethodChannel(binding.getBinaryMessenger(), "plugin_flavor");
+        mChannel.setMethodCallHandler(this);
+    }
+
+    @Override
+    public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+        mChannel.setMethodCallHandler(null);
+        mChannel = null;
+    }
+
+    @Override
+    public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
+        switch (call.method) {
+            case "getPlatformVersion":
+                result.success("Android " + android.os.Build.VERSION.RELEASE);
+                break;
+            case "flavor":
+                getFlavor(result);
+                break;
+            default:
+                result.notImplemented();
+                break;
+        }
+    }
+
+    /**
+     * 获取Flavor
+     */
+    private void getFlavor(MethodChannel.Result result) {
+        result.success(BuildConfig.FLAVOR);
+    }
+
+}

lib/config/app_config.dart

@@ -0,0 +1,43 @@
+import 'package:lszlgl/plugin/flavor_plugin.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+
+import '../network/my_api.dart';
+
+enum AppEnvironment {
+  /// 开发环境
+  develop,
+
+  /// 生产环境
+  product,
+}
+
+class AppConfig {
+  AppConfig._();
+
+  /// 环境信息
+  static late AppEnvironment env;
+
+  /// 包信息
+  static late PackageInfo packageInfo;
+
+  static Future<void> init() async {
+    packageInfo = await PackageInfo.fromPlatform();
+
+    env = await _initEnv();
+
+    /// 初始化网络请求
+    MyApi.init(env);
+  }
+
+  /// 初始化环境
+  static Future<AppEnvironment> _initEnv() async {
+    // 获取flavor
+    var name = await FlavorPlugin.instance.getFlavor();
+    // 转为环境数据
+    return switch (name) {
+      'develop' => AppEnvironment.develop,
+      'product' => AppEnvironment.product,
+      _ => AppEnvironment.product,
+    };
+  }
+}

lib/main.dart

@@ -1,8 +1,4 @@
 import 'dart:async';
-import 'dart:io';
-import 'package:drift/drift.dart' as drift;
-import 'package:drift/native.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -12,6 +8,8 @@ import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/drfit/database.dart';
 import 'package:lszlgl/router/my_navigator.dart';
 
+import 'config/app_config.dart';
+
 late Logger logger;
 late MyDatabase database;
 
@@ -24,8 +22,9 @@ void main() async {
       DeviceOrientation.portraitUp,
       DeviceOrientation.portraitDown,
     ]);
-
-    runApp(const MyApp());
+    AppConfig.init().then((value) {
+      runApp(const MyApp());
+    });
     database = MyDatabase();
   });
 }
@@ -66,7 +65,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     var theme = Theme.of(context);
     return MaterialApp(
-      title: '粮食质量管理${kReleaseMode ? '' : '-测试'}',
+      title: AppConfig.packageInfo.appName,
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(
           seedColor: Colors.blue,

lib/network/my_api.dart

@@ -1,21 +1,30 @@
 import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
+import 'package:lszlgl/config/app_config.dart';
 
 import 'api.dart';
 
 class MyApi {
   MyApi._();
 
+  /// 生产url
   static String productUrl = 'http://121.36.17.6:49099';
+
+  /// 测试url
   static String testUrl = 'http://121.36.17.6:19090';
 
-  static Api get({Dio? dio, String? baseUrl}) {
+  static late String globalUrl;
 
-    if (kReleaseMode) {
-      baseUrl ??= productUrl;
-    } else {
-      baseUrl ??= testUrl;
-    }
-    return Api(dio: dio, baseUrl: baseUrl);
+  static void init(AppEnvironment env) {
+    globalUrl = switch (env) {
+      AppEnvironment.develop => testUrl,
+      AppEnvironment.product => productUrl,
+    };
+  }
+
+  static Api get({Dio? dio, String? baseUrl}) {
+    return Api(
+      dio: dio,
+      baseUrl: baseUrl ?? globalUrl,
+    );
   }
 }

lib/page/user_center/setting_page.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/config/app_config.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';
 
 /// 设置
 class SettingPage extends StatefulWidget {
@@ -16,7 +16,6 @@ class SettingPage extends StatefulWidget {
 class _SettingPageState extends BaseState<SettingPage> {
   bool sound = true;
   bool shake = true;
-  String version = '';
 
   void onSave() {
     MyNavigator.showToast('保存成功');
@@ -30,12 +29,6 @@ class _SettingPageState extends BaseState<SettingPage> {
   @override
   void initState() {
     super.initState();
-
-    PackageInfo.fromPlatform().then((packageInfo) {
-      setState(() {
-        version = packageInfo.version;
-      });
-    });
   }
 
   @override
@@ -79,7 +72,7 @@ class _SettingPageState extends BaseState<SettingPage> {
             rightChild: buildSwitch(shake, (value) => setState(() => shake = value)),
             bottomLine: true,
           ),
-          CardItemWidget('版本信息', rightText: 'V$version', onTap: onVersionTap),
+          CardItemWidget('版本信息', rightText: 'V${AppConfig.packageInfo.version}', onTap: onVersionTap),
         ],
       ),
     );

lib/plugin/flavor_plugin.dart

@@ -0,0 +1,21 @@
+import 'dart:async';
+
+import 'package:flutter/services.dart';
+
+class FlavorPlugin {
+  FlavorPlugin._();
+
+  static FlavorPlugin? _instance;
+
+  static FlavorPlugin get instance => _instance ??= FlavorPlugin._();
+
+  final MethodChannel _channel = const MethodChannel('plugin_flavor');
+
+  Future<String?> get platformVersion async {
+    final String? version = await _channel.invokeMethod('getPlatformVersion');
+    return version;
+  }
+
+  /// 获取Flavor
+  Future<String?> getFlavor() => _channel.invokeMethod('flavor');
+}

lib/service/upgrade_service.dart

@@ -2,7 +2,7 @@ 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:lszlgl/config/app_config.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
@@ -70,7 +70,7 @@ class UpgradeService {
         // 获取线上版本 lszlgl_release_0.0.2_2.apk
         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);
+        int localCode = int.parse(AppConfig.packageInfo.buildNumber);
         logger.d('versionUpgrade:localCode:$localCode onlineCode:$onlineCode');
         if (localCode >= onlineCode) {
           if (showLoading) MyNavigator.showToast('已是最新版本');