Browse Source

[new]调整初始化

zk 9 months ago
parent
commit
aa1ba0224f
3 changed files with 75 additions and 12 deletions
  1. 24 0
      lib/data/bean/location_info.g.dart
  2. 33 0
      lib/data/bean/user_info.g.dart
  3. 18 12
      lib/main.dart

+ 24 - 0
lib/data/bean/location_info.g.dart

@@ -0,0 +1,24 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'location_info.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+LocationInfo _$LocationInfoFromJson(Map<String, dynamic> json) => LocationInfo(
+      userId: json['userId'] as String,
+      longitude: (json['lng'] as num?)?.toDouble(),
+      latitude: (json['lat'] as num?)?.toDouble(),
+      address: json['addr'] as String?,
+      lastUpdateTime: (json['timestamp'] as num?)?.toInt(),
+    );
+
+Map<String, dynamic> _$LocationInfoToJson(LocationInfo instance) =>
+    <String, dynamic>{
+      'userId': instance.userId,
+      'lng': instance.longitude,
+      'lat': instance.latitude,
+      'addr': instance.address,
+      'timestamp': instance.lastUpdateTime,
+    };

+ 33 - 0
lib/data/bean/user_info.g.dart

@@ -0,0 +1,33 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'user_info.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+UserInfo _$UserInfoFromJson(Map<String, dynamic> json) => UserInfo(
+      id: json['friendId'] as String,
+      phoneNumber: json['phone'] as String,
+      remark: json['remark'] as String?,
+      timestamp: (json['timestamp'] as num?)?.toInt(),
+      blockedHim: json['blockedHim'] as bool?,
+      blockedMe: json['blockedMe'] as bool?,
+      lastLocation: json['location'] == null
+          ? null
+          : LocationInfo.fromJson(json['location'] as Map<String, dynamic>),
+      virtual: json['virtual'] as bool?,
+      isMine: json['isMine'] as bool?,
+    );
+
+Map<String, dynamic> _$UserInfoToJson(UserInfo instance) => <String, dynamic>{
+      'friendId': instance.id,
+      'phone': instance.phoneNumber,
+      'remark': instance.remark,
+      'timestamp': instance.timestamp,
+      'blockedHim': instance.blockedHim,
+      'blockedMe': instance.blockedMe,
+      'location': instance.lastLocation,
+      'virtual': instance.virtual,
+      'isMine': instance.isMine,
+    };

+ 18 - 12
lib/main.dart

@@ -22,18 +22,25 @@ void main() async {
 
   configureDependencies();
 
-  //mmkv存储
-  await KVUtil.init();
+  await initRequired();
 
   //非隐私相关
   initCommon();
 
+  //系统参数&第三方sdk初始化
+  await initAfterGrant();
+
   //檢查地址
   checkEnv();
 
   runApp(const MyApp());
 }
 
+Future<void> initRequired() async {
+  //存储
+  await KVUtil.init();
+}
+
 void initCommon() {
   //全局配置smartDialog
   smartConfig();
@@ -75,16 +82,15 @@ class MyApp extends StatelessWidget {
 
   _buildMaterialApp() {
     return RefreshConfiguration(
-      headerBuilder:
-          () => const MaterialClassicHeader(color: ColorName.colorPrimary),
-      footerBuilder:
-          () => ClassicFooter(
-            canLoadingText: StringName.loadingMore,
-            idleText: StringName.loadPullUp,
-            loadingText: StringName.loadingTxt,
-            noDataText: StringName.loadNoData,
-            failedText: StringName.loadFailed,
-          ),
+      headerBuilder: () =>
+          const MaterialClassicHeader(color: ColorName.colorPrimary),
+      footerBuilder: () => ClassicFooter(
+        canLoadingText: StringName.loadingMore,
+        idleText: StringName.loadPullUp,
+        loadingText: StringName.loadingTxt,
+        noDataText: StringName.loadNoData,
+        failedText: StringName.loadFailed,
+      ),
       child: GetMaterialApp(
         onGenerateTitle: (_) => StringName.appName,
         getPages: AppPage.pages,