Преглед изворни кода

根据打包方式修改app名称. 将基础库的初始化延后在登录页.

maqiang пре 1 година
родитељ
комит
dd155f32c3
4 измењених фајлова са 20 додато и 14 уклоњено
  1. 3 0
      android/app/build.gradle
  2. 1 1
      android/app/src/main/AndroidManifest.xml
  3. 1 13
      lib/main.dart
  4. 15 0
      lib/page/login/login_page.dart

+ 3 - 0
android/app/build.gradle

@@ -59,12 +59,15 @@ android {
59 59
         release {
60 60
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
61 61
             signingConfig signingConfigs.release
62
+            manifestPlaceholders = [APP_NAME: "国粮质检"]
62 63
         }
63 64
         profile {
64 65
             signingConfig signingConfigs.release
66
+            manifestPlaceholders = [APP_NAME: "国粮质检-测试"]
65 67
         }
66 68
         debug {
67 69
             signingConfig signingConfigs.release
70
+            manifestPlaceholders = [APP_NAME: "国粮质检-测试"]
68 71
         }
69 72
     }
70 73
     android.applicationVariants.all {

+ 1 - 1
android/app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
41 41
     <application
42 42
         android:name="${applicationName}"
43 43
         android:icon="@drawable/ic_launcher"
44
-        android:label="国粮质检"
44
+        android:label="${APP_NAME}"
45 45
         android:requestLegacyExternalStorage="true">
46 46
         <activity
47 47
             android:name=".MainActivity"

+ 1 - 13
lib/main.dart

@@ -1,18 +1,12 @@
1 1
 import 'dart:async';
2 2
 import 'dart:io';
3 3
 
4
-import 'package:flutter/foundation.dart';
5 4
 import 'package:flutter/material.dart';
6 5
 import 'package:flutter/services.dart';
7 6
 import 'package:flutter_localizations/flutter_localizations.dart';
8 7
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
9 8
 import 'package:logger/logger.dart';
10
-import 'package:lszlgl/network/base_dio.dart';
11 9
 import 'package:lszlgl/router/my_navigator.dart';
12
-import 'package:lszlgl/utils/location_utils.dart';
13
-import 'package:lszlgl/utils/sp_utils.dart';
14
-
15
-import 'config/reresh_config.dart';
16 10
 
17 11
 late Logger logger;
18 12
 
@@ -27,12 +21,6 @@ void main() async {
27 21
       DeviceOrientation.portraitUp,
28 22
       DeviceOrientation.portraitDown,
29 23
     ]);
30
-    BaseDio.get().init();
31
-    await SPUtils.getInstance().init();
32
-    RefreshConfig.get().initDefault();
33
-    LocationUtils.updatePrivacyShow(true, true);
34
-    LocationUtils.updatePrivacyAgree(true);
35
-    LocationUtils.setApiKey('2c783509376e267b24d63b21681686fa', '');
36 24
     runApp(const MyApp());
37 25
   });
38 26
 }
@@ -72,7 +60,7 @@ class MyApp extends StatelessWidget {
72 60
   @override
73 61
   Widget build(BuildContext context) {
74 62
     return MaterialApp(
75
-      title: '粮食质量管理${kReleaseMode ? '' : '-测试'}',
63
+      title: '粮食质量管理',
76 64
       theme: ThemeData(
77 65
         colorScheme: ColorScheme.fromSeed(
78 66
           seedColor: Colors.blue,

+ 15 - 0
lib/page/login/login_page.dart

@@ -9,6 +9,11 @@ import 'package:lszlgl/service/upgrade_service.dart';
9 9
 import 'package:lszlgl/service/user_service.dart';
10 10
 import 'package:lszlgl/widget/button.dart';
11 11
 
12
+import '../../config/reresh_config.dart';
13
+import '../../network/base_dio.dart';
14
+import '../../utils/location_utils.dart';
15
+import '../../utils/sp_utils.dart';
16
+
12 17
 /// 登录页面
13 18
 class LoginPage extends StatefulWidget {
14 19
   const LoginPage({Key? key}) : super(key: key);
@@ -72,6 +77,16 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
72 77
 
73 78
   @override
74 79
   void onFirstShow(Duration timeStamp) async {
80
+    MyNavigator.showLoading();
81
+    /// 初始化基础库 start
82
+    BaseDio.get().init();
83
+    await SPUtils.getInstance().init();
84
+    RefreshConfig.get().initDefault();
85
+    LocationUtils.updatePrivacyShow(true, true);
86
+    LocationUtils.updatePrivacyAgree(true);
87
+    LocationUtils.setApiKey('2c783509376e267b24d63b21681686fa', '');
88
+    /// 初始化基础库 end
89
+    MyNavigator.dismissLoading();
75 90
     // 已登录
76 91
     if (UserService.get().getLogin() != null) {
77 92
       getSystemData();