Merge pull request #114 from mylxsw/main

merge from main
mylxsw · Jun 12, 2024 · 25499cf · 25499cf
2 parents c57f645 + 66722c4
commit 25499cf
Show file tree

Hide file tree

Showing 10 changed files with 245 additions and 226 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+Makefile.local
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ https://aidea.aicode.cc
 
 - 微信技术交流群：
 
-    <img src="https://github.com/mylxsw/aidea/assets/2330911/50e400ec-3e8d-4e39-a08b-874a2c527b6d" width="400"/>
+    <img src="https://github.com/mylxsw/aidea/assets/2330911/0a697937-b357-4d88-bb16-c07c5517d13c" width="400"/>
 
     如果无法加入，请添加微信号 `x-prometheus` 为好友，拉你进群。
 

diff --git a/docker-build.sh b/docker-build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION=1.0.13.1
+VERSION=1.0.14
 
 rm -fr build/web
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -20,6 +20,7 @@ import 'package:askaide/page/admin/users.dart';
 import 'package:askaide/page/balance/web_payment_proxy.dart';
 import 'package:askaide/page/balance/web_payment_result.dart';
 import 'package:askaide/page/creative_island/draw/artistic_wordart.dart';
+import 'package:flutter_phoenix/flutter_phoenix.dart';
 import 'package:path/path.dart';
 
 import 'package:askaide/bloc/account_bloc.dart';
@@ -198,7 +199,7 @@ void main() async {
   );
 
   final creativeIslandRepo =
-  CreativeIslandRepository(CreativeIslandDataProvider(db));
+      CreativeIslandRepository(CreativeIslandDataProvider(db));
 
   // 聊天状态加载器
   final stateManager = MessageStateManager(cacheRepo);
@@ -247,13 +248,15 @@ void main() async {
     );
   });
 
-  runApp(MyApp(
-    settingRepo: settingRepo,
-    chatMsgRepo: chatMsgRepo,
-    openAIRepo: openAIRepo,
-    cacheRepo: cacheRepo,
-    creativeIslandRepo: creativeIslandRepo,
-    messageStateManager: stateManager,
+  runApp(Phoenix(
+    child: MyApp(
+      settingRepo: settingRepo,
+      chatMsgRepo: chatMsgRepo,
+      openAIRepo: openAIRepo,
+      cacheRepo: cacheRepo,
+      creativeIslandRepo: creativeIslandRepo,
+      messageStateManager: stateManager,
+    ),
   ));
 }
 
@@ -293,11 +296,11 @@ class MyApp extends StatefulWidget {
     var usingGuestMode = settingRepo.boolDefault(settingUsingGuestMode, false);
 
     final openAISelfHosted =
-    settingRepo.boolDefault(settingOpenAISelfHosted, false);
+        settingRepo.boolDefault(settingOpenAISelfHosted, false);
     final deepAISelfHosted =
-    settingRepo.boolDefault(settingDeepAISelfHosted, false);
+        settingRepo.boolDefault(settingDeepAISelfHosted, false);
     final stabilityAISelfHosted =
-    settingRepo.boolDefault(settingStabilityAISelfHosted, false);
+        settingRepo.boolDefault(settingStabilityAISelfHosted, false);
 
     final shouldLogin = (apiServerToken == null || apiServerToken == '') &&
         !usingGuestMode &&
@@ -316,10 +319,10 @@ class MyApp extends StatefulWidget {
           // navigatorKey: _shellNavigatorKey,
           //parentNavigatorKey: _rootNavigatorKey,
           builder: (
-              BuildContext context,
-              GoRouterState state,
-              StatefulNavigationShell navigationShell,
-              ) {
+            BuildContext context,
+            GoRouterState state,
+            StatefulNavigationShell navigationShell,
+          ) {
             return AppScaffold(
               settingRepo: settingRepo,
               navigationShell: navigationShell,
@@ -340,10 +343,10 @@ class MyApp extends StatefulWidget {
                     child: HomePage(
                       setting: settingRepo,
                       showInitialDialog:
-                      state.queryParameters['show_initial_dialog'] ==
-                          'true',
+                          state.queryParameters['show_initial_dialog'] ==
+                              'true',
                       reward:
-                      int.tryParse(state.queryParameters['reward'] ?? '0'),
+                          int.tryParse(state.queryParameters['reward'] ?? '0'),
                     ),
                   ),
                 ),
@@ -481,7 +484,7 @@ class MyApp extends StatefulWidget {
                   value: ChatBlocManager().getBloc(
                     chatAnywhereRoomId,
                     chatHistoryId:
-                    int.tryParse(state.queryParameters['chat_id'] ?? ''),
+                        int.tryParse(state.queryParameters['chat_id'] ?? ''),
                   ),
                 ),
                 BlocProvider.value(value: chatRoomBloc),
@@ -610,7 +613,7 @@ class MyApp extends StatefulWidget {
                         CreativeIslandBloc(creativeIslandRepo)),
               ],
               child:
-              UserCenterScreen(settings: context.read<SettingRepository>()),
+                  UserCenterScreen(settings: context.read<SettingRepository>()),
             ),
           ),
         ),
@@ -1345,7 +1348,7 @@ class _MyAppState extends State<MyApp> {
             create: (context) => widget.cacheRepo),
       ],
       child: ChangeNotifierProvider(
-          create: (context) => AppTheme.instance
+          create: (context) => AppTheme.get()
             ..mode = AppTheme.themeModeFormString(
                 widget.settingRepo.stringDefault(settingThemeMode, 'system')),
           builder: (context, _) {
@@ -1363,25 +1366,25 @@ class _MyAppState extends State<MyApp> {
                     // TODO 后面要增加一个设置项，允许用户自定义字体大小
                     return MediaQuery(
                       data:
-                      MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                          MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
                       child: BotToastInit()(context, child),
                     );
                   },
                   routerConfig: widget._router,
                   supportedLocales: widget.localization.supportedLocales,
                   localizationsDelegates:
-                  widget.localization.localizationsDelegates,
+                      widget.localization.localizationsDelegates,
                   scrollBehavior:
-                  PlatformTool.isAndroid() || PlatformTool.isIOS()
-                      ? null
-                      : const MaterialScrollBehavior().copyWith(
-                    dragDevices: {
-                      PointerDeviceKind.touch,
-                      PointerDeviceKind.mouse,
-                      PointerDeviceKind.stylus,
-                      PointerDeviceKind.trackpad,
-                    },
-                  ),
+                      PlatformTool.isAndroid() || PlatformTool.isIOS()
+                          ? null
+                          : const MaterialScrollBehavior().copyWith(
+                              dragDevices: {
+                                PointerDeviceKind.touch,
+                                PointerDeviceKind.mouse,
+                                PointerDeviceKind.stylus,
+                                PointerDeviceKind.trackpad,
+                              },
+                            ),
                 );
               },
             );
@@ -1401,10 +1404,10 @@ ThemeData createLightThemeData() {
     ),
     iconButtonTheme: PlatformTool.isMacOS()
         ? IconButtonThemeData(
-      style: ButtonStyle(
-        overlayColor: MaterialStateProperty.all(Colors.transparent),
-      ),
-    )
+            style: ButtonStyle(
+              overlayColor: MaterialStateProperty.all(Colors.transparent),
+            ),
+          )
         : null,
     dividerColor: Colors.transparent,
     dialogBackgroundColor: Colors.white,
@@ -1434,10 +1437,10 @@ ThemeData createDarkThemeData() {
     ),
     iconButtonTheme: PlatformTool.isMacOS()
         ? IconButtonThemeData(
-      style: ButtonStyle(
-        overlayColor: MaterialStateProperty.all(Colors.transparent),
-      ),
-    )
+            style: ButtonStyle(
+              overlayColor: MaterialStateProperty.all(Colors.transparent),
+            ),
+          )
         : null,
     dividerColor: Colors.transparent,
     dialogBackgroundColor: const Color.fromARGB(255, 48, 48, 48),

diff --git a/lib/page/app_scaffold.dart b/lib/page/app_scaffold.dart
@@ -14,7 +14,8 @@ class AppScaffold extends StatefulWidget {
   final StatefulNavigationShell navigationShell;
   const AppScaffold({
     Key? key,
-    required this.settingRepo, required this.navigationShell,
+    required this.settingRepo,
+    required this.navigationShell,
   }) : super(key: key);
   @override
   State<AppScaffold> createState() => _AppScaffoldState();
@@ -38,21 +39,21 @@ class _AppScaffoldState extends State<AppScaffold> {
   void initState() {
     cancelHideBottomNavigatorBarEventListener =
         GlobalEvent().on("hideBottomNavigatorBar", (data) {
-          if (mounted) {
-            setState(() {
-              _showBottomNavigatorBar = false;
-            });
-          }
+      if (mounted) {
+        setState(() {
+          _showBottomNavigatorBar = false;
         });
+      }
+    });
 
     cancelShowBottomNavigatorBarEventListener =
         GlobalEvent().on("showBottomNavigatorBar", (data) {
-          if (mounted) {
-            setState(() {
-              _showBottomNavigatorBar = true;
-            });
-          }
+      if (mounted) {
+        setState(() {
+          _showBottomNavigatorBar = true;
         });
+      }
+    });
 
     super.initState();
   }
@@ -132,24 +133,24 @@ class _AppScaffoldState extends State<AppScaffold> {
       extendBody: false,
       bottomNavigationBar: currentIndex > -1 && _showBottomNavigatorBar
           ? BottomNavigationBar(
-        landscapeLayout: BottomNavigationBarLandscapeLayout.centered,
-        showSelectedLabels: true,
-        showUnselectedLabels: true,
-        currentIndex: _calculateSelectedIndex(context),
-        onTap: (int index) => _onTap(context, index),
-        selectedItemColor: customColors.linkColor,
-        unselectedItemColor: Colors.grey,
-        selectedFontSize: 10,
-        unselectedFontSize: 10,
-        type: BottomNavigationBarType.fixed,
-        enableFeedback: true,
-        backgroundColor: customColors.backgroundColor,
-        elevation: 0,
-        items: [
-          for (var i = 0; i < barItems.length; i++)
-            barItems[i].builder(i, customColors),
-        ],
-      )
+              landscapeLayout: BottomNavigationBarLandscapeLayout.centered,
+              showSelectedLabels: true,
+              showUnselectedLabels: true,
+              currentIndex: _calculateSelectedIndex(context),
+              onTap: (int index) => _onTap(context, index),
+              selectedItemColor: customColors.linkColor,
+              unselectedItemColor: Colors.grey,
+              selectedFontSize: 10,
+              unselectedFontSize: 10,
+              type: BottomNavigationBarType.fixed,
+              enableFeedback: true,
+              backgroundColor: customColors.backgroundColor,
+              elevation: 0,
+              items: [
+                for (var i = 0; i < barItems.length; i++)
+                  barItems[i].builder(i, customColors),
+              ],
+            )
           : null,
     );
   }
@@ -166,19 +167,9 @@ class _AppScaffoldState extends State<AppScaffold> {
     return -1;
   }
 
-  void onTap(int value) {
-    if (context.canPop()) {
-      context.pop();
-    }
-
+  void _onTap(BuildContext context, int index) {
     HapticFeedbackHelper.lightImpact();
 
-    final barItems = _bottomNavigationBarList();
-    if (value >= barItems.length) return context.go(Ability().homeRoute);
-
-    return context.go(barItems[value].route);
-  }
-  void _onTap(BuildContext context, int index) {
     widget.navigationShell.goBranch(
       index,
       initialLocation: index == widget.navigationShell.currentIndex,
@@ -199,15 +190,15 @@ BottomNavigationBarItem createAnimatedNavBarItem({
       firstChild: Icon(icon),
       secondChild: Icon(activatedIcon, color: activatedColor ?? Colors.green),
       crossFadeState:
-      activated ? CrossFadeState.showSecond : CrossFadeState.showFirst,
+          activated ? CrossFadeState.showSecond : CrossFadeState.showFirst,
       duration: const Duration(milliseconds: 300),
     ),
   );
 }
 
 class BottomNavigationBarConfig {
   final BottomNavigationBarItem Function(int index, CustomColors customColors)
-  builder;
+      builder;
   final String route;
 
   BottomNavigationBarConfig({

diff --git a/lib/page/component/model_item.dart b/lib/page/component/model_item.dart
@@ -149,7 +149,7 @@ class _ModelItemState extends State<ModelItem> {
                                 children: [
                                   if (item.avatarUrl != null) ...[
                                     _buildAvatar(
-                                        avatarUrl: item.avatarUrl, size: 45),
+                                        avatarUrl: item.avatarUrl, size: 50),
                                     const SizedBox(width: 10),
                                   ],
                                   Expanded(
@@ -170,7 +170,7 @@ class _ModelItemState extends State<ModelItem> {
                                                   overflow:
                                                       TextOverflow.ellipsis,
                                                   style: const TextStyle(
-                                                      fontSize: 14),
+                                                      fontSize: 15),
                                                 ),
                                               ),
                                             ),
@@ -211,7 +211,7 @@ class _ModelItemState extends State<ModelItem> {
                                             maxLines: 2,
                                             overflow: TextOverflow.ellipsis,
                                             style: TextStyle(
-                                              fontSize: 10,
+                                              fontSize: 12,
                                               color: customColors.weakTextColor,
                                             ),
                                           ),
@@ -259,7 +259,7 @@ class _ModelItemState extends State<ModelItem> {
         category,
         style: TextStyle(
           color: customColors.dialogDefaultTextColor,
-          fontSize: 12,
+          fontSize: 14,
         ),
       ),
     );

diff --git a/lib/page/component/theme/theme.dart b/lib/page/component/theme/theme.dart
@@ -19,6 +19,14 @@ class AppTheme extends ChangeNotifier {
 
   static AppTheme instance = AppTheme('system');
 
+  static AppTheme get() {
+    if (!instance.mounted) {
+      instance = AppTheme('system');
+    }
+
+    return instance;
+  }
+
   static ThemeMode themeModeFormString(String mode) {
     switch (mode) {
       case 'light':
@@ -34,4 +42,13 @@ class AppTheme extends ChangeNotifier {
     _mode = mode;
     notifyListeners();
   }
+
+  bool _mounted = false;
+  bool get mounted => _mounted;
+
+  @override
+  void dispose() {
+    super.dispose();
+    _mounted = true;
+  }
 }