feat: version notice with badges

zmhu · zmhu · commit 837d8ba5d493 · 2023-12-13T14:25:46.000+08:00
diff --git a/lib/components/chat/menu_button.dart b/lib/components/chat/menu_button.dart
@@ -1,19 +1,41 @@
 import 'package:flutter/material.dart';
+import 'package:badges/badges.dart' as badges;
+// import 'package:get/get.dart';
+// import 'package:logger/logger.dart';
 // import 'package:get/get.dart';
 
 // ignore: must_be_immutable
 class LeftMenuButtonComponent extends StatelessWidget {
-  LeftMenuButtonComponent(
-      {super.key,
-      required this.title,
-      // required this.routeName,
-      required this.onPressed,
-      required this.icon});
+  LeftMenuButtonComponent({
+    super.key,
+    required this.title,
+    // required this.routeName,
+    required this.onPressed,
+    required this.icon,
+    this.needNotice,
+  });
 
   String title;
   Function onPressed;
   IconData icon;
+  bool? needNotice;
   // String routeName;
+  // Logger logger = Get.find();
+
+  Widget getLabelTitle() {
+    // logger.d("getLabelTitle $needNotice");
+    if (needNotice != null && needNotice == true) {
+      // return Row(
+      //   children: [Text(title), Text("*")],
+      // );
+      return badges.Badge(
+        position: badges.BadgePosition.topEnd(top: 0, end: -12),
+        showBadge: true,
+        child: Text(title),
+      );
+    }
+    return Text(title);
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -31,7 +53,7 @@ class LeftMenuButtonComponent extends StatelessWidget {
           onPressed();
         },
         icon: Icon(icon),
-        label: Text(title),
+        label: getLabelTitle(),
       ),
     );
   }
