no message

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.10'
+    ext.kotlin_version = '2.0.20'
     repositories {
         google()
         mavenCentral()
@@ -19,6 +19,18 @@ allprojects {
 }
 
 rootProject.buildDir = '../build'
+/// 升级flutter3.24.3后需要加这段代码，否则打包报错
+subprojects {
+    afterEvaluate { project ->
+        if (project.plugins.hasPlugin("com.android.application") ||
+                project.plugins.hasPlugin("com.android.library")) {
+            project.android {
+                compileSdkVersion 34
+                buildToolsVersion "34.0.0"
+            }
+        }
+    }
+}
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }

android/settings.gradle

@@ -9,3 +9,29 @@ localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 def flutterSdkPath = properties.getProperty("flutter.sdk")
 assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
 apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+
+//pluginManagement {
+//    def flutterSdkPath = {
+//        def properties = new Properties()
+//        file("local.properties").withInputStream { properties.load(it) }
+//        def flutterSdkPath = properties.getProperty("flutter.sdk")
+//        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+//        return flutterSdkPath
+//    }()
+//
+//    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+//
+//    repositories {
+//        google()
+//        mavenCentral()
+//        gradlePluginPortal()
+//    }
+//}
+//
+//plugins {
+//    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+//    id "com.android.application" version "8.3.1" apply false
+//    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
+//}
+//
+//include ":app"

ios/Podfile.lock

@@ -37,7 +37,7 @@ PODS:
   - image_cropper (0.0.4):
     - Flutter
     - TOCropViewController (~> 2.6.1)
-  - image_gallery_saver (2.0.2):
+  - image_gallery_saver_plus (0.0.1):
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
@@ -129,7 +129,7 @@ DEPENDENCIES:
   - fluwx (from `.symlinks/plugins/fluwx/ios`)
   - home_widget (from `.symlinks/plugins/home_widget/ios`)
   - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
-  - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
+  - image_gallery_saver_plus (from `.symlinks/plugins/image_gallery_saver_plus/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`)
   - just_audio (from `.symlinks/plugins/just_audio/ios`)
@@ -191,8 +191,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/home_widget/ios"
   image_cropper:
     :path: ".symlinks/plugins/image_cropper/ios"
-  image_gallery_saver:
-    :path: ".symlinks/plugins/image_gallery_saver/ios"
+  image_gallery_saver_plus:
+    :path: ".symlinks/plugins/image_gallery_saver_plus/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   in_app_purchase_storekit:
@@ -242,13 +242,13 @@ SPEC CHECKSUMS:
   GDTMobSDK: cb7162e527f2db41f97786f3fb6498544d5d10e7
   home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
   image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25
-  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
+  image_gallery_saver_plus: 782ade975fe6a4600b53e7c1983e3a2979d1e9e5
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
   in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a

lib/base/base_getx_controller.dart

@@ -1,30 +0,0 @@
-import 'dart:async';
-
-import 'package:get/get.dart';
-
-import '../utils/app_event.dart';
-
-class BaseGetxController extends GetxController{
-
-  //StreamSubscription? _appThemeChangeEvent;
-
-  @override
-  void onInit() {
-    // TODO: implement onInit
-    super.onInit();
-
-    print("22222222222");
-
-    // _appThemeChangeEvent =
-    //     AppEvent.getInstance()?.on<AppThemeChangeEvent>().listen((event) {
-    //       Get.forceAppUpdate();
-    //     });
-  }
-
-  @override
-  void dispose() {
-    // TODO: implement dispose
-    super.dispose();
-    //_appThemeChangeEvent?.cancel();
-  }
-}

lib/base/base_state.dart

@@ -1,34 +0,0 @@
-
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-
-import '../utils/app_event.dart';
-
-abstract class BaseState<T extends StatefulWidget> extends State<T> {
-
-  //StreamSubscription? _appThemeChangeEvent;
-
-  @override
-  void initState() {
-    super.initState();
-
-    // _appThemeChangeEvent =
-    //     AppEvent.getInstance()?.on<AppThemeChangeEvent>().listen((event) {
-    //       setState(() {});
-    //     });
-
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    //_appThemeChangeEvent?.cancel();
-  }
-
-  // // 可以添加更多通用方法
-  // void showSnackbar(String message) {
-  //   ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(message)));
-  // }
-
-}

lib/common/empty_data_page.dart

@@ -1,8 +1,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:poetry/pages/explore/main/view/bottom_feedback_view.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/pages/explore/main/view/bottom_feedback_view.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../gen_a/A.dart';
 import 'AC.dart';
@@ -84,11 +84,11 @@ class EmptyDataPage extends StatelessWidget {
                 ),
               ),
               style: ButtonStyle(
-                  minimumSize: MaterialStateProperty.all(Size(1, 36.h)),
-                  padding: MaterialStateProperty.all(EdgeInsets.only(left: 27.w, right: 27.w)),
-                  elevation: MaterialStateProperty.all(0),
-                  backgroundColor: MaterialStateProperty.all(HexColor.QUOKKA_BTN),
-                  shape: MaterialStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(18.h)))
+                  minimumSize: WidgetStateProperty.all(Size(1, 36.h)),
+                  padding: WidgetStateProperty.all(EdgeInsets.only(left: 27.w, right: 27.w)),
+                  elevation: WidgetStateProperty.all(0),
+                  backgroundColor: WidgetStateProperty.all(HexColor.QUOKKA_BTN),
+                  shape: WidgetStateProperty.all(RoundedRectangleBorder(borderRadius: BorderRadius.circular(18.h)))
               ),
               onPressed: () {
                 buttonClickBlock();

lib/component/mood_bar.dart

@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../constant/mood_constant.dart';
 
-
-
 class MoodStats {
   int type;
   int count;

lib/component/mood_ring.dart

@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'dart:math' as math;
 
-import 'package:poetry/constant/mood_constant.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/constant/mood_constant.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 class MoodRing extends StatelessWidget {
   final List<int> moodStats;
@@ -129,154 +129,3 @@ class MoodRingPainter extends CustomPainter {
   }
 }
 
-
-/*
-
-class MoodStats {
-  int type;
-  int count;
-
-  MoodStats(this.type, this.count);
-}
-
-class MoodRing extends StatelessWidget {
-  final List<MoodStats> moodStats;
-  final double radius;
-  final double width;
-  final String? content;
-  final Color? contentColor;
-  final Color? emptyColor;
-  final List<int>? moodIndex;
-
-  const MoodRing({
-    Key? key,
-    required this.moodStats,
-    this.radius = 15,
-    this.width = 5,
-    this.content,
-    this.contentColor,
-    this.emptyColor,
-    this.moodIndex
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        Positioned.fill(
-          child: CustomPaint(
-            painter: MoodRingPainter(
-              moodStats: moodStats,
-              radius: radius,
-              width: width,
-              emptyColor: emptyColor,
-              moodIndex: moodIndex
-            ),
-            size: Size.fromRadius(radius),
-          ),
-        ),
-        Positioned.fill(
-            child: Container(
-              alignment: Alignment.center,
-              child: Text(
-                content??"",
-                style: TextStyle(
-                    color: contentColor??HexColor("#666666"),
-                    fontSize: 10.sp
-                ),
-              ),
-            )
-        )
-      ],
-    );
-  }
-}
-
-class MoodRingPainter extends CustomPainter {
-  final List<MoodStats> moodStats;
-  final double radius;
-  final double width;
-  final Color? emptyColor;
-  final List<int>? moodIndex;
-
-  MoodRingPainter({
-    required this.moodStats,
-    required this.radius,
-    required this.width,
-    this.emptyColor,
-    this.moodIndex
-  });
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final center = Offset(size.width / 2, size.height / 2);
-
-    double startAngle = -math.pi / 2;
-    int totalRatio =
-        moodStats.fold(0, (previous, current) => previous + current.count);
-    final paint = Paint()
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = width;
-
-    if ((moodIndex??[]).isEmpty) {
-      paint.color = getColor(0);
-      canvas.drawArc(
-        Rect.fromCircle(center: center, radius: radius),
-        startAngle,
-        360,
-        false,
-        paint,
-      );
-    } else {
-      // for (MoodStats m in moodStats) {
-      //   double sweepAngle = math.pi * 2 * m.count / totalRatio;
-      //   paint.color = getColor(m.type);
-      //   canvas.drawArc(
-      //     Rect.fromCircle(center: center, radius: radius),
-      //     startAngle,
-      //     sweepAngle,
-      //     false,
-      //     paint,
-      //   );
-      //   startAngle += sweepAngle;
-      // }
-      for (int index in moodIndex??[]) {
-        double sweepAngle = math.pi * 2 * 1 / totalRatio;
-        paint.color = getColor(index);
-        canvas.drawArc(
-          Rect.fromCircle(center: center, radius: radius),
-          startAngle,
-          sweepAngle,
-          false,
-          paint,
-        );
-        startAngle += sweepAngle;
-      }
-    }
-  }
-
-  @override
-  bool shouldRepaint(CustomPainter oldDelegate) {
-    return true;
-  }
-
-  Color getColor(int type) {
-    switch (type) {
-      case MoodConstant.moodTypeVeryBad:
-        return const Color(0xFFFC988F);
-      case MoodConstant.moodTypeBad:
-        return const Color(0xFFFFCB83);
-      case MoodConstant.moodTypeNormal:
-        return const Color(0xFFA3E992);
-      case MoodConstant.moodTypeGood:
-        return const Color(0xFF7EBEE8);
-      case MoodConstant.moodTypeVeryGood:
-        return const Color(0xFFB48DD3);
-      default:
-        // return const Color(0xFFF5F5F5);
-        return emptyColor??Color(0xFFF5F5F5);
-    }
-  }
-}
-
- */

lib/constant/color_constant.dart

@@ -1,9 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ColorConstant {
-  static const Color primaryColor = Color(0xFFFCA14C);
-
-  static const Color textMain = Color(0xFF000000);
-  static const Color textSecond = Color(0xFF979797);
-
-}

lib/constant/mood_constant.dart

@@ -6,6 +6,4 @@ class MoodConstant {
   static const moodTypeNormal = 3;
   static const moodTypeGood = 4;
   static const moodTypeVeryGood = 5;
-
-
 }

lib/constant/screen_constant.dart

@@ -3,5 +3,4 @@ import 'package:flutter/material.dart';
 class ScreenConstant {
   static const double designWidth = 390;
   static const double designHeight = 844;
-
 }

lib/generated/json/ali_oss_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/model/ali_oss_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/model/ali_oss_model.dart';
 
 AliOssModel $AliOssModelFromJson(Map<String, dynamic> json) {
   final AliOssModel aliOssModel = AliOssModel();

lib/generated/json/app_config_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/main/model/app_config_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/main/model/app_config_model.dart';
 
 AppConfigModel $AppConfigModelFromJson(Map<String, dynamic> json) {
   final AppConfigModel appConfigModel = AppConfigModel();

lib/generated/json/assess_report_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/practice/model/assess_report_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/practice/model/assess_report_model.dart';
 
 AssessReportModel $AssessReportModelFromJson(Map<String, dynamic> json) {
   final AssessReportModel assessReportModel = AssessReportModel();

lib/generated/json/badge_detail_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/badge/model/badge_detail_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/badge/model/badge_detail_model.dart';
 
 BadgeDetailModel $BadgeDetailModelFromJson(Map<String, dynamic> json) {
   final BadgeDetailModel badgeDetailModel = BadgeDetailModel();

lib/generated/json/badge_model.g.dart

@@ -1,6 +1,6 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/badge/model/badge_model.dart';
-import 'package:poetry/pages/my/badge/model/badge_detail_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/badge/model/badge_model.dart';
+import 'package:iquokka/pages/my/badge/model/badge_detail_model.dart';
 
 
 BadgeModel $BadgeModelFromJson(Map<String, dynamic> json) {

lib/generated/json/banner_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/explore/main/model/banner_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/explore/main/model/banner_model.dart';
 
 BannerModel $BannerModelFromJson(Map<String, dynamic> json) {
   final BannerModel bannerModel = BannerModel();

lib/generated/json/base/json_convert_content.dart

@@ -4,34 +4,34 @@
 
 // This file is automatically generated. DO NOT EDIT, all your changes would be lost.
 import 'package:flutter/material.dart' show debugPrint;
-import 'package:poetry/model/ali_oss_model.dart';
-import 'package:poetry/pages/explore/main/model/banner_model.dart';
-import 'package:poetry/pages/explore/main/model/discover_model.dart';
-import 'package:poetry/pages/explore/search/model/search_hot_model.dart';
-import 'package:poetry/pages/footprint/main/model/footprint_model.dart';
-import 'package:poetry/pages/my/badge/model/badge_detail_model.dart';
-import 'package:poetry/pages/my/badge/model/badge_model.dart';
-import 'package:poetry/pages/my/lately_record/model/record_detail_model.dart';
-import 'package:poetry/pages/my/main/model/mood_stat_model.dart';
-import 'package:poetry/pages/my/main/model/user_model.dart';
-import 'package:poetry/pages/my/main/model/user_stat_model.dart';
-import 'package:poetry/pages/my/mood_analysis/model/mood_model.dart';
-import 'package:poetry/pages/my/mood_analysis/model/mood_record_history_model.dart';
-import 'package:poetry/pages/my/setting/model/notice_setting_model.dart';
-import 'package:poetry/pages/my/vip/model/cash_code_model.dart';
-import 'package:poetry/pages/my/vip/model/vip_buy_model.dart';
-import 'package:poetry/pages/today/favorite/model/favorite_model.dart';
-import 'package:poetry/pages/today/main/model/app_config_model.dart';
-import 'package:poetry/pages/today/main/model/sentence_model.dart';
-import 'package:poetry/pages/today/mood_record/model/mood_reason_model.dart';
-import 'package:poetry/pages/today/mood_record/model/mood_record_draft_model.dart';
-import 'package:poetry/pages/today/mood_record/model/mood_type_model.dart';
-import 'package:poetry/pages/today/practice/model/assess_report_model.dart';
-import 'package:poetry/pages/today/practice/model/lesson_model.dart';
-import 'package:poetry/pages/today/practice/model/practice_detail_model.dart';
-import 'package:poetry/pages/today/practice/model/practice_history_record_model.dart';
-import 'package:poetry/pages/today/practice/model/segment_model.dart';
-import 'package:poetry/pages/today/practice_assess/model/done_practice_model.dart';
+import 'package:iquokka/model/ali_oss_model.dart';
+import 'package:iquokka/pages/explore/main/model/banner_model.dart';
+import 'package:iquokka/pages/explore/main/model/discover_model.dart';
+import 'package:iquokka/pages/explore/search/model/search_hot_model.dart';
+import 'package:iquokka/pages/footprint/main/model/footprint_model.dart';
+import 'package:iquokka/pages/my/badge/model/badge_detail_model.dart';
+import 'package:iquokka/pages/my/badge/model/badge_model.dart';
+import 'package:iquokka/pages/my/lately_record/model/record_detail_model.dart';
+import 'package:iquokka/pages/my/main/model/mood_stat_model.dart';
+import 'package:iquokka/pages/my/main/model/user_model.dart';
+import 'package:iquokka/pages/my/main/model/user_stat_model.dart';
+import 'package:iquokka/pages/my/mood_analysis/model/mood_model.dart';
+import 'package:iquokka/pages/my/mood_analysis/model/mood_record_history_model.dart';
+import 'package:iquokka/pages/my/setting/model/notice_setting_model.dart';
+import 'package:iquokka/pages/my/vip/model/cash_code_model.dart';
+import 'package:iquokka/pages/my/vip/model/vip_buy_model.dart';
+import 'package:iquokka/pages/today/favorite/model/favorite_model.dart';
+import 'package:iquokka/pages/today/main/model/app_config_model.dart';
+import 'package:iquokka/pages/today/main/model/sentence_model.dart';
+import 'package:iquokka/pages/today/mood_record/model/mood_reason_model.dart';
+import 'package:iquokka/pages/today/mood_record/model/mood_record_draft_model.dart';
+import 'package:iquokka/pages/today/mood_record/model/mood_type_model.dart';
+import 'package:iquokka/pages/today/practice/model/assess_report_model.dart';
+import 'package:iquokka/pages/today/practice/model/lesson_model.dart';
+import 'package:iquokka/pages/today/practice/model/practice_detail_model.dart';
+import 'package:iquokka/pages/today/practice/model/practice_history_record_model.dart';
+import 'package:iquokka/pages/today/practice/model/segment_model.dart';
+import 'package:iquokka/pages/today/practice_assess/model/done_practice_model.dart';
 
 JsonConvert jsonConvert = JsonConvert();
 

lib/generated/json/cash_code_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/vip/model/cash_code_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/vip/model/cash_code_model.dart';
 
 CashCodeModel $CashCodeModelFromJson(Map<String, dynamic> json) {
   final CashCodeModel cashCodeModel = CashCodeModel();

lib/generated/json/discover_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/explore/main/model/discover_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/explore/main/model/discover_model.dart';
 
 import '../../pages/today/favorite/model/favorite_model.dart';
 

lib/generated/json/done_practice_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/practice_assess/model/done_practice_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/practice_assess/model/done_practice_model.dart';
 
 import '../../pages/today/practice/model/segment_model.dart';
 

lib/generated/json/favorite_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/favorite/model/favorite_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/favorite/model/favorite_model.dart';
 
 FavoriteModel $FavoriteModelFromJson(Map<String, dynamic> json) {
   final FavoriteModel favoriteModel = FavoriteModel();

lib/generated/json/footprint_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/footprint/main/model/footprint_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/footprint/main/model/footprint_model.dart';
 
 import '../../pages/my/mood_analysis/model/mood_record_history_model.dart';
 

lib/generated/json/lesson_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/practice/model/lesson_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/practice/model/lesson_model.dart';
 
 LessonModel $LessonModelFromJson(Map<String, dynamic> json) {
   final LessonModel lessonModel = LessonModel();

lib/generated/json/mood_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/mood_analysis/model/mood_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/mood_analysis/model/mood_model.dart';
 
 MoodModel $MoodModelFromJson(Map<String, dynamic> json) {
   final MoodModel moodModel = MoodModel();

lib/generated/json/mood_reason_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/mood_record/model/mood_reason_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/mood_record/model/mood_reason_model.dart';
 
 MoodReasonModel $MoodReasonModelFromJson(Map<String, dynamic> json) {
   final MoodReasonModel moodReasonModel = MoodReasonModel();

lib/generated/json/mood_record_draft_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/mood_record/model/mood_record_draft_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/mood_record/model/mood_record_draft_model.dart';
 
 MoodRecordDraftModel $MoodRecordDraftModelFromJson(Map<String, dynamic> json) {
   final MoodRecordDraftModel moodRecordDraftModel = MoodRecordDraftModel();

lib/generated/json/mood_record_history_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/mood_analysis/model/mood_record_history_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/mood_analysis/model/mood_record_history_model.dart';
 
 import '../../pages/my/mood_analysis/model/mood_model.dart';
 

lib/generated/json/mood_stat_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/main/model/mood_stat_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/main/model/mood_stat_model.dart';
 
 MoodStatModel $MoodStatModelFromJson(Map<String, dynamic> json) {
   final MoodStatModel moodStatModel = MoodStatModel();

lib/generated/json/mood_type_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/mood_record/model/mood_type_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/mood_record/model/mood_type_model.dart';
 
 MoodTypeModel $MoodTypeModelFromJson(Map<String, dynamic> json) {
   final MoodTypeModel moodTypeModel = MoodTypeModel();

lib/generated/json/notice_setting_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/setting/model/notice_setting_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/setting/model/notice_setting_model.dart';
 import 'dart:ffi';
 
 

lib/generated/json/practice_detail_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/practice/model/practice_detail_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/practice/model/practice_detail_model.dart';
 
 PracticeDetailModel $PracticeDetailModelFromJson(Map<String, dynamic> json) {
   final PracticeDetailModel practiceDetailModel = PracticeDetailModel();

lib/generated/json/practice_history_record_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/practice/model/practice_history_record_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/practice/model/practice_history_record_model.dart';
 
 PracticeHistoryRecordModel $PracticeHistoryRecordModelFromJson(
     Map<String, dynamic> json) {

lib/generated/json/record_detail_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/lately_record/model/record_detail_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/lately_record/model/record_detail_model.dart';
 
 RecordDetailModel $RecordDetailModelFromJson(Map<String, dynamic> json) {
   final RecordDetailModel recordDetailModel = RecordDetailModel();

lib/generated/json/search_hot_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/explore/search/model/search_hot_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/explore/search/model/search_hot_model.dart';
 
 SearchHotModel $SearchHotModelFromJson(Map<String, dynamic> json) {
   final SearchHotModel searchHotModel = SearchHotModel();

lib/generated/json/segment_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/practice/model/segment_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/practice/model/segment_model.dart';
 
 SegmentModel $SegmentModelFromJson(Map<String, dynamic> json) {
   final SegmentModel segmentModel = SegmentModel();

lib/generated/json/sentence_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/today/main/model/sentence_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/today/main/model/sentence_model.dart';
 
 SentenceModel $SentenceModelFromJson(Map<String, dynamic> json) {
   final SentenceModel sentenceModel = SentenceModel();

lib/generated/json/user_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/main/model/user_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/main/model/user_model.dart';
 
 UserModel $UserModelFromJson(Map<String, dynamic> json) {
   final UserModel userModel = UserModel();

lib/generated/json/user_stat_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/main/model/user_stat_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/main/model/user_stat_model.dart';
 
 UserStatModel $UserStatModelFromJson(Map<String, dynamic> json) {
   final UserStatModel userStatModel = UserStatModel();

lib/generated/json/vip_buy_model.g.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
-import 'package:poetry/pages/my/vip/model/vip_buy_model.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/pages/my/vip/model/vip_buy_model.dart';
 
 VipBuyModel $VipBuyModelFromJson(Map<String, dynamic> json) {
   final VipBuyModel vipBuyModel = VipBuyModel();

lib/main.dart

@@ -11,24 +11,23 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:get/get.dart';
+import 'package:logger/logger.dart';
 import 'package:macos_ui/macos_ui.dart';
 import 'package:home_widget/home_widget.dart';
-import 'package:poetry/module/home_widget_service.dart';
-import 'package:poetry/net/http_utils.dart';
-import 'package:poetry/pages/guide_page.dart';
-import 'package:poetry/pages/main_binding.dart';
-import 'package:poetry/pages/main_page.dart';
-import 'package:poetry/pages/my/login/page/login_page.dart';
-import 'package:poetry/pages/today/main/model/sentence_model.dart';
-import 'package:poetry/pages/today/mood_record/bindings/mood_record_binding.dart';
-import 'package:poetry/pages/today/mood_record/page/mood_choose_page.dart';
-import 'package:poetry/pages/today/practice_assess/bindings/exam_binding.dart';
-import 'package:poetry/pages/today/practice_assess/page/exam_page.dart';
-import 'package:poetry/routers/app_routers.dart';
-import 'package:poetry/utils/app_event.dart';
-import 'package:poetry/utils/app_static.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/toast_utils.dart';
+import 'package:iquokka/constant/screen_constant.dart';
+import 'package:iquokka/module/home_widget_service.dart';
+import 'package:iquokka/pages/main_binding.dart';
+import 'package:iquokka/pages/main_page.dart';
+import 'package:iquokka/pages/my/login/page/login_page.dart';
+import 'package:iquokka/pages/today/mood_record/bindings/mood_record_binding.dart';
+import 'package:iquokka/pages/today/mood_record/page/mood_choose_page.dart';
+import 'package:iquokka/pages/today/practice_assess/bindings/exam_binding.dart';
+import 'package:iquokka/pages/today/practice_assess/page/exam_page.dart';
+import 'package:iquokka/routers/app_routers.dart';
+import 'package:iquokka/utils/app_event.dart';
+import 'package:iquokka/utils/app_static.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/toast_utils.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:sp_util/sp_util.dart';
 import 'package:umeng_common_sdk/umeng_common_sdk.dart';
@@ -38,8 +37,6 @@ import 'common/AC.dart';
 import 'constant/wx_constant.dart';
 import 'module/app_service.dart';
 import 'module/user_service.dart';
-import 'package:intl/intl.dart';
-import 'net/http_url.dart';
 import 'pages/today/main/page/sentence_list_page.dart';
 
 @pragma("vm:entry-point")
@@ -66,99 +63,41 @@ void workManagerCallback() {
 }
 
 void main() async {
-  // Future.delayed(const Duration(milliseconds: 500), () {
-  //   runApp(const MyApp());
-  // });
   WidgetsFlutterBinding.ensureInitialized();
   await SpUtil.getInstance();
 
-  // Future.delayed(const Duration(milliseconds: 1500), () { //延长启动图展示时间
-  //   runApp(const MyApp());
-  // });
-
   SystemChannels.lifecycle.setMessageHandler((msg) async {
-    debugPrint('SystemChannels> $msg');
-    // msg是个字符串，是下面的值
-    // AppLifecycleState.resumed
-    // AppLifecycleState.inactive
-    // AppLifecycleState.paused
-    // AppLifecycleState.detached
-
+    Logger().d('SystemChannels> $msg');
+    /// msg是个字符串，是下面的值
+    /// AppLifecycleState.resumed
+    /// AppLifecycleState.inactive
+    /// AppLifecycleState.paused
+    /// AppLifecycleState.detached
     if (msg == "AppLifecycleState.resumed") { //进入前台
-      print("===================== app进入前台 =====================");
+      Logger().d("===================== app进入前台 =====================");
       AppEvent.getInstance()?.fire(AppEnterForegroundEvent());
-      // if (_isPaused) {
-      //   AppEvent.getInstance()?.fire(AppPasswordLockEvent());
-      // }
-      // _isPaused = false;
       if (AppService().getThemeMode() == 0) { //跟随系统
-        print("11111111111111111111");
-        print("HexColor.isDarkMode = "+HexColor.isDarkMode.toString());
-        print("Get.isDarkMode = "+Get.isDarkMode.toString());
-        print("platformBrightness = "+MediaQuery.of(Get.context!).platformBrightness.isDark.toString());
-        // Get.isDarkMode
         if (HexColor.isDarkMode != MediaQuery.of(Get.context!).platformBrightness.isDark) { //系统模式改变
-          print("222222222222222222");
           HexColor.reload();
           AC.reload();
           Get.forceAppUpdate();
           ToastUtil.settingEasyLoading();
         }
       }
-
-      // AppLinks().uriLinkStream.listen((uri) {
-      //   print('onAppLink: $uri');
-      //
-      // });
-
     }
     else if (msg == "AppLifecycleState.inactive") { //进入非活跃状态
-      print("===================== app进入非活跃状态 =====================");
-
+      Logger().d("===================== app进入非活跃状态 =====================");
     }
-
     else if (msg == "AppLifecycleState.paused") { //进入后台
-      print("===================== app进入后台 =====================");
-      // if (AppService().getPwdLock().isNotEmpty) {
-      //   SpUtil.putInt("PasswordLockTime", TimeUtil.getCurrentTimestamp());
-      // }
-      //_isPaused = true;
+      Logger().d("===================== app进入后台 =====================");
       AppEvent.getInstance()?.fire(AppPasswordLockEvent());
     }
     else if (msg == "AppLifecycleState.detached") { //app被杀死
-      print("===================== app被杀死 =====================");
-      //AppEvent.getInstance()?.fire(AppCrashEvent());
-      // if (AppService().getPwdLock().isNotEmpty) {
-      //   SpUtil.putInt("PasswordLockTime", 0);
-      // }
+      Logger().d("===================== app被杀死 =====================");
     }
     return msg;
   });
 
-  // FlutterError.onError = (FlutterErrorDetails details) async {
-  //   // 处理错误信息
-  //   // Zone.current.handleUncaughtError(details.exception, details.stack!);
-  //
-  //   print("在这里执行你想要的操作，例如保存日志、清理资源等");
-  //   // 在这里执行你想要的操作，例如保存日志、清理资源等
-  //
-  //   // 确保异常能够被原生平台捕获
-  //   throw details.exception;
-  // };
-
-  // if (Platform.isAndroid) {
-  //   // 以下两行 设置android状态栏为透明的沉浸。写在组件渲染之后，是为了在渲染后进行set赋值，覆盖状态栏，写在渲染之前MaterialApp组件会覆盖掉这个值。
-  //   // SystemUiOverlayStyle systemUiOverlayStyle = SystemUiOverlayStyle(statusBarColor: Colors.transparent);
-  //   // SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
-  //   SystemChrome.setSystemUIOverlayStyle(
-  //       SystemUiOverlayStyle(
-  //         statusBarColor: Colors.transparent,
-  //         systemNavigationBarColor: Colors.white,
-  //         systemNavigationBarDividerColor: Colors.white,
-  //       )
-  //   );
-  // }
-
   Duration delay;
   DateTime now = DateTime.now();
   DateTime targetTime = DateTime(now.year, now.month, now.day, 1, 0, 0);
@@ -188,19 +127,6 @@ void main() async {
   );
 
   runApp(const MyApp());
-
-  // if (Platform.isAndroid) {
-  //   // 以下两行 设置android状态栏为透明的沉浸。写在组件渲染之后，是为了在渲染后进行set赋值，覆盖状态栏，写在渲染之前MaterialApp组件会覆盖掉这个值。
-  //   // SystemUiOverlayStyle systemUiOverlayStyle = SystemUiOverlayStyle(statusBarColor: Colors.transparent);
-  //   // SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
-  //   SystemChrome.setSystemUIOverlayStyle(
-  //       SystemUiOverlayStyle(
-  //         statusBarColor: Colors.transparent,
-  //         systemNavigationBarColor: Colors.white,
-  //         systemNavigationBarDividerColor: Colors.white,
-  //       )
-  //   );
-  // }
 }
 
 class MyApp extends StatefulWidget {
@@ -214,10 +140,6 @@ class MyApp extends StatefulWidget {
 
 class _MyAppState extends State<MyApp> {
 
-  // Brightness _brightness = Brightness.light;
-  // ThemeMode _themeMode = ThemeMode.system;
-
-  //late AppLinks _appLinks;
   StreamSubscription<Uri>? _linkSubscription;
 
   Future<void> _launchedFromWidget(Uri? uri) async {
@@ -250,7 +172,6 @@ class _MyAppState extends State<MyApp> {
     HomeWidget.widgetClicked.listen(_launchedFromWidget);
   }
 
-
   @override
   void initState() {
     super.initState();
@@ -262,16 +183,7 @@ class _MyAppState extends State<MyApp> {
   }
 
   Future<void> initDeepLinks() async {
-    //_appLinks = AppLinks();
-    // Handle links
-
-    // _linkSubscription = AppLinks().uriLinkStream.listen((uri) {
-    //   print('onAppLink: $uri');
-    //   openAppLink(uri);
-    // });
-
     AppLinks().stringLinkStream.listen((scheme) {
-      print("scheme = " + scheme);
       if (scheme == "iquokka-MoodRecordPage") {
         Get.to(()=>MoodChoosePage(), binding: MoodRecordBinding(), arguments: {"recordType": 1});
       }
@@ -292,52 +204,19 @@ class _MyAppState extends State<MyApp> {
     });
   }
 
-  void openAppLink(Uri uri) {
-    // _navigatorKey.currentState?.pushNamed(uri.fragment);
-  }
-
-  // Future<void> _initUniLinks() async {
-  //   try {
-  //     final initialLink = await getInitialLink();
-  //     if (initialLink != null) {
-  //       _handleIncomingLink(initialLink);
-  //     }
-  //   } catch (e) {
-  //     print('Failed to get initial link: $e');
-  //   }
-  //
-  //   _sub = linkStream.listen((String? link) {
-  //     if (link != null) {
-  //       _handleIncomingLink(link);
-  //     }
-  //   }, onError: (err) {
-  //     print('Failed to listen to link stream: $err');
-  //   });
-  // }
-  //
-  // void _handleIncomingLink(String link) {
-  //   if (link.contains('page1')) {
-  //     Navigator.pushNamed(context, '/page1');
-  //   }
-  // }
-
-
-
-
-
   @override
   Widget build(BuildContext context) {
 
-    //禁用横屏
+    ///禁用横屏
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.portraitUp, //只能纵向
       DeviceOrientation.portraitDown, //只能纵向
     ]);
 
     if (Platform.isAndroid) {
-      // 以下两行 设置android状态栏为透明的沉浸。写在组件渲染之后，是为了在渲染后进行set赋值，覆盖状态栏，写在渲染之前MaterialApp组件会覆盖掉这个值。
-      // SystemUiOverlayStyle systemUiOverlayStyle = SystemUiOverlayStyle(statusBarColor: Colors.transparent);
-      // SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
+      /// 以下两行 设置android状态栏为透明的沉浸。写在组件渲染之后，是为了在渲染后进行set赋值，覆盖状态栏，写在渲染之前MaterialApp组件会覆盖掉这个值。
+      /// SystemUiOverlayStyle systemUiOverlayStyle = SystemUiOverlayStyle(statusBarColor: Colors.transparent);
+      /// SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle);
       SystemChrome.setSystemUIOverlayStyle(
           SystemUiOverlayStyle(
             statusBarColor: Colors.transparent,
@@ -349,8 +228,7 @@ class _MyAppState extends State<MyApp> {
 
     return ScreenUtilInit(
       splitScreenMode: true,
-      // designSize: Size(750, 1334),
-      designSize: Size(390, 844),
+      designSize: Size(ScreenConstant.designWidth, ScreenConstant.designHeight),
       fontSizeResolver: FontSizeResolvers.width,
       builder: (context, child) {
         return RefreshConfiguration(
@@ -373,7 +251,6 @@ class _MyAppState extends State<MyApp> {
                 title: "心境奇旅",
                 initialBinding: MainBinding(),
                 navigatorObservers: [GetObserver()],
-                //themeMode: HexColor.isDarkMode?ThemeMode.dark:ThemeMode.light,
                 themeMode: AppService().getThemeMode()==1?ThemeMode.light:AppService().getThemeMode()==2?ThemeMode.dark:MediaQuery.of(context).platformBrightness.isDark?ThemeMode.dark:ThemeMode.light,
                 theme: ThemeData(
                   brightness: Brightness.light,
@@ -411,11 +288,6 @@ class _MyAppState extends State<MyApp> {
                 ),
                 defaultTransition: Transition.cupertino,
                 home: _getRootWidget(),
-                onReady: () {
-                  // _themeMode = HexColor.isDarkMode?ThemeMode.dark:ThemeMode.light;
-                  // setState(() {});
-                  // ToastUtil.settingEasyLoading();
-                },
                 builder: EasyLoading.init(
                     builder: (context, child) {
                       return MediaQuery(
@@ -451,25 +323,6 @@ class _MyAppState extends State<MyApp> {
   }
 
   Widget _getRootWidget() {
-
-    // bool isShowGuide = AppService().isShowGuide();
-    // if (Platform.isIOS || .isAndroid) {
-    //   if (!isShowGuide) { //展示引导页
-    //     return GuidePage();
-    //   }
-    //   else {
-    //     if (!UserService().isLogin()) { //展示登录页
-    //       return LoginPage();
-    //     }
-    //     else {
-    //       return MainPage();
-    //     }
-    //   }
-    // }
-    // else {
-    //   return MainPage();
-    // }
-
     if (!UserService().isLogin()) { //展示登录页
       return LoginPage();
     }
@@ -482,66 +335,28 @@ class _MyAppState extends State<MyApp> {
     registerWxApi(
         appId: WxConstant.appId, universalLink: WxConstant.universalLink);
   }
-
-  // void settingEasyLoading() {
-  //
-  //   EasyLoading.instance
-  //     ..displayDuration = const Duration(milliseconds: 2000)
-  //     ..animationDuration = const Duration(milliseconds: 0)
-  //     ..indicatorType = EasyLoadingIndicatorType.fadingCircle
-  //     ..loadingStyle = EasyLoadingStyle.custom
-  //     ..indicatorSize = 78.0
-  //     ..radius = 10.0
-  //     ..contentPadding = EdgeInsets.all(10)
-  //     // ..progressColor = Colors.white
-  //     // ..backgroundColor = Colors.white
-  //     // ..indicatorColor = Colors.white
-  //     // ..textColor = Colors.black.withOpacity(0.87)
-  //     ..progressColor = HexColor.QUOKKA_LIGHT_BG1_DARK_BG2
-  //     ..backgroundColor = HexColor.QUOKKA_LIGHT_BG1_DARK_BG2
-  //     ..indicatorColor = HexColor.QUOKKA_LIGHT_BG1_DARK_BG2
-  //     ..textColor = HexColor.QUOKKA_T1
-  //     ..userInteractions = false
-  //     ..indicatorWidget = Image.asset(
-  //       "assets/images/loading.gif",
-  //       width: 70,
-  //       height: 70,
-  //     )
-  //     ..boxShadow = [BoxShadow(
-  //         color: HexColor("#000000").withOpacity(0.05),
-  //         offset: Offset(0, 0), //阴影xy轴偏移量
-  //         blurRadius: 24, //阴影模糊程度
-  //         spreadRadius: 0 //阴影扩散程度
-  //     )]
-  //     ..dismissOnTap = false;
-  // }
-
 }
 
 class GetObserver extends NavigatorObserver {
   @override
   void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
     super.didPush(route, previousRoute);
-    // print('Route pushed: ${route.settings.name}');
     String routerName = route.settings.name??"";
     if (routerName.contains("?")) {
       int index = routerName.indexOf("?");
       routerName = routerName.substring(0, index);
     }
-    print("Route pushed:" + routerName);
     UmengCommonSdk.onPageStart(routerName);
   }
 
   @override
   void didPop(Route<dynamic> route, Route<dynamic>? previousRoute) {
     super.didPop(route, previousRoute);
-    // print('Route popped: ${route.settings.name}');
     String routerName = route.settings.name??"";
     if (routerName.contains("?")) {
       int index = routerName.indexOf("?");
       routerName = routerName.substring(0, index);
     }
-    print("Route popped:" + routerName);
     UmengCommonSdk.onPageEnd(routerName);
   }
 }
@@ -571,9 +386,7 @@ ScreenUtil().setWidth(540)  (sdk>=2.6 : 540.w)   //根据屏幕宽度适配尺
     0.5.sh  //屏幕高度的50%
 
     keytool -genkey -v -keystore E:\iquokka\android\iquokka.jks -keyalg RSA -keysize 2048 -validity 10000 -alias iquokka
-
     keytool -importkeystore -srckeystore E:\iquokka\android\iquokka.jks -destkeystore E:\iquokka\android\iquokka.jks -deststoretype pkcs12
-
     keytool -genkey -v -keystore E:\iquokka\android\iquokka.jks -keyalg RSA -keysize 2048 -validity 10000 -alias iquokka -storetype jks
 
    vim ~/.bash_profile
@@ -585,1991 +398,7 @@ ScreenUtil().setWidth(540)  (sdk>=2.6 : 540.w)   //根据屏幕宽度适配尺
    flutter build apk --release --dart-define=APP_CHANNEL=huawei
    flutter build apk --release --dart-define=APP_CHANNEL=vivo
 
-AppService().getThemeMode()==1?Brightness.light:AppService().getThemeMode()==2?Brightness.dark:MediaQuery.of(context).platformBrightness.isDark?Brightness.dark:Brightness.dark
-
-Could not build the precompiled application for the device.
-Error (Xcode): ../../../.pub-cache/hosted/pub.dev/photo_manager-3.2.2/lib/src/utils/convert_utils.dart:102:7: Error: No named parameter with the name 'albumTypeEx'.
-
-Error launching application on 白小白的iPhone Xs Max.
-
-
-
-
- flutter sdk 3.24.0
-name: poetry
-description: A new Flutter project.
-
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-
-version: 1.8.3+73
-
-environment:
-  sdk: ">=3.1.5 <4.0.0"
-#  sdk: ">=2.17.0 <3.0.0"
-
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
-dependencies:
-  flutter:
-    sdk: flutter
-
-  flutter_localizations:
-    sdk: flutter
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  #cupertino_icons: ^1.0.2
-
-  #屏幕适配
-  flutter_screenutil: ^5.9.0
-
-  fluro: ^2.0.3
-  fluttertoast: ^8.0.9
-  dots_indicator: ^2.1.0
-  flutter_pickers: ^2.1.8
-  image_picker: ^1.0.7
-  image_cropper: ^5.0.0
-#  image_cropper: ^8.0.1
-  image_gallery_saver: ^2.0.3 #保存图片到相册
-  flutter_image_compress: ^2.2.0 #压缩图片
-  wechat_assets_picker: ^9.1.0 #模仿微信选择图片
-  photo_view: ^0.14.0 #图片预览
-#  image: ^4.1.6
-  fluwx: ^3.13.1
-  dio: ^4.0.6
-  connectivity_plus: ^2.3.4
-  sp_util: ^2.0.3
-  easy_refresh: ^3.4.0
-
-  #广播，通知
-  event_bus: ^2.0.0
-#  popup_menu:
-#    git: git@github.com:chinabrant/popup_menu.git
-  permission_handler: ^11.2.0
-  path_provider: ^2.0.13
-#  m_loading: ^0.0.2
-  flutter_easyloading: ^3.0.5
-
-  #加载网络图片
-  cached_network_image: ^3.3.1
-  flutter_cache_manager: ^3.3.1
-
-#  flutter_html: ^3.0.0-alpha.6
-  flutter_html: ^3.0.0-beta.2
-  webview_flutter: ^4.7.0
-  flutter_widget_from_html: ^0.15.1
-#  package_info_plus: ^1.4.2
-#  audio_session: ^0.1.21
-  pin_code_fields: ^8.0.1
-#  flutter_swiper : ^1.1.6
-#  flutter_sound: ^9.6.0
-#  flutter_sound: ^9.10.4
-  umeng_common_sdk: ^1.2.7
-  umeng_push_sdk: ^2.3.0 #友盟推送
-#  flutter_qq_ads: ^2.5.0
-  flutter_qq_ads: ^2.6.0
-
-  #状态管理
-  get: ^4.6.6
-
-  #数据存储
-  shared_preferences: ^2.0.18
-
-  #弹窗
-  adaptive_dialog: ^1.8.2
-
-  #下拉刷新，上拉加载更多
-  pull_to_refresh: ^2.0.0
-
-  #syncfusion_flutter_sliders: ^21.2.10
-#  flutter_draggable_gridview: ^0.0.8
-  flutter_draggable_gridview: ^0.0.11
-  reorderable_grid: ^1.0.10
-#  reorderable_grid_view: ^2.2.8
-
-  custom_sliding_segmented_control: ^1.7.5
-
-  syncfusion_flutter_sliders: ^24.1.46
-
-  #画虚线
-  dotted_border: ^2.0.0+3
-
-  #时间选择器
-  #flutter_datetime_picker: ^1.5.1
-  flutter_datetime_picker_plus: ^2.2.0
-#  flutter_cupertino_datetime_picker: ^3.0.0
-
-  universal_platform: ^1.0.0+1
-
-#  flutter_radar_chart: ^0.2.1  #雷达图
-  # fl_animated_linechart: ^1.1.9 区域图
-
-  macos_ui: ^2.0.0
-
-#  screenshot: ^2.1.0
-  screenshot: ^3.0.0
-
-  #flutter_acrylic: ^1.1.3
-
-  in_app_purchase: ^3.1.11  #内购
-
-  #flutter_launcher_icons: ^0.13.1
-
-  package_info_plus: ^4.1.0
-  device_info_plus: ^9.1.1
-  #升级flutter3.24.0后，解决报错Error (Xcode): ../../../.pub-cache/hosted/pub.dev/win32-5.1.1/lib/src/guid.dart:32:9: Error: Type 'UnmodifiableUint8ListView' not found.
-  win32: ^5.5.4
-
-  url_launcher: ^6.2.2
-
-  dash_painter: ^1.0.2
-
-  carousel_slider: ^5.0.0 #轮播图
-#  lottie: ^3.1.0 #动画
-  lottie: ^3.1.2
-  archive: ^3.6.1
-  qr_flutter: ^4.1.0 #二维码生成
-
-#  intl: ^0.19.0
-#  flutter_localization: ^0.2.1
-
-
-
-
-
-#  flutter_neumorphic: ^3.2.0
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: ^2.0.0
-
-#  flutter_native_splash: ^2.3.8
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
-flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  assets:
-    - assets/images/
-    - assets/images/loading.gif
-    - assets/lottie/
-
-#  fonts:
-#    - family: PingFang
-#      asset: fonts/ping_fang.ttf
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
-
-
-
-
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  adaptive_dialog:
-    dependency: "direct main"
-    description:
-      name: adaptive_dialog
-      sha256: "910debe8766eff4b378ed5164bb470debb87c53a3bdf6adee03c79f64fbf7348"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.1"
-  animations:
-    dependency: transitive
-    description:
-      name: animations
-      sha256: "708e4b68c23228c264b038fe7003a2f5d01ce85fc64d8cae090e86b27fcea6c5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.10"
-  appkit_ui_element_colors:
-    dependency: transitive
-    description:
-      name: appkit_ui_element_colors
-      sha256: c3e50f900aae314d339de489535736238627071457c4a4a2dbbb1545b4f04f22
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.1"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.2"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
-  audio_session:
-    dependency: transitive
-    description:
-      name: audio_session
-      sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.21"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  cached_network_image:
-    dependency: "direct main"
-    description:
-      name: cached_network_image
-      sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.1"
-  cached_network_image_platform_interface:
-    dependency: transitive
-    description:
-      name: cached_network_image_platform_interface
-      sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
-  cached_network_image_web:
-    dependency: transitive
-    description:
-      name: cached_network_image_web
-      sha256: "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  carousel_slider:
-    dependency: "direct main"
-    description:
-      name: carousel_slider
-      sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  chewie:
-    dependency: transitive
-    description:
-      name: chewie
-      sha256: "8bc4ac4cf3f316e50a25958c0f5eb9bb12cf7e8308bb1d74a43b230da2cfc144"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.7.5"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  connectivity_plus:
-    dependency: "direct main"
-    description:
-      name: connectivity_plus
-      sha256: "979d3b01f3b6c009ec6ce1c0af0a4bca541de4b9069c2589c1d4f58d7bbd6908"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.8"
-  connectivity_plus_linux:
-    dependency: transitive
-    description:
-      name: connectivity_plus_linux
-      sha256: "3caf859d001f10407b8e48134c761483e4495ae38094ffcca97193f6c271f5e2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
-  connectivity_plus_macos:
-    dependency: transitive
-    description:
-      name: connectivity_plus_macos
-      sha256: "488d2de1e47e1224ad486e501b20b088686ba1f4ee9c4420ecbc3b9824f0b920"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.6"
-  connectivity_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: connectivity_plus_platform_interface
-      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.4"
-  connectivity_plus_web:
-    dependency: transitive
-    description:
-      name: connectivity_plus_web
-      sha256: b9141dbab92c607758946f2f38eb209d828655dc2535b44b1a9f09c9d4a22fbf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.3"
-  connectivity_plus_windows:
-    dependency: transitive
-    description:
-      name: connectivity_plus_windows
-      sha256: "535b0404b4d5605c4dd8453d67e5d6d2ea0dd36e3b477f50f31af51b0aeab9dd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  cross_file:
-    dependency: transitive
-    description:
-      name: cross_file
-      sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.4+2"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.17.3"
-  cupertino_icons:
-    dependency: transitive
-    description:
-      name: cupertino_icons
-      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.8"
-  custom_sliding_segmented_control:
-    dependency: "direct main"
-    description:
-      name: custom_sliding_segmented_control
-      sha256: "05b73fa48d57218bfdf806bad68a859812b216cd81fe81c6cbefde89f39eb257"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.1"
-  dash_painter:
-    dependency: "direct main"
-    description:
-      name: dash_painter
-      sha256: e0b24070aed0549f9139ef1276ca70c155fe78960ec624d6dec3cdb0502f9a2a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  dbus:
-    dependency: transitive
-    description:
-      name: dbus
-      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.10"
-  device_info_plus:
-    dependency: "direct main"
-    description:
-      name: device_info_plus
-      sha256: "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.1.1"
-  device_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: device_info_plus_platform_interface
-      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
-  dio:
-    dependency: "direct main"
-    description:
-      name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.6"
-  dots_indicator:
-    dependency: "direct main"
-    description:
-      name: dots_indicator
-      sha256: f1599baa429936ba87f06ae5f2adc920a367b16d08f74db58c3d0f6e93bcdb5c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  dotted_border:
-    dependency: "direct main"
-    description:
-      name: dotted_border
-      sha256: "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  dynamic_color:
-    dependency: transitive
-    description:
-      name: dynamic_color
-      sha256: a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.6.9"
-  easy_refresh:
-    dependency: "direct main"
-    description:
-      name: easy_refresh
-      sha256: "486e30abfcaae66c0f2c2798a10de2298eb9dc5e0bb7e1dba9328308968cae0c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.0"
-  equatable:
-    dependency: transitive
-    description:
-      name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.5"
-  event_bus:
-    dependency: "direct main"
-    description:
-      name: event_bus
-      sha256: "44baa799834f4c803921873e7446a2add0f3efa45e101a054b1f0ab9b95f8edc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  extended_image:
-    dependency: transitive
-    description:
-      name: extended_image
-      sha256: d7f091d068fcac7246c4b22a84b8dac59a62e04d29a5c172710c696e67a22f94
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.2.0"
-  extended_image_library:
-    dependency: transitive
-    description:
-      name: extended_image_library
-      sha256: c9caee8fe9b6547bd41c960c4f2d1ef8e34321804de6a1777f1d614a24247ad6
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.4"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
-  file_selector_linux:
-    dependency: transitive
-    description:
-      name: file_selector_linux
-      sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.2+1"
-  file_selector_macos:
-    dependency: transitive
-    description:
-      name: file_selector_macos
-      sha256: b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.3+3"
-  file_selector_platform_interface:
-    dependency: transitive
-    description:
-      name: file_selector_platform_interface
-      sha256: "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.1"
-  file_selector_windows:
-    dependency: transitive
-    description:
-      name: file_selector_windows
-      sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.3+1"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  fluro:
-    dependency: "direct main"
-    description:
-      name: fluro
-      sha256: "24d07d0b285b213ec2045b83e85d076185fa5c23651e44dae0ac6755784b97d0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.5"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_cache_manager:
-    dependency: "direct main"
-    description:
-      name: flutter_cache_manager
-      sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.1"
-  flutter_datetime_picker_plus:
-    dependency: "direct main"
-    description:
-      name: flutter_datetime_picker_plus
-      sha256: "7d82da02c4e070bb28a9107de119ad195e2319b45c786fecc13482a9ffcc51da"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  flutter_draggable_gridview:
-    dependency: "direct main"
-    description:
-      name: flutter_draggable_gridview
-      sha256: "414b91a2d0d580aba6e16b7012962989114e4e30683a9c0193f7cca7dd494740"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.11"
-  flutter_easyloading:
-    dependency: "direct main"
-    description:
-      name: flutter_easyloading
-      sha256: ba21a3c883544e582f9cc455a4a0907556714e1e9cf0eababfcb600da191d17c
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.5"
-  flutter_html:
-    dependency: "direct main"
-    description:
-      name: flutter_html
-      sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0-beta.2"
-  flutter_image_compress:
-    dependency: "direct main"
-    description:
-      name: flutter_image_compress
-      sha256: "4edadb0ca2f957b85190e9c3aa728569b91b64b6e06e0eec5b622d47a8692ab2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  flutter_image_compress_common:
-    dependency: transitive
-    description:
-      name: flutter_image_compress_common
-      sha256: "7f79bc6c8a363063620b4e372fa86bc691e1cb28e58048cd38e030692fbd99ee"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.5"
-  flutter_image_compress_macos:
-    dependency: transitive
-    description:
-      name: flutter_image_compress_macos
-      sha256: "26df6385512e92b3789dc76b613b54b55c457a7f1532e59078b04bf189782d47"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  flutter_image_compress_ohos:
-    dependency: transitive
-    description:
-      name: flutter_image_compress_ohos
-      sha256: "70360371698be994786e5dd2e364a6525b1c5a4f843bff8af9b8a2fbe808d8d8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.2"
-  flutter_image_compress_platform_interface:
-    dependency: transitive
-    description:
-      name: flutter_image_compress_platform_interface
-      sha256: "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.5"
-  flutter_image_compress_web:
-    dependency: transitive
-    description:
-      name: flutter_image_compress_web
-      sha256: f02fe352b17f82b72f481de45add240db062a2585850bea1667e82cc4cd6c311
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.4+1"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  flutter_localizations:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_pickers:
-    dependency: "direct main"
-    description:
-      name: flutter_pickers
-      sha256: f38a9d9229afed75f76bae64e628b78b9c20194873e3c141783523cf21ac8a95
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.9"
-  flutter_plugin_android_lifecycle:
-    dependency: transitive
-    description:
-      name: flutter_plugin_android_lifecycle
-      sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.17"
-  flutter_qq_ads:
-    dependency: "direct main"
-    description:
-      name: flutter_qq_ads
-      sha256: fcaee492aa6ab3a5dc1ac2e2efab428fc145824c87be95ea059fed9ce9ebb1c6
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.8.0"
-  flutter_screenutil:
-    dependency: "direct main"
-    description:
-      name: flutter_screenutil
-      sha256: "8cf100b8e4973dc570b6415a2090b0bfaa8756ad333db46939efc3e774ee100d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.9.0"
-  flutter_sound:
-    dependency: "direct main"
-    description:
-      name: flutter_sound
-      sha256: "1f40b26b92907a433afe877c927cd48f5a2e4d0f7188e5d39eb5756008aa51ab"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.6.0"
-  flutter_sound_platform_interface:
-    dependency: transitive
-    description:
-      name: flutter_sound_platform_interface
-      sha256: "2e218521d8187b9a4c65063ad9c79bfe88119531ff68047a2eaa6b027cb276bb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.6.0"
-  flutter_sound_web:
-    dependency: transitive
-    description:
-      name: flutter_sound_web
-      sha256: "5013a15e4e69a4bdc8badd729130eef43c3305e30ba8e6933f863436ce969932"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.6.0"
-  flutter_spinkit:
-    dependency: transitive
-    description:
-      name: flutter_spinkit
-      sha256: b39c753e909d4796906c5696a14daf33639a76e017136c8d82bf3e620ce5bb8e
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.2.0"
-  flutter_svg:
-    dependency: transitive
-    description:
-      name: flutter_svg
-      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.10+1"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_widget_from_html:
-    dependency: "direct main"
-    description:
-      name: flutter_widget_from_html
-      sha256: e79144d8a37b7d1075fc1fdebc32708bd142ad9fdf1c7d9444f5e964cc03158b
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.1"
-  flutter_widget_from_html_core:
-    dependency: transitive
-    description:
-      name: flutter_widget_from_html_core
-      sha256: df7c7c9e5ea144f7ab0adfbad733b4d4f7d408ab733c94e6e9fdcb327af92aa1
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.1"
-  fluttertoast:
-    dependency: "direct main"
-    description:
-      name: fluttertoast
-      sha256: dfdde255317af381bfc1c486ed968d5a43a2ded9c931e87cbecd88767d6a71c1
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.2.4"
-  fluwx:
-    dependency: "direct main"
-    description:
-      name: fluwx
-      sha256: "485b19e75f78d1b2ba867bc36d9e726fd236de6fb0f7587e5eaa840e1bef1a4c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.13.1"
-  fwfh_cached_network_image:
-    dependency: transitive
-    description:
-      name: fwfh_cached_network_image
-      sha256: "8e44226801bfba27930673953afce8af44da7e92573be93f60385d9865a089dd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.14.3"
-  fwfh_chewie:
-    dependency: transitive
-    description:
-      name: fwfh_chewie
-      sha256: "37bde9cedfb6dc5546176f7f0c56af1e814966cb33ec58f16c9565ed93ccb704"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.14.8"
-  fwfh_just_audio:
-    dependency: transitive
-    description:
-      name: fwfh_just_audio
-      sha256: "4ff7927619ff4855567a61e126269e1fef985a9fe7e78682592da17bf658aabb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.1"
-  fwfh_svg:
-    dependency: transitive
-    description:
-      name: fwfh_svg
-      sha256: c6bb6b513f7ce2766aba76d7276caf9a96b6fee729ac3a492c366a42f82ef02e
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.8.2"
-  fwfh_url_launcher:
-    dependency: transitive
-    description:
-      name: fwfh_url_launcher
-      sha256: b9f5d55a5ae2c2c07243ba33f7ba49ac9544bdb2f4c16d8139df9ccbebe3449c
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.1"
-  fwfh_webview:
-    dependency: transitive
-    description:
-      name: fwfh_webview
-      sha256: "2cd2b1e463ddaf26b7d4f74e1a855126c4a836fdaff9551636693e07a07422b6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.1"
-  get:
-    dependency: "direct main"
-    description:
-      name: get
-      sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.6.6"
-  gradient_borders:
-    dependency: transitive
-    description:
-      name: gradient_borders
-      sha256: "69eeaff519d145a4c6c213ada1abae386bcc8981a4970d923e478ce7ba19e309"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.4"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  http_client_helper:
-    dependency: transitive
-    description:
-      name: http_client_helper
-      sha256: "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  image:
-    dependency: "direct main"
-    description:
-      name: image
-      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.0"
-  image_cropper:
-    dependency: "direct main"
-    description:
-      name: image_cropper
-      sha256: f4bad5ed2dfff5a7ce0dfbad545b46a945c702bb6182a921488ef01ba7693111
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.1"
-  image_cropper_for_web:
-    dependency: transitive
-    description:
-      name: image_cropper_for_web
-      sha256: "865d798b5c9d826f1185b32e5d0018c4183ddb77b7b82a931e1a06aa3b74974e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  image_cropper_platform_interface:
-    dependency: transitive
-    description:
-      name: image_cropper_platform_interface
-      sha256: ee160d686422272aa306125f3b6fb1c1894d9b87a5e20ed33fa008e7285da11e
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  image_gallery_saver:
-    dependency: "direct main"
-    description:
-      name: image_gallery_saver
-      sha256: "0aba74216a4d9b0561510cb968015d56b701ba1bd94aace26aacdd8ae5761816"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  image_picker:
-    dependency: "direct main"
-    description:
-      name: image_picker
-      sha256: "26222b01a0c9a2c8fe02fc90b8208bd3325da5ed1f4a2acabf75939031ac0bdd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.7"
-  image_picker_android:
-    dependency: transitive
-    description:
-      name: image_picker_android
-      sha256: ecdc963d2aa67af5195e723a40580f802d4392e31457a12a562b3e2bd6a396fe
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.8.9+1"
-  image_picker_for_web:
-    dependency: transitive
-    description:
-      name: image_picker_for_web
-      sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  image_picker_ios:
-    dependency: transitive
-    description:
-      name: image_picker_ios
-      sha256: eac0a62104fa12feed213596df0321f57ce5a572562f72a68c4ff81e9e4caacf
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.8.9"
-  image_picker_linux:
-    dependency: transitive
-    description:
-      name: image_picker_linux
-      sha256: "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+1"
-  image_picker_macos:
-    dependency: transitive
-    description:
-      name: image_picker_macos
-      sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+1"
-  image_picker_platform_interface:
-    dependency: transitive
-    description:
-      name: image_picker_platform_interface
-      sha256: ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.9.1"
-  image_picker_windows:
-    dependency: transitive
-    description:
-      name: image_picker_windows
-      sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+1"
-  in_app_purchase:
-    dependency: "direct main"
-    description:
-      name: in_app_purchase
-      sha256: bdda02b5b11b56d5e29c7f0c57c433db3452b0c8ce1c37cbfcf1de52946efd9f
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.11"
-  in_app_purchase_android:
-    dependency: transitive
-    description:
-      name: in_app_purchase_android
-      sha256: c4b84caa4e2c7ffebda444c5033fd8423cc3a45a6e1066929bbbcd4daf665db5
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0+15"
-  in_app_purchase_platform_interface:
-    dependency: transitive
-    description:
-      name: in_app_purchase_platform_interface
-      sha256: "5168afbc54f406f741252b66d41872c1193a0066a6edcb587176290b92e2d537"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.6"
-  in_app_purchase_storekit:
-    dependency: transitive
-    description:
-      name: in_app_purchase_storekit
-      sha256: "29526f5ce85bd908b4cacdadb2e8ef299bccbb516b90d2881805343f868502ab"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.7"
-  intersperse:
-    dependency: transitive
-    description:
-      name: intersperse
-      sha256: "2f8a905c96f6cbba978644a3d5b31b8d86ddc44917662df7d27a61f3df66a576"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.18.1"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
-  json_annotation:
-    dependency: transitive
-    description:
-      name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.8.1"
-  just_audio:
-    dependency: transitive
-    description:
-      name: just_audio
-      sha256: ee50602364ba83fa6308f5512dd560c713ec3e1f2bc75f0db43618f0d82ef71a
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.39"
-  just_audio_platform_interface:
-    dependency: transitive
-    description:
-      name: just_audio_platform_interface
-      sha256: "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.0"
-  just_audio_web:
-    dependency: transitive
-    description:
-      name: just_audio_web
-      sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.11"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.0"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  list_counter:
-    dependency: transitive
-    description:
-      name: list_counter
-      sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  logger:
-    dependency: transitive
-    description:
-      name: logger
-      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.0"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  lottie:
-    dependency: "direct main"
-    description:
-      name: lottie
-      sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.2"
-  macos_ui:
-    dependency: "direct main"
-    description:
-      name: macos_ui
-      sha256: cc499122655c61728185561e9006af4b239f9526f98d7b2cbf42124e9044a0ff
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
-  macos_window_utils:
-    dependency: transitive
-    description:
-      name: macos_window_utils
-      sha256: b3dfd47bbc605f0e315af684b50370a8f84932267aaa542098063fa384d593bd
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.16+1"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.8.0"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.0"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  nm:
-    dependency: transitive
-    description:
-      name: nm
-      sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.0"
-  octo_image:
-    dependency: transitive
-    description:
-      name: octo_image
-      sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  package_info_plus:
-    dependency: "direct main"
-    description:
-      name: package_info_plus
-      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.0"
-  package_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: package_info_plus_platform_interface
-      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.0"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  path_provider:
-    dependency: "direct main"
-    description:
-      name: path_provider
-      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  path_provider_android:
-    dependency: transitive
-    description:
-      name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.2"
-  path_provider_foundation:
-    dependency: transitive
-    description:
-      name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.0"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  permission_handler:
-    dependency: "direct main"
-    description:
-      name: permission_handler
-      sha256: "45ff3fbcb99040fde55c528d5e3e6ca29171298a85436274d49c6201002087d6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.2.0"
-  permission_handler_android:
-    dependency: transitive
-    description:
-      name: permission_handler_android
-      sha256: "758284a0976772f9c744d6384fc5dc4834aa61e3f7aa40492927f244767374eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "12.0.3"
-  permission_handler_apple:
-    dependency: transitive
-    description:
-      name: permission_handler_apple
-      sha256: c6bf440f80acd2a873d3d91a699e4cc770f86e7e6b576dda98759e8b92b39830
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.3.0"
-  permission_handler_html:
-    dependency: transitive
-    description:
-      name: permission_handler_html
-      sha256: "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.1"
-  permission_handler_platform_interface:
-    dependency: transitive
-    description:
-      name: permission_handler_platform_interface
-      sha256: "5c43148f2bfb6d14c5a8162c0a712afe891f2d847f35fcff29c406b37da43c3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
-  permission_handler_windows:
-    dependency: transitive
-    description:
-      name: permission_handler_windows
-      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
-  photo_manager:
-    dependency: transitive
-    description:
-      name: photo_manager
-      sha256: df594f989f0c31cdb3ed48f3d49cb9ffadf11cc3700d2c3460b1912c93432621
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  photo_manager_image_provider:
-    dependency: transitive
-    description:
-      name: photo_manager_image_provider
-      sha256: "38ef1023dc11de3a8669f16e7c981673b3c5cfee715d17120f4b87daa2cdd0af"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  photo_view:
-    dependency: "direct main"
-    description:
-      name: photo_view
-      sha256: "8036802a00bae2a78fc197af8a158e3e2f7b500561ed23b4c458107685e645bb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.14.0"
-  pin_code_fields:
-    dependency: "direct main"
-    description:
-      name: pin_code_fields
-      sha256: "4c0db7fbc889e622e7c71ea54b9ee624bb70c7365b532abea0271b17ea75b729"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.0.1"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.1"
-  pull_to_refresh:
-    dependency: "direct main"
-    description:
-      name: pull_to_refresh
-      sha256: bbadd5a931837b57739cf08736bea63167e284e71fb23b218c8c9a6e042aad12
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  qr:
-    dependency: transitive
-    description:
-      name: qr
-      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  qr_flutter:
-    dependency: "direct main"
-    description:
-      name: qr_flutter
-      sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
-  recase:
-    dependency: transitive
-    description:
-      name: recase
-      sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
-  reorderable_grid:
-    dependency: "direct main"
-    description:
-      name: reorderable_grid
-      sha256: "0b9cd95ef0f070ef99f92affe9cf85a4aa127099cd1334e5940950ce58cd981d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.10"
-  rxdart:
-    dependency: transitive
-    description:
-      name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.27.7"
-  screenshot:
-    dependency: "direct main"
-    description:
-      name: screenshot
-      sha256: d448f43130f49bc7eead1b267b3ea0291cb2450f037bb0a0ecce7aa4c65e2aee
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  shared_preferences:
-    dependency: "direct main"
-    description:
-      name: shared_preferences
-      sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.3"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  shared_preferences_foundation:
-    dependency: transitive
-    description:
-      name: shared_preferences_foundation
-      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.0"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  sp_util:
-    dependency: "direct main"
-    description:
-      name: sp_util
-      sha256: "9da43dce5de79c17a787d0626bf01538d63090ca32521200d22a232171c495dc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  sprintf:
-    dependency: transitive
-    description:
-      name: sprintf
-      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
-  sqflite:
-    dependency: transitive
-    description:
-      name: sqflite
-      sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  sqflite_common:
-    dependency: transitive
-    description:
-      name: sqflite_common
-      sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0+2"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  syncfusion_flutter_core:
-    dependency: transitive
-    description:
-      name: syncfusion_flutter_core
-      sha256: "7666506885ebc8f62bb928ad4588a73e20caaff2b2cf2b2b56f67d98f4113525"
-      url: "https://pub.dev"
-    source: hosted
-    version: "24.2.9"
-  syncfusion_flutter_sliders:
-    dependency: "direct main"
-    description:
-      name: syncfusion_flutter_sliders
-      sha256: "54e159dc3cc12c4517ca2b5b0fc78da085edd728adc40c5df949d75fba1af9c2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "24.2.9"
-  synchronized:
-    dependency: transitive
-    description:
-      name: synchronized
-      sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0+1"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.2"
-  umeng_common_sdk:
-    dependency: "direct main"
-    description:
-      name: umeng_common_sdk
-      sha256: "60d7ac8093d42e236dbecb5fc8558b16644808a70d24514ad926be7ddf56d5e9"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.7"
-  umeng_push_sdk:
-    dependency: "direct main"
-    description:
-      name: umeng_push_sdk
-      sha256: "8bde27731f13eb72b1fff13e727bbedcb64c2e8f01963879bf62f42a2cfef68f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  universal_platform:
-    dependency: "direct main"
-    description:
-      name: universal_platform
-      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0+1"
-  url_launcher:
-    dependency: "direct main"
-    description:
-      name: url_launcher
-      sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.2.2"
-  url_launcher_android:
-    dependency: transitive
-    description:
-      name: url_launcher_android
-      sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.2.0"
-  url_launcher_ios:
-    dependency: transitive
-    description:
-      name: url_launcher_ios
-      sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.2.1"
-  url_launcher_linux:
-    dependency: transitive
-    description:
-      name: url_launcher_linux
-      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
-  url_launcher_macos:
-    dependency: transitive
-    description:
-      name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  url_launcher_platform_interface:
-    dependency: transitive
-    description:
-      name: url_launcher_platform_interface
-      sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  url_launcher_web:
-    dependency: transitive
-    description:
-      name: url_launcher_web
-      sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.3"
-  url_launcher_windows:
-    dependency: transitive
-    description:
-      name: url_launcher_windows
-      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.4.2"
-  vector_graphics:
-    dependency: transitive
-    description:
-      name: vector_graphics
-      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.11+1"
-  vector_graphics_codec:
-    dependency: transitive
-    description:
-      name: vector_graphics_codec
-      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.11+1"
-  vector_graphics_compiler:
-    dependency: transitive
-    description:
-      name: vector_graphics_compiler
-      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.11+1"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  video_player:
-    dependency: transitive
-    description:
-      name: video_player
-      sha256: fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.8.2"
-  video_player_android:
-    dependency: transitive
-    description:
-      name: video_player_android
-      sha256: "4dd9b8b86d70d65eecf3dcabfcdfbb9c9115d244d022654aba49a00336d540c2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.12"
-  video_player_avfoundation:
-    dependency: transitive
-    description:
-      name: video_player_avfoundation
-      sha256: "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.6"
-  video_player_platform_interface:
-    dependency: transitive
-    description:
-      name: video_player_platform_interface
-      sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.2.2"
-  video_player_web:
-    dependency: transitive
-    description:
-      name: video_player_web
-      sha256: "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
-      url: "https://pub.dev"
-    source: hosted
-    version: "13.0.0"
-  wakelock_plus:
-    dependency: transitive
-    description:
-      name: wakelock_plus
-      sha256: "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  wakelock_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: wakelock_plus_platform_interface
-      sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.1"
-  webview_flutter:
-    dependency: "direct main"
-    description:
-      name: webview_flutter
-      sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.7.0"
-  webview_flutter_android:
-    dependency: transitive
-    description:
-      name: webview_flutter_android
-      sha256: "3e5f4e9d818086b0d01a66fb1ff9cc72ab0cc58c71980e3d3661c5685ea0efb0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.15.0"
-  webview_flutter_platform_interface:
-    dependency: transitive
-    description:
-      name: webview_flutter_platform_interface
-      sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.10.0"
-  webview_flutter_wkwebview:
-    dependency: transitive
-    description:
-      name: webview_flutter_wkwebview
-      sha256: f12f8d8a99784b863e8b85e4a9a5e3cf1839d6803d2c0c3e0533a8f3c5a992a7
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.13.0"
-  wechat_assets_picker:
-    dependency: "direct main"
-    description:
-      name: wechat_assets_picker
-      sha256: f4b3eb0662f9a9f0453a591f056f5f63244586b772b62b79730a54e501b02671
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.1.0"
-  wechat_picker_library:
-    dependency: transitive
-    description:
-      name: wechat_picker_library
-      sha256: a47cdb227955f64494fe55bc42d91a76bfc626a446075d4284a070f1e1297b4e
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.5.0"
-  win32_registry:
-    dependency: transitive
-    description:
-      name: win32_registry
-      sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.3"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.5.0"
-sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.0"
-
+   AppService().getThemeMode()==1?Brightness.light:AppService().getThemeMode()==2?Brightness.dark:MediaQuery.of(context).platformBrightness.isDark?Brightness.dark:Brightness.dark
 
  */
 

lib/model/ali_oss_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/ali_oss_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/ali_oss_model.g.dart';
 import 'dart:convert';
 
 @JsonSerializable()

lib/module/app_service.dart

@@ -1,13 +1,9 @@
 
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:poetry/common/AC.dart';
-import 'package:poetry/module/home_widget_service.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/common/AC.dart';
+import 'package:iquokka/module/home_widget_service.dart';
+import 'package:iquokka/utils/hex_color.dart';
 import 'package:sp_util/sp_util.dart';
 
-import '../pages/today/main/model/app_config_model.dart';
-
 class AppService {
   static final AppService _singleton = AppService._internal();
   static const String spFirstLaunch = "first_launch";
@@ -104,13 +100,9 @@ class AppService {
     SpUtil.putInt(spThemeMode, modeType);
     HexColor.reload();
 
-    print("isDarkMode = "+Get.isDarkMode.toString());
-
     AC.reload();
 
     HomeWidgetService().updateWidgetTheme();
-
-    //Get.changeThemeMode(modeType==0?ThemeMode.system:modeType==1?ThemeMode.light:ThemeMode.dark);
   }
 
   void setLoginDialog(bool isShow) {
@@ -129,22 +121,4 @@ class AppService {
     return SpUtil.getBool(spIsInitMood, defValue: false)??false;
   }
 
-  // saveAppConfig(List<AppConfigModel> list) {
-  //   for (AppConfigModel model in list) {
-  //     if (model.type == 1) {
-  //       SpUtil.putBool(spIsWeChatPay, model.value);
-  //     }
-  //     else if (model.type == 2) {
-  //       SpUtil.putBool(spIsWeChatLogin, model.value);
-  //     }
-  //   }
-  // }
-
-  // isWeChatPay() {
-  //   return SpUtil.getBool(spIsWeChatPay, defValue: false);
-  // }
-
-  // isWeChatLogin() {
-  //   return SpUtil.getBool(spIsWeChatLogin, defValue: false);
-  // }
 }

lib/module/home_widget_service.dart

@@ -7,17 +7,17 @@ import 'package:flutter/widgets.dart';
 import 'package:home_widget/home_widget.dart';
 import 'package:intl/intl.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:poetry/component/mood_ring.dart';
-import 'package:poetry/module/app_service.dart';
-import 'package:poetry/module/user_service.dart';
-import 'package:poetry/net/http_url.dart';
-import 'package:poetry/net/http_utils.dart';
-import 'package:poetry/pages/my/main/model/mood_stat_model.dart';
-import 'package:poetry/pages/today/main/model/sentence_model.dart';
-import 'package:poetry/pages/today/main/view/sentence_view.dart';
-import 'package:poetry/utils/app_static.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/component/mood_ring.dart';
+import 'package:iquokka/module/app_service.dart';
+import 'package:iquokka/module/user_service.dart';
+import 'package:iquokka/net/http_url.dart';
+import 'package:iquokka/net/http_utils.dart';
+import 'package:iquokka/pages/my/main/model/mood_stat_model.dart';
+import 'package:iquokka/pages/today/main/model/sentence_model.dart';
+import 'package:iquokka/pages/today/main/view/sentence_view.dart';
+import 'package:iquokka/utils/app_static.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/time_util.dart';
 import 'package:universal_platform/universal_platform.dart';
 
 import '../pages/my/mood_analysis/view/widget_calendar_view.dart';

lib/module/user_service.dart

@@ -2,13 +2,13 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/route_manager.dart';
-import 'package:poetry/module/home_widget_service.dart';
-import 'package:poetry/net/http_utils.dart';
-import 'package:poetry/pages/main_binding.dart';
-import 'package:poetry/pages/main_page.dart';
-import 'package:poetry/pages/my/login/page/login_page.dart';
-import 'package:poetry/pages/my/main/model/user_model.dart';
-import 'package:poetry/utils/toast_utils.dart';
+import 'package:iquokka/module/home_widget_service.dart';
+import 'package:iquokka/net/http_utils.dart';
+import 'package:iquokka/pages/main_binding.dart';
+import 'package:iquokka/pages/main_page.dart';
+import 'package:iquokka/pages/my/login/page/login_page.dart';
+import 'package:iquokka/pages/my/main/model/user_model.dart';
+import 'package:iquokka/utils/toast_utils.dart';
 import 'package:sp_util/sp_util.dart';
 import 'package:umeng_common_sdk/umeng_common_sdk.dart';
 
@@ -42,7 +42,6 @@ class UserService {
         ToastUtil.showMsg("登录成功");
         AppService().setPwdLock("");
         SpUtil.putObject(spUserInfo, ret.data!);
-        //AppEvent.getInstance()?.fire(LoginOrLogoutSucceedEvent());
         _backPage();
         UserModel userModel = ret.data!;
         UmengCommonSdk.onProfileSignIn(userModel.quokkaId??"");
@@ -68,7 +67,6 @@ class UserService {
         ToastUtil.showMsg("登录成功");
         AppService().setPwdLock("");
         SpUtil.putObject(spUserInfo, ret.data!);
-        //AppEvent.getInstance()?.fire(LoginOrLogoutSucceedEvent());
         _backPage();
 
         UserModel userModel = ret.data!;
@@ -76,20 +74,12 @@ class UserService {
 
         HomeWidgetService().updateLoginState();
       } else {
-        //eventBus.fire(LoginEvent(false, ret.msg, null));
-        //AppEvent.getInstance()?.fire(ReloadUserInfoEvent());
         ToastUtil.showMsg(ret.msg??"");
       }
     });
   }
 
   void _backPage() {
-    // Get.until((route) {
-    //   if (route.settings.name == "/CaptchaPage" || route.settings.name == "/LoginPage") {
-    //     return false;
-    //   }
-    //   return true;
-    // });
     Get.offAll(()=> MainPage(), binding: MainBinding());
   }
 
@@ -111,8 +101,6 @@ class UserService {
 
   logout() {
     SpUtil.remove(spUserInfo);
-    //eventBus.fire(LogoutEvent());
-    //AppEvent.getInstance()?.fire(LoginOrLogoutSucceedEvent());
     AppService().setPwdLock("");
     UmengCommonSdk.onProfileSignOff();
     Get.offAll(()=>LoginPage());
@@ -131,19 +119,6 @@ class UserService {
   // 判断是否登录，没有登录加弹窗提示跳转登录
   Future<bool> isLoginToLoginPage({bool? isHideDialog}) async {
     if (!this.isLogin()) {
-      // final result = await showOkCancelAlertDialog(
-      //   context: Get.context!,
-      //   title: "您没有登录，是否去登录",
-      //   message: "",
-      //   cancelLabel: "取消",
-      //   okLabel: "去登录",
-      //   isDestructiveAction: true,
-      //   style: AdaptiveStyle.iOS,
-      // );
-      // if (result == OkCancelResult.ok) {
-      //   Get.to(()=>LoginPage());
-      // }
-
       if (isHideDialog??false) {
         Get.to(()=>LoginPage());
       }
@@ -163,96 +138,4 @@ class UserService {
     return true;
   }
 
-}
-
-
-/*
-
-class UserService {
-  static final UserService _singleton = UserService._internal();
-  static const String spUserInfo = "user_info";
-
-  factory UserService() {
-    return _singleton;
-  }
-
-  UserService._internal();
-
-  isLogin() async{
-    UserModel? entity = await getUserInfo();
-    return entity == null ? false : true;
-  }
-
-  loginByWx(String code) {
-    HttpUtils.post<UserModel>("/user/loginByWx",
-        queryParameters: {"code": code}).then((ret) {
-      if (ret.isSuccess() && ret.data != null) {
-        SpUtil.putObject(spUserInfo, ret.data!);
-        eventBus.fire(LoginEvent(true, ret.msg, ret.data));
-      } else {
-        eventBus.fire(LoginEvent(false, ret.msg, null));
-      }
-    });
-  }
-
-  loginByPhone(String phone, String captcha) {
-    HttpUtils.post<UserModel>("/user/loginByPhone",
-        queryParameters: {"phone": phone, "captcha": captcha}).then((ret) async {
-      if (ret.isSuccess() && ret.data != null) {
-        //SpUtil.putObject(spUserInfo, ret.data!);
-
-        UserModel userModel = ret.data!;
-
-        SharedPreferences shared = await SharedPreferences.getInstance();
-        shared.setString(spUserInfo, jsonEncode(userModel));
-
-        eventBus.fire(LoginEvent(true, ret.msg, ret.data));
-      } else {
-        eventBus.fire(LoginEvent(false, ret.msg, null));
-      }
-    });
-
-  }
-
-  Future<UserModel?> getUserInfo() async{
-    // return await SpUtil.getObj<UserModel?>(spUserInfo, (v) {
-    //   Map<String, dynamic> converted = {};
-    //   for (var item in v.keys) {
-    //     converted[item.toString()] = v[item];
-    //   }
-    //   //return UserModel.fromJson(converted);
-    //   return JsonConvert.fromJsonAsT<UserModel>(converted);
-    // });
-
-    SharedPreferences shared = await SharedPreferences.getInstance();
-    String userInfo = shared.getString(spUserInfo)??"";
-    if (userInfo.isNotEmpty) {
-      return JsonConvert.fromJsonAsT<UserModel>(jsonDecode(userInfo));
-    }
-    return UserModel();
-  }
-
-  getToken() async {
-    UserModel? entity = await getUserInfo();
-    return entity?.token ?? "";
-  }
-
-  logout() {
-    SpUtil.remove(spUserInfo);
-    eventBus.fire(LogoutEvent());
-  }
-
-  // void updateUserInfo(String? nickName, String? avatarUrl) async{
-  //   UserModel userInfo = await getUserInfo();
-  //   userInfo.nickName = nickName;
-  //   userInfo.avatar = avatarUrl;
-  //   SpUtil.putObject(spUserInfo, userInfo);
-  // }
-
-
-
-
-
-}
-
- */
+}

lib/net/dio_manager.dart

@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
-import 'package:poetry/net/http_config.dart';
-import 'package:poetry/net/request_interceptor.dart';
+import 'package:iquokka/net/http_config.dart';
+import 'package:iquokka/net/request_interceptor.dart';
 
 class DioManager {
 
@@ -14,11 +14,7 @@ class DioManager {
     _initDio();
   }
 
-  ///
-  ///
   /// 完成DIO的基础配置
-  ///
-
   void _initDio() {
     dio = Dio(HttpConfig.options);
     dio.interceptors.add(RequestInterceptor());

lib/net/http_utils.dart

@@ -1,18 +1,17 @@
 import 'package:dio/dio.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:poetry/module/user_service.dart';
-import 'package:poetry/net/dio_manager.dart';
-import 'package:poetry/net/result.dart';
+import 'package:iquokka/module/user_service.dart';
+import 'package:iquokka/net/dio_manager.dart';
+import 'package:iquokka/net/result.dart';
+import 'package:logger/logger.dart';
 import 'package:universal_platform/universal_platform.dart';
 
 const String methodPost = 'post';
 const String methodGet = 'get';
 
 class HttpUtils {
-  ///
+
   /// get 请求
-  ///
-  ///
   static Future<Result<T>> get<T>(String path,
       {Map<String, dynamic>? queryParameters,
       Options? options,
@@ -22,10 +21,8 @@ class HttpUtils {
         onReceiveProgress);
   }
 
-  ///
+
   /// post 请求
-  ///
-  ///
   static Future<Result<T>> post<T>(
     String path, {
     Map<String, dynamic>? queryParameters,
@@ -38,9 +35,7 @@ class HttpUtils {
         cancelToken, onReceiveProgress);
   }
 
-  ///
   ///统一发送请求预计返回值统一处理
-  ///
   static Future<Result<T>> _sendRequest<T>(
     String method,
     String path,
@@ -52,10 +47,10 @@ class HttpUtils {
   ) async {
 
     if ((queryParameters??{}).isNotEmpty) {
-      print("请求：${path}     参数：$queryParameters");
+      Logger().i("请求：${path}     参数：$queryParameters");
     }
     else {
-      print("请求：${path}     参数：$data");
+      Logger().i("请求：${path}     参数：$data");
     }
 
     var dio = DioManager().dio;
@@ -74,8 +69,8 @@ class HttpUtils {
                 contentType: UniversalPlatform.isWeb?Headers.formUrlEncodedContentType:Headers.jsonContentType,
             ));
       }
-      print("baseurl = " + dio.options.baseUrl);
-      print("请求结果：${path}\njsonString == ${rsp?.data}");
+      Logger().i("baseurl = " + dio.options.baseUrl);
+      Logger().i("请求结果：${path}\njsonString == ${rsp?.data}");
       if (rsp == null) return Result.error('未知错误', codeErrorUnknown);
       return _handleResponse(rsp);
     } catch (err) {
@@ -84,9 +79,7 @@ class HttpUtils {
     }
   }
 
-  ///
   /// 统一处理解析数据
-  ///
   static Result<T> _handleResponse<T>(Response response) {
 
     if (_isSuccess(response.statusCode)) {
@@ -116,9 +109,7 @@ class HttpUtils {
     return (statusCode != null && statusCode >= 200 && statusCode < 300);
   }
 
-  ///
   /// 统一处理异常-返回错误信息
-  ///
   static String _handleException(ex) {
     EasyLoading.dismiss();
     if (ex is DioError) {

lib/net/request_interceptor.dart

@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:poetry/module/user_service.dart';
+import 'package:iquokka/module/user_service.dart';
 
 class RequestInterceptor extends Interceptor {
   @override

lib/net/result.dart

@@ -1,4 +1,4 @@
-import 'package:poetry/generated/json/base/json_convert_content.dart';
+import 'package:iquokka/generated/json/base/json_convert_content.dart';
 
 const codeResponseSuccess = 200;
 const codeErrorUnknown = -1;

lib/pages/explore/main/controller/discover_ctrl.dart

@@ -1,11 +1,13 @@
 
 import 'dart:async';
 
+
 import 'package:carousel_slider/carousel_controller.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/explore/main/model/banner_model.dart';
-import 'package:poetry/pages/explore/main/model/discover_model.dart';
+import 'package:iquokka/pages/explore/main/model/banner_model.dart';
+import 'package:iquokka/pages/explore/main/model/discover_model.dart';
 
 import '../../../../net/http_url.dart';
 import '../../../../net/http_utils.dart';
@@ -22,7 +24,7 @@ class DiscoverCtrl extends GetxController {
   StreamSubscription? _appEnterForegroundEvent;
   bool isPageDataRequestFailed = false; //页面数据是否请求成功
   bool isRecommedRequestComplete = false;
-  CarouselController carouselController = CarouselController();
+  CarouselSliderController carouselController = CarouselSliderController();
   int bannerIndex = 0;
 
   @override

lib/pages/explore/main/model/banner_model.dart

@@ -1,7 +1,7 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/banner_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/banner_model.g.dart';
 import 'dart:convert';
-export 'package:poetry/generated/json/banner_model.g.dart';
+export 'package:iquokka/generated/json/banner_model.g.dart';
 
 @JsonSerializable()
 class BannerModel {

lib/pages/explore/main/model/discover_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/discover_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/discover_model.g.dart';
 import 'dart:convert';
 
 import '../../../today/favorite/model/favorite_model.dart';

lib/pages/explore/main/page/banner_subdetail_page.dart

@@ -2,7 +2,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:poetry/base/base_state.dart';
 
 import '../../../../gen_a/A.dart';
 import '../../../../utils/base_app_bar.dart';

lib/pages/explore/main/page/banner_web_page.dart

@@ -1,7 +1,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:poetry/base/base_state.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 import '../../../../utils/base_app_bar.dart';

lib/pages/explore/main/page/discover_page.dart

@@ -1,17 +1,16 @@
-import 'package:cached_network_image/cached_network_image.dart';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/component/mood_ring.dart';
-import 'package:poetry/pages/explore/main/view/bottom_feedback_view.dart';
-import 'package:poetry/pages/explore/main/view/discover_all_view.dart';
-import 'package:poetry/pages/explore/main/view/discover_banner_view.dart';
-import 'package:poetry/pages/explore/search/page/search_page.dart';
-import 'package:poetry/pages/explore/skeleton/view/explore_skeleton.dart';
-import 'package:poetry/pages/today/favorite/page/favorite_page.dart';
-import 'package:poetry/pages/today/main/view/home_group_header_view.dart';
-import 'package:poetry/pages/today/main/view/home_recommend_cell.dart';
+import 'package:iquokka/pages/explore/main/view/bottom_feedback_view.dart';
+import 'package:iquokka/pages/explore/main/view/discover_all_view.dart';
+import 'package:iquokka/pages/explore/main/view/discover_banner_view.dart';
+import 'package:iquokka/pages/explore/search/page/search_page.dart';
+import 'package:iquokka/pages/explore/skeleton/view/explore_skeleton.dart';
+import 'package:iquokka/pages/today/favorite/page/favorite_page.dart';
+import 'package:iquokka/pages/today/main/view/home_group_header_view.dart';
+import 'package:iquokka/pages/today/main/view/home_recommend_cell.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../common/empty_data_page.dart';
@@ -91,11 +90,6 @@ class DiscoverPage extends GetView<DiscoverCtrl> {
                       Get.to(()=>SearchPage(showType: 1,));
                     },
                   ),
-                  // systemOverlayStyle: SystemUiOverlayStyle(
-                  //   statusBarColor: Colors.transparent,
-                  //   systemNavigationBarColor: HexColor("#FDFBF7"),
-                  //   systemNavigationBarDividerColor: HexColor("#FDFBF7"),
-                  // ),
                 ),
               )
           ),
@@ -208,8 +202,6 @@ class DiscoverPage extends GetView<DiscoverCtrl> {
                                     child: HomeGroupHeaderView(title: discoverModel.title??""),
                                   ),
                                   Container(
-                                      //margin: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 0),
-                                      // padding: EdgeInsets.only(left: 20.w),
                                       height: 160.w,
                                       child: GridView.builder(
                                           physics: BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),

lib/pages/explore/main/view/bottom_feedback_view.dart

@@ -2,8 +2,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/setting/page/feedback_page.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/pages/my/setting/page/feedback_page.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../../gen_a/A.dart';
 

lib/pages/explore/main/view/discover_all_view.dart

@@ -1,7 +1,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../../gen_a/A.dart';
 

lib/pages/explore/main/view/discover_banner_view.dart

@@ -4,11 +4,11 @@ import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/explore/main/controller/discover_ctrl.dart';
-import 'package:poetry/pages/explore/main/model/banner_model.dart';
-import 'package:poetry/pages/explore/main/page/banner_subdetail_page.dart';
-import 'package:poetry/pages/explore/main/page/banner_web_page.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/pages/explore/main/controller/discover_ctrl.dart';
+import 'package:iquokka/pages/explore/main/model/banner_model.dart';
+import 'package:iquokka/pages/explore/main/page/banner_subdetail_page.dart';
+import 'package:iquokka/pages/explore/main/page/banner_web_page.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
@@ -100,7 +100,7 @@ class DiscoverBannerView extends GetView<DiscoverCtrl> {
 
   void toNextPage(BannerModel bannerModel) {
 
-    // 1网页，2app链接，3二级页面
+    /// 1网页，2app链接，3二级页面
     if (bannerModel.type == 1) {
       Get.to(()=>BannerWebPage(webUrl: bannerModel.url??""));
     }

lib/pages/explore/search/model/search_hot_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/search_hot_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/search_hot_model.g.dart';
 import 'dart:convert';
 
 @JsonSerializable()

lib/pages/explore/search/page/search_page.dart

@@ -4,9 +4,9 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/utils/base_app_bar.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/image_button.dart';
+import 'package:iquokka/utils/base_app_bar.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/image_button.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../../../../common/AC.dart';

lib/pages/footprint/main/controller/footprint_ctrl.dart

@@ -4,8 +4,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/footprint/main/model/footprint_model.dart';
-import 'package:poetry/pages/my/mood_analysis/model/mood_record_history_model.dart';
+import 'package:iquokka/pages/footprint/main/model/footprint_model.dart';
+import 'package:iquokka/pages/my/mood_analysis/model/mood_record_history_model.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import '../../../../net/http_url.dart';

lib/pages/footprint/main/model/footprint_model.dart

@@ -1,9 +1,9 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/footprint_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/footprint_model.g.dart';
 import 'dart:convert';
 
 import '../../../my/mood_analysis/model/mood_record_history_model.dart';
-export 'package:poetry/generated/json/footprint_model.g.dart';
+export 'package:iquokka/generated/json/footprint_model.g.dart';
 
 @JsonSerializable()
 class FootprintModel {

lib/pages/footprint/main/page/footprint_page.dart

@@ -3,10 +3,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/footprint/main/controller/footprint_ctrl.dart';
-import 'package:poetry/pages/footprint/main/model/footprint_model.dart';
-import 'package:poetry/pages/footprint/main/page/footprint_sift_page.dart';
-import 'package:poetry/pages/my/mood_analysis/model/mood_record_history_model.dart';
+import 'package:iquokka/pages/footprint/main/controller/footprint_ctrl.dart';
+import 'package:iquokka/pages/footprint/main/model/footprint_model.dart';
+import 'package:iquokka/pages/footprint/main/page/footprint_sift_page.dart';
+import 'package:iquokka/pages/my/mood_analysis/model/mood_record_history_model.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import '../../../../common/AC.dart';

lib/pages/footprint/main/page/footprint_sift_page.dart

@@ -2,9 +2,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/utils/base_app_bar.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/utils/base_app_bar.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/time_util.dart';
 
 
 class FootprintSiftPage extends StatefulWidget {

lib/pages/guide_page.dart

@@ -3,34 +3,21 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/main_binding.dart';
-import 'package:poetry/pages/main_page.dart';
-import 'package:poetry/utils/base_app_bar.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:umeng_common_sdk/umeng_common_sdk.dart';
-import 'package:universal_platform/universal_platform.dart';
+import 'package:iquokka/pages/main_binding.dart';
+import 'package:iquokka/pages/main_page.dart';
+import 'package:iquokka/utils/base_app_bar.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
-import '../config/env_config.dart';
-import '../constant/color_constant.dart';
-import '../constant/um_constant.dart';
 import '../gen_a/A.dart';
 import '../module/app_service.dart';
 import '../module/user_service.dart';
 import '../routers/app_routers.dart';
-import '../utils/app_event.dart';
 import 'my/login/page/login_page.dart';
 
 class GuidePage extends StatefulWidget {
 
-  // GuidePage({
-  //   required this.index
-  // });
-  //
-  // int index;
-
   @override
   _GuideState createState() => _GuideState();
 }
@@ -288,7 +275,7 @@ class _GuideState extends State<GuidePage> {
                           text: "《用户协议》",
                           style: TextStyle(
                             fontSize: 16.w,
-                            color: ColorConstant.primaryColor,
+                            color: HexColor.QUOKKA_LIGHT_BTN,
                             fontWeight: FontWeight.w400,
                           )
                       ),
@@ -308,7 +295,7 @@ class _GuideState extends State<GuidePage> {
                           text: "《隐私政策》",
                           style: TextStyle(
                             fontSize: 16.w,
-                            color: ColorConstant.primaryColor,
+                            color: HexColor.QUOKKA_LIGHT_BTN,
                             fontWeight: FontWeight.w400,
                           )
                       ),

lib/pages/main_binding.dart

@@ -1,9 +1,9 @@
 import 'package:get/get.dart';
-import 'package:poetry/pages/explore/main/controller/discover_ctrl.dart';
-import 'package:poetry/pages/footprint/main/controller/footprint_ctrl.dart';
-import 'package:poetry/pages/main_ctrl.dart';
-import 'package:poetry/pages/my/main/controller/mine_ctrl.dart';
-import 'package:poetry/pages/today/main/controller/home_ctrl.dart';
+import 'package:iquokka/pages/explore/main/controller/discover_ctrl.dart';
+import 'package:iquokka/pages/footprint/main/controller/footprint_ctrl.dart';
+import 'package:iquokka/pages/main_ctrl.dart';
+import 'package:iquokka/pages/my/main/controller/mine_ctrl.dart';
+import 'package:iquokka/pages/today/main/controller/home_ctrl.dart';
 
 class MainBinding extends Bindings {
   @override

lib/pages/main_ctrl.dart

@@ -8,19 +8,16 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:poetry/module/user_service.dart';
-import 'package:poetry/pages/my/main/model/user_model.dart';
-import 'package:poetry/pages/today/main/page/home_page.dart';
-import 'package:poetry/routers/app_routers.dart';
-import 'package:poetry/utils/setting_push_tag.dart';
-import 'package:sp_util/sp_util.dart';
+import 'package:iquokka/module/user_service.dart';
+import 'package:iquokka/pages/my/main/model/user_model.dart';
+import 'package:iquokka/pages/today/main/page/home_page.dart';
+import 'package:iquokka/routers/app_routers.dart';
+import 'package:iquokka/utils/setting_push_tag.dart';
 import 'package:umeng_common_sdk/umeng_common_sdk.dart';
 import 'package:umeng_push_sdk/umeng_push_sdk.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 import '../common/AC.dart';
 import '../config/env_config.dart';
-import '../constant/color_constant.dart';
 import '../constant/um_constant.dart';
 import '../module/app_service.dart';
 import '../utils/app_event.dart';
@@ -348,7 +345,7 @@ class MainCtrl extends GetxController {
                           text: "《用户协议》",
                           style: TextStyle(
                               fontSize: 16.w,
-                              color: ColorConstant.primaryColor,
+                              color: HexColor.QUOKKA_LIGHT_BTN,
                             fontWeight: FontWeight.w400,
                           )
                       ),
@@ -368,7 +365,7 @@ class MainCtrl extends GetxController {
                           text: "《隐私政策》",
                           style: TextStyle(
                               fontSize: 16.w,
-                              color: ColorConstant.primaryColor,
+                              color: HexColor.QUOKKA_LIGHT_BTN,
                             fontWeight: FontWeight.w400,
                           )
                       ),

lib/pages/main_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/main_ctrl.dart';
+import 'package:iquokka/pages/main_ctrl.dart';
 import '../utils/hex_color.dart';
 
 class MainPage extends GetView<MainCtrl> {

lib/pages/my/badge/model/badge_detail_model.dart

@@ -1,7 +1,7 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/badge_detail_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/badge_detail_model.g.dart';
 import 'dart:convert';
-export 'package:poetry/generated/json/badge_detail_model.g.dart';
+export 'package:iquokka/generated/json/badge_detail_model.g.dart';
 
 @JsonSerializable()
 class BadgeDetailModel {

lib/pages/my/badge/model/badge_model.dart

@@ -1,9 +1,9 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/badge_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/badge_model.g.dart';
 import 'dart:convert';
 
-import 'package:poetry/pages/my/badge/model/badge_detail_model.dart';
-export 'package:poetry/generated/json/badge_model.g.dart';
+import 'package:iquokka/pages/my/badge/model/badge_detail_model.dart';
+export 'package:iquokka/generated/json/badge_model.g.dart';
 
 @JsonSerializable()
 class BadgeModel {

lib/pages/my/badge/page/badge_all_page.dart

@@ -4,10 +4,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:poetry/pages/my/badge/model/badge_detail_model.dart';
-import 'package:poetry/pages/my/badge/model/badge_model.dart';
-import 'package:poetry/pages/my/badge/view/badge_list_cell.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/pages/my/badge/model/badge_detail_model.dart';
+import 'package:iquokka/pages/my/badge/model/badge_model.dart';
+import 'package:iquokka/pages/my/badge/view/badge_list_cell.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/badge/page/badge_detail_page.dart

@@ -10,12 +10,12 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/badge/model/badge_detail_model.dart';
-import 'package:poetry/pages/my/badge/view/badge_lottie.dart';
-import 'package:poetry/pages/my/badge/view/badge_share_view.dart';
-import 'package:poetry/utils/base_app_bar.dart';
-import 'package:poetry/utils/file_utils.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/pages/my/badge/model/badge_detail_model.dart';
+import 'package:iquokka/pages/my/badge/view/badge_lottie.dart';
+import 'package:iquokka/pages/my/badge/view/badge_share_view.dart';
+import 'package:iquokka/utils/base_app_bar.dart';
+import 'package:iquokka/utils/file_utils.dart';
+import 'package:iquokka/utils/time_util.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/badge/page/badge_tab_page.dart

@@ -2,10 +2,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/badge/page/badge_detail_page.dart';
-import 'package:poetry/pages/my/badge/page/badge_all_page.dart';
-import 'package:poetry/pages/my/badge/page/badge_my_page.dart';
-import 'package:poetry/utils/app_static.dart';
+import 'package:iquokka/pages/my/badge/page/badge_detail_page.dart';
+import 'package:iquokka/pages/my/badge/page/badge_all_page.dart';
+import 'package:iquokka/pages/my/badge/page/badge_my_page.dart';
+import 'package:iquokka/utils/app_static.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/badge/view/badge_list_cell.dart

@@ -3,7 +3,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/route_manager.dart';
-import 'package:poetry/pages/my/badge/page/badge_detail_page.dart';
+import 'package:iquokka/pages/my/badge/page/badge_detail_page.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/badge/view/badge_lottie.dart

@@ -3,16 +3,17 @@ import 'dart:io';
 import 'dart:ui';
 
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:carousel_slider/carousel_controller.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:lottie/lottie.dart';
-import 'package:poetry/pages/my/badge/model/badge_detail_model.dart';
-import 'package:poetry/pages/my/badge/view/badge_share_view.dart';
-import 'package:poetry/utils/base_app_bar.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/pages/my/badge/model/badge_detail_model.dart';
+import 'package:iquokka/pages/my/badge/view/badge_share_view.dart';
+import 'package:iquokka/utils/base_app_bar.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/time_util.dart';
 
 import '../../../../gen_a/A.dart';
 
@@ -37,7 +38,7 @@ class BadgeLottie extends StatefulWidget {
 class _BadgeLottieState extends State<BadgeLottie>
     with SingleTickerProviderStateMixin {
 
-  CarouselController _carouselController = CarouselController();
+  CarouselSliderController _carouselController = CarouselSliderController();
   int _sliderIndex = 0;
 
   late AnimationController _animationController;

lib/pages/my/badge/view/badge_share_view.dart

@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:get/get.dart';
-import 'package:poetry/utils/string_auto_line.dart';
+import 'package:iquokka/utils/string_auto_line.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
 import '../../../../common/AC.dart';

lib/pages/my/lately_record/model/record_detail_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/record_detail_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/record_detail_model.g.dart';
 import 'dart:convert';
 
 @JsonSerializable()

lib/pages/my/lately_record/page/lately_record_page.dart

@@ -3,8 +3,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:poetry/pages/my/lately_record/view/lately_record_cell.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/pages/my/lately_record/view/lately_record_cell.dart';
+import 'package:iquokka/utils/time_util.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import '../../../../net/http_url.dart';

lib/pages/my/lately_record/page/record_detail_page.dart

@@ -6,10 +6,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/lately_record/model/record_detail_model.dart';
-import 'package:poetry/utils/base_app_bar.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/pages/my/lately_record/model/record_detail_model.dart';
+import 'package:iquokka/utils/base_app_bar.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/time_util.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/lately_record/view/lately_record_cell.dart

@@ -2,9 +2,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/lately_record/page/record_detail_page.dart';
-import 'package:poetry/pages/today/practice/bindings/assess_report_binding.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/pages/my/lately_record/page/record_detail_page.dart';
+import 'package:iquokka/pages/today/practice/bindings/assess_report_binding.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../today/favorite/model/favorite_model.dart';
 import '../../../today/main/view/home_recommend_cell.dart';

lib/pages/my/login/page/area_code_page.dart

@@ -2,7 +2,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../../utils/base_app_bar.dart';
 

lib/pages/my/login/page/captcha_page.dart

@@ -7,12 +7,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:pin_code_fields/pin_code_fields.dart';
 
-import 'package:poetry/gen_a/A.dart';
-import 'package:poetry/module/user_service.dart';
-import 'package:poetry/net/http_url.dart';
-import 'package:poetry/net/http_utils.dart';
+import 'package:iquokka/gen_a/A.dart';
+import 'package:iquokka/module/user_service.dart';
+import 'package:iquokka/net/http_url.dart';
+import 'package:iquokka/net/http_utils.dart';
 
-import 'package:poetry/utils/toast_utils.dart';
+import 'package:iquokka/utils/toast_utils.dart';
 import '../../../../common/AC.dart';
 import '../../../../utils/hex_color.dart';
 

lib/pages/my/login/page/login_page.dart

@@ -11,13 +11,13 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluwx/fluwx.dart' as fluwx;
 import 'package:get/get.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-import 'package:poetry/gen_a/A.dart';
-import 'package:poetry/module/app_service.dart';
-import 'package:poetry/module/user_service.dart';
-import 'package:poetry/pages/my/login/page/area_code_page.dart';
-import 'package:poetry/pages/my/login/page/captcha_page.dart';
-import 'package:poetry/pages/my/login/page/privacy_policy_page.dart';
-import 'package:poetry/pages/my/login/page/user_agreement_page.dart';
+import 'package:iquokka/gen_a/A.dart';
+import 'package:iquokka/module/app_service.dart';
+import 'package:iquokka/module/user_service.dart';
+import 'package:iquokka/pages/my/login/page/area_code_page.dart';
+import 'package:iquokka/pages/my/login/page/captcha_page.dart';
+import 'package:iquokka/pages/my/login/page/privacy_policy_page.dart';
+import 'package:iquokka/pages/my/login/page/user_agreement_page.dart';
 import 'package:umeng_push_sdk/umeng_push_sdk.dart';
 import 'package:universal_platform/universal_platform.dart';
 import '../../../../common/AC.dart';

lib/pages/my/login/page/privacy_policy_page.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../../net/http_url.dart';
 import '../../../../net/http_utils.dart';

lib/pages/my/main/bindings/mine_binding.dart

@@ -1,6 +1,6 @@
 
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/main/controller/mine_ctrl.dart';
+import 'package:iquokka/pages/my/main/controller/mine_ctrl.dart';
 
 class MineBinding extends Bindings {
   @override

lib/pages/my/main/bindings/personal_info_binding.dart

@@ -1,6 +1,6 @@
 
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/main/controller/personal_info_ctrl.dart';
+import 'package:iquokka/pages/my/main/controller/personal_info_ctrl.dart';
 
 class PersonalInfoBinding extends Bindings {
   @override

lib/pages/my/main/controller/mine_ctrl.dart

@@ -5,11 +5,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:poetry/module/home_widget_service.dart';
-import 'package:poetry/pages/my/main/model/mood_stat_model.dart';
-import 'package:poetry/pages/my/main/model/user_stat_model.dart';
-import 'package:poetry/utils/app_event.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/module/home_widget_service.dart';
+import 'package:iquokka/pages/my/main/model/mood_stat_model.dart';
+import 'package:iquokka/pages/my/main/model/user_stat_model.dart';
+import 'package:iquokka/utils/app_event.dart';
+import 'package:iquokka/utils/time_util.dart';
 import 'package:sp_util/sp_util.dart';
 
 import '../../../../model/ali_oss_model.dart';

lib/pages/my/main/model/mood_stat_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/mood_stat_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/mood_stat_model.g.dart';
 import 'dart:convert';
 
 @JsonSerializable()

lib/pages/my/main/model/user_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/user_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/user_model.g.dart';
 import 'dart:convert';
 
 @JsonSerializable()

lib/pages/my/main/model/user_stat_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/user_stat_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/user_stat_model.g.dart';
 import 'dart:convert';
 
 @JsonSerializable()

lib/pages/my/main/page/avatar_big_page.dart

@@ -10,10 +10,10 @@ import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:poetry/module/user_service.dart';
-import 'package:poetry/pages/my/main/model/user_model.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/image_picker_cropper.dart';
+import 'package:iquokka/module/user_service.dart';
+import 'package:iquokka/pages/my/main/model/user_model.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/image_picker_cropper.dart';
 import 'package:universal_platform/universal_platform.dart';
 
 import '../../../../common/AC.dart';

lib/pages/my/main/page/mine_page.dart

@@ -4,14 +4,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/explore/skeleton/view/mine_skeleton.dart';
-import 'package:poetry/pages/my/main/controller/mine_ctrl.dart';
-import 'package:poetry/pages/my/main/model/user_model.dart';
-import 'package:poetry/pages/my/main/model/user_stat_model.dart';
-import 'package:poetry/pages/my/main/page/avatar_big_page.dart';
-import 'package:poetry/pages/my/main/page/personal_info_page.dart';
-import 'package:poetry/pages/my/main/view/history_record_view.dart';
-import 'package:poetry/pages/my/setting/page/setting_page.dart';
+import 'package:iquokka/pages/explore/skeleton/view/mine_skeleton.dart';
+import 'package:iquokka/pages/my/main/controller/mine_ctrl.dart';
+import 'package:iquokka/pages/my/main/model/user_model.dart';
+import 'package:iquokka/pages/my/main/model/user_stat_model.dart';
+import 'package:iquokka/pages/my/main/page/avatar_big_page.dart';
+import 'package:iquokka/pages/my/main/page/personal_info_page.dart';
+import 'package:iquokka/pages/my/main/view/history_record_view.dart';
+import 'package:iquokka/pages/my/setting/page/setting_page.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../common/empty_data_page.dart';

lib/pages/my/main/page/personal_info_page.dart

@@ -8,10 +8,10 @@ import 'package:flutter/services.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/main/controller/personal_info_ctrl.dart';
-import 'package:poetry/pages/my/main/view/personal_info_item_view.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/toast_utils.dart';
+import 'package:iquokka/pages/my/main/controller/personal_info_ctrl.dart';
+import 'package:iquokka/pages/my/main/view/personal_info_item_view.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/toast_utils.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/main/view/history_record_view.dart

@@ -5,8 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/pages/my/lately_record/page/lately_record_tab_page.dart';
-import 'package:poetry/pages/today/practice/page/assess_report_page.dart';
+import 'package:iquokka/pages/my/lately_record/page/lately_record_tab_page.dart';
+import 'package:iquokka/pages/today/practice/page/assess_report_page.dart';
 
 import '../../../../gen_a/A.dart';
 import '../../../../utils/hex_color.dart';

lib/pages/my/main/view/mine_info_view.dart

@@ -5,18 +5,18 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/module/app_service.dart';
-import 'package:poetry/pages/my/badge/page/badge_tab_page.dart';
-import 'package:poetry/pages/my/login/page/login_page.dart';
-import 'package:poetry/pages/my/main/bindings/personal_info_binding.dart';
-import 'package:poetry/pages/my/main/controller/mine_ctrl.dart';
-import 'package:poetry/pages/my/main/model/user_model.dart';
-import 'package:poetry/pages/my/main/model/user_stat_model.dart';
-import 'package:poetry/pages/my/main/page/personal_info_page.dart';
-import 'package:poetry/pages/my/vip/page/vip_activated_page.dart';
-import 'package:poetry/utils/app_static.dart';
-import 'package:poetry/utils/base_app_bar.dart';
-import 'package:poetry/utils/image_button.dart';
+import 'package:iquokka/module/app_service.dart';
+import 'package:iquokka/pages/my/badge/page/badge_tab_page.dart';
+import 'package:iquokka/pages/my/login/page/login_page.dart';
+import 'package:iquokka/pages/my/main/bindings/personal_info_binding.dart';
+import 'package:iquokka/pages/my/main/controller/mine_ctrl.dart';
+import 'package:iquokka/pages/my/main/model/user_model.dart';
+import 'package:iquokka/pages/my/main/model/user_stat_model.dart';
+import 'package:iquokka/pages/my/main/page/personal_info_page.dart';
+import 'package:iquokka/pages/my/vip/page/vip_activated_page.dart';
+import 'package:iquokka/utils/app_static.dart';
+import 'package:iquokka/utils/base_app_bar.dart';
+import 'package:iquokka/utils/image_button.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/main/view/mood_stat_view.dart

@@ -2,9 +2,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:poetry/component/mood_bar.dart';
-import 'package:poetry/pages/my/mood_analysis/page/mood_analysis_tab_page.dart';
-import 'package:poetry/pages/my/mood_analysis/view/calendar_view.dart';
+import 'package:iquokka/component/mood_bar.dart';
+import 'package:iquokka/pages/my/mood_analysis/page/mood_analysis_tab_page.dart';
+import 'package:iquokka/pages/my/mood_analysis/view/calendar_view.dart';
 
 import '../../../../gen_a/A.dart';
 import '../../../../module/user_service.dart';

lib/pages/my/main/view/personal_info_item_view.dart

@@ -1,7 +1,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:poetry/utils/hex_color.dart';
+import 'package:iquokka/utils/hex_color.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

lib/pages/my/mood_analysis/model/mood_model.dart

@@ -1,5 +1,5 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/mood_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/mood_model.g.dart';
 import 'dart:convert';
 
 @JsonSerializable()

lib/pages/my/mood_analysis/model/mood_record_history_model.dart

@@ -1,9 +1,9 @@
-import 'package:poetry/generated/json/base/json_field.dart';
-import 'package:poetry/generated/json/mood_record_history_model.g.dart';
+import 'package:iquokka/generated/json/base/json_field.dart';
+import 'package:iquokka/generated/json/mood_record_history_model.g.dart';
 import 'dart:convert';
 
 import 'mood_model.dart';
-export 'package:poetry/generated/json/mood_record_history_model.g.dart';
+export 'package:iquokka/generated/json/mood_record_history_model.g.dart';
 
 @JsonSerializable()
 class MoodRecordHistoryModel {

lib/pages/my/mood_analysis/page/mood_analysis_page.dart

@@ -9,13 +9,13 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:get/get.dart';
-import 'package:poetry/module/user_service.dart';
-import 'package:poetry/pages/my/mood_analysis/view/choose_time_view.dart';
-import 'package:poetry/pages/my/mood_analysis/view/mood_type_reason_cell.dart';
-import 'package:poetry/pages/my/mood_analysis/view/mood_type_view.dart';
-import 'package:poetry/utils/hex_color.dart';
-import 'package:poetry/utils/image_button.dart';
-import 'package:poetry/utils/time_util.dart';
+import 'package:iquokka/module/user_service.dart';
+import 'package:iquokka/pages/my/mood_analysis/view/choose_time_view.dart';
+import 'package:iquokka/pages/my/mood_analysis/view/mood_type_reason_cell.dart';
+import 'package:iquokka/pages/my/mood_analysis/view/mood_type_view.dart';
+import 'package:iquokka/utils/hex_color.dart';
+import 'package:iquokka/utils/image_button.dart';
+import 'package:iquokka/utils/time_util.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../component/mood_bar.dart';