diff --git a/lib/controller/main_controller.dart b/lib/controller/main_controller.dart
@@ -64,6 +64,8 @@ class MainController extends GetxController {
     version.then((value) {
       logger.d("message: $value");
       if (value.isNotEmpty) {
+        // value =
+        //     '{"version": "v0.0.46", "notice": true, "assets": [{"name": "GeekChat-0.0.81+81-android.aab", "url": "https://pub-6be131b6553c4ce5a6f736f91a7d011a.r2.dev/v0.0.81/GeekChat-0.0.81+81-android.aab"}, {"name": "GeekChat-0.0.81+81-android.apk", "url": "https://pub-6be131b6553c4ce5a6f736f91a7d011a.r2.dev/v0.0.81/GeekChat-0.0.81+81-android.apk"}, {"name": "GeekChat-0.0.81+81-macos.dmg", "url": "https://pub-6be131b6553c4ce5a6f736f91a7d011a.r2.dev/v0.0.81/GeekChat-0.0.81+81-macos.dmg"}, {"name": "GeekChat-0.0.81+81-windows-setup.exe", "url": "https://pub-6be131b6553c4ce5a6f736f91a7d011a.r2.dev/v0.0.81/GeekChat-0.0.81+81-windows-setup.exe"}, {"name": "GeekChat-0.0.81+81-windows.msix", "url": "https://pub-6be131b6553c4ce5a6f736f91a7d011a.r2.dev/v0.0.81/GeekChat-0.0.81+81-windows.msix"}]}';
         _releaseModel = ReleaseModel.fromJson(value, currentVersion);
         logger.d("release model: ${_releaseModel.needUpdate}");
         if (releaseModel.needUpdate) {
diff --git a/lib/controller/settings.dart b/lib/controller/settings.dart
@@ -68,6 +68,9 @@ class SettingsController extends GetxController {
 
   Logger logger = Get.find();
 
+  bool hasNewVersion = false;
+  String newVersion = "*";
+
   @override
   void onInit() {
     resetSettings();
diff --git a/lib/main.dart b/lib/main.dart
@@ -102,7 +102,7 @@ initServices() async {
   logger.d("locale: ${localeController.locale.toJson()}");
 
   ///SettingsServerController settingsServerController = ;
-  Get.put(
+  SettingsServerController settingsServerController = Get.put(
       SettingsServerController(provider: settingsController.settings.provider));
 
   MainController mainController = Get.put(MainController());
@@ -127,19 +127,31 @@ initServices() async {
   if (settingsController.channelName == "site") {
     mainController.checkUpdate(settingsController.packageInfo.version,
         (ReleaseModel releaseModel) {
-      String tip = "Found a new version".tr;
-      Get.defaultDialog(
-          title: "Update!".tr,
-          textConfirm: "Download".tr,
-          textCancel: "Cancel".tr,
-          onCancel: () => Get.back(),
-          onConfirm: () {
-            logger.d("confirm click");
-            launchUrl(
-                Uri.parse("https://github.com/geeker-ai/geek_chat/releases"));
-          },
-          radius: 5,
-          middleText: "$tip : ${releaseModel.version}");
+      if (releaseModel.needUpdate && releaseModel.notice) {
+        String tip = "Found a new version".tr;
+        Get.defaultDialog(
+            title: "Update!".tr,
+            textConfirm: "Download".tr,
+            textCancel: "Cancel".tr,
+            onCancel: () => Get.back(),
+            onConfirm: () {
+              logger.d("confirm click");
+              launchUrl(
+                  Uri.parse("https://github.com/geeker-ai/geek_chat/releases"));
+            },
+            radius: 5,
+            middleText: "$tip : ${releaseModel.version}");
+        settingsController.hasNewVersion = true;
+        settingsController.newVersion = releaseModel.version;
+        settingsServerController.update(['subscription']);
+        // settingsController.update();
+      } else if (releaseModel.needUpdate && !releaseModel.notice) {
+        logger.d("releaseModel.needUpdate && !releaseModel.notice");
+        settingsController.hasNewVersion = true;
+        settingsController.newVersion = releaseModel.version;
+        settingsServerController.update(['subscription']);
+        // settt.update();
+      }
     });
   }
 
diff --git a/lib/models/release.dart b/lib/models/release.dart
@@ -7,6 +7,7 @@ class ReleaseModel {
   String version = '0.0.1';
   String currentVersion = '0.0.1';
   String currentChangeLog = '';
+  bool notice = true;
   late Map<String, String> changeLogs;
 
   ReleaseModel();
@@ -16,10 +17,13 @@ class ReleaseModel {
     releaseModel.currentVersion = currentVersion;
     if (jsonString.isNotEmpty) {
       try {
-        var jsonObject = jsonDecode(jsonString);
+        Map<String, dynamic> jsonObject = jsonDecode(jsonString);
         releaseModel.needUpdate =
             checkVersion(currentVersion, jsonObject['version']);
         releaseModel.version = jsonObject['version'];
+        if (jsonObject.containsKey("notice")) {
+          releaseModel.notice = jsonObject['notice'];
+        }
       } catch (e) {
         //
       }
diff --git a/lib/models/server.dart b/lib/models/server.dart
@@ -201,7 +201,7 @@ class ServerModel {
 
       for (var key in azconfig.keys) {
         String tmpKey = "";
-        String tmpVersion = "";
+        // String tmpVersion = "";
         // print("--------------------------${azconfig[key].keys}");
         if (azconfig[key]!.containsKey("apiKey")) {
           tmpKey = azconfig[key]!['apiKey'];
diff --git a/lib/pages/about_page.dart b/lib/pages/about_page.dart
@@ -17,6 +17,10 @@ class AboutPage extends StatelessWidget {
   Widget build(BuildContext context) {
     tracker
         .trackEvent("Page-About", {"uuid": settingsController.settings.uuid});
+    ChangeLogModel lastVersion = mainController.versions.first;
+    List<ChangeLogModel> changeLogs = [];
+    changeLogs.addAll(mainController.versions);
+    changeLogs.removeAt(0);
     return Scaffold(
       appBar: AppBar(
         title: Text("About".tr),
@@ -36,6 +40,42 @@ class AboutPage extends StatelessWidget {
                   style: const TextStyle(fontSize: 20),
                 ),
               ),
+              Card(
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(5),
+                ),
+                child: Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.only(top: 10, left: 10, bottom: 10),
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      MarkdownWidget(
+                        data: "Geeker Chat Intro".tr,
+                        shrinkWrap: true,
+                      ),
+                      Container(
+                        padding: const EdgeInsets.only(top: 10),
+                        child: const MarkdownWidget(
+                          data:
+                              "Download Link: https://github.com/geeker-ai/geek_chat/releases",
+                          shrinkWrap: true,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              ListTile(
+                title: Text(
+                  "${lastVersion.version} (Latest Version)",
+                  style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.titleLarge?.fontSize),
+                ),
+                dense: true,
+              ),
               Card(
                 shape: RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(5),
@@ -44,12 +84,12 @@ class AboutPage extends StatelessWidget {
                   width: double.infinity,
                   padding: const EdgeInsets.only(top: 10, left: 10, bottom: 10),
                   child: MarkdownWidget(
-                    data: "Geeker Chat Intro".tr,
+                    data: lastVersion.content,
                     shrinkWrap: true,
                   ),
                 ),
               ),
-              for (ChangeLogModel version in mainController.versions)
+              for (ChangeLogModel version in changeLogs)
                 ExpansionTile(
                   title: Text(version.version),
                   controlAffinity: ListTileControlAffinity.leading,
diff --git a/lib/pages/desktop_home_page.dart b/lib/pages/desktop_home_page.dart
@@ -8,9 +8,9 @@ import 'package:geek_chat/controller/question_input_controller.dart';
 import 'package:geek_chat/controller/settings.dart';
 import 'package:geek_chat/controller/settings_server_controller.dart';
 import 'package:geek_chat/controller/tracker_controller.dart';
-import 'package:geek_chat/models/model.dart';
+// import 'package:geek_chat/models/model.dart';
 import 'package:geek_chat/models/session.dart';
-import 'package:geek_chat/util/app_constants.dart';
+// import 'package:geek_chat/util/app_constants.dart';
 import 'package:geek_chat/util/input_submit_util.dart';
 import 'package:get/get.dart';
 import 'package:logger/logger.dart';
@@ -48,52 +48,6 @@ class DesktopHomePage extends StatelessWidget {
         chatMessageController,
         settingsServerController,
         questionInputController);
-    // AiModel aiModel =
-    //     AppConstants.getAiModel(chatSessionController.currentSession.model);
-    // if (settingsServerController.defaultServer.provider == "openai" ||
-    //     settingsServerController.defaultServer.provider == "geekerchat") {
-    //   if (aiModel.aiType == AiType.chatgpt) {
-    //     if (chatSessionController.currentSession.modelType ==
-    //         ModelType.image.name) {
-    //       await InputSubmitUtil.instance.submitImageModel(
-    //           chatMessageController,
-    //           chatSessionController,
-    //           questionInputController,
-    //           settingsServerController);
-    //     } else if (chatSessionController.currentSession.modelType ==
-    //         ModelType.chat.name) {
-    //       await InputSubmitUtil.instance.submitChatModel(
-    //           chatMessageController,
-    //           chatSessionController,
-    //           questionInputController,
-    //           settingsServerController);
-    //     } else if (chatSessionController.currentSession.modelType ==
-    //         ModelType.text.name) {
-    //       // TODO process text model
-    //     }
-    //     questionInputController.clear();
-    //     questionInputController.update();
-    //   } else if (aiModel.aiType == AiType.bard) {
-    //     logger.d("bard type");
-    //   }
-    // } else if (settingsServerController.defaultServer.provider == "azure") {
-    //   if (aiModel.aiType == AiType.chatgpt) {
-    //     if (chatSessionController.currentSession.modelType ==
-    //         ModelType.chat.name) {
-    //       await InputSubmitUtil.instance.submitAzureChatModel(
-    //           chatMessageController,
-    //           chatSessionController,
-    //           questionInputController,
-    //           settingsServerController);
-    //     }
-    //     questionInputController.clear();
-    //     questionInputController.update();
-    //   }
-    // }
-
-    // if (context != null) {
-    //   LoadingProgress.stop(context);
-    // }
   }
 
   List<Widget> getLeftMenus(SettingsServerController controller) {
@@ -127,6 +81,7 @@ class DesktopHomePage extends StatelessWidget {
           // );
         },
         icon: Icons.info_outline,
+        needNotice: settingsController.hasNewVersion,
       ),
     ];
     return leftMenus;
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -163,6 +163,9 @@ dependencies:
   # https://pub.dev/packages/image_gallery_saver
   image_gallery_saver: '^2.0.3'
 
+  # https://pub.dev/packages/badges
+  badges: ^3.1.2
+
 
 dev_dependencies:
   flutter_test:
