chore: bump version to 1.2.3 and improve update/UI stability

Author: linyuchen

__version__.py

@@ -1,3 +1,3 @@
 """应用版本信息"""
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"

core/update_manager.py

@@ -37,6 +37,7 @@ def __init__(self,
         # UI 回调
         self._on_check_start: Optional[Callable[[], None]] = None
         self._on_check_complete: Optional[Callable[[List[Tuple[str, UpdateInfo]]], None]] = None
+        self._on_updates_found: Optional[Callable[[List[Tuple[str, UpdateInfo]]], None]] = None
         self._on_download_start: Optional[Callable[[], None]] = None
         self._on_download_progress: Optional[Callable[[str, int, int], None]] = None
         self._on_download_status: Optional[Callable[[str], None]] = None
@@ -49,12 +50,21 @@ def set_callbacks(self,
                       on_download_progress: Optional[Callable[[str, int, int], None]] = None,
                       on_download_status: Optional[Callable[[str], None]] = None,
                       on_download_complete: Optional[Callable[[List[str], List[Tuple[str, str]], bool], None]] = None):
-        self._on_check_start = on_check_start
-        self._on_check_complete = on_check_complete
-        self._on_download_start = on_download_start
-        self._on_download_progress = on_download_progress
-        self._on_download_status = on_download_status
-        self._on_download_complete = on_download_complete
+        if on_check_start is not None:
+            self._on_check_start = on_check_start
+        if on_check_complete is not None:
+            self._on_check_complete = on_check_complete
+        if on_download_start is not None:
+            self._on_download_start = on_download_start
+        if on_download_progress is not None:
+            self._on_download_progress = on_download_progress
+        if on_download_status is not None:
+            self._on_download_status = on_download_status
+        if on_download_complete is not None:
+            self._on_download_complete = on_download_complete
+    
+    def set_updates_found_callback(self, callback: Optional[Callable[[List[Tuple[str, UpdateInfo]]], None]]):
+        self._on_updates_found = callback
 
     @property
     def has_updates(self) -> bool:
@@ -158,6 +168,8 @@ def _check_updates(self, versions: Dict[str, str]):
 
             if updates_found:
                 logger.info(f"发现 {len(updates_found)} 个更新: {[name for name, _ in updates_found]}")
+                if self._on_updates_found:
+                    self._on_updates_found(updates_found)
             else:
                 logger.info("所有组件已是最新版本")
 
@@ -196,6 +208,10 @@ def _download_all_updates(self):
             self._is_downloading = True
             updates_to_download = self._updates_found.copy()
 
+        # 按顺序排序：LLBot → PMHQ → 管理器（管理器最后更新，避免重启弹框打断其他更新）
+        order = {"LLBot": 0, "PMHQ": 1, "管理器": 2}
+        updates_to_download.sort(key=lambda x: order.get(x[0], 99))
+        
         if self._on_download_start:
             self._on_download_start()
 

lucky-lillia-desktop.spec

@@ -61,13 +61,13 @@ exe = EXE(
     strip=False,
     upx=True,
     upx_exclude=[],
-    runtime_tmpdir=None,
-    console=False,  # Hide console window
+    runtime_tmpdir='C:\\LLBotTemp',  # 避免中文用户名路径导致 Flutter 启动失败
+    console=False,
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon='icon.ico',  # Application icon
-    uac_admin=True,  # 请求管理员权限
+    icon='icon.ico',
+    uac_admin=True,
 )

main.py

@@ -689,6 +689,9 @@ def show_startup_error(page: ft.Page, e: Exception):
     logger.info("="*60)
 
     try:
+        # 禁用 Flutter GPU 硬件加速，解决部分机器上 Flet View 启动失败的问题
+        os.environ.setdefault("FLET_VIEW_ARGUMENTS", "--disable-gpu")
+        
         # 启动Flet应用
         ft.app(target=main)
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucky-lillia-desktop-win-x64",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "repository": {
         "type": "git",
         "url": "https://github.com/LLOneBot/lucky-lillia-desktop"

ui/about_page.py

@@ -157,9 +157,13 @@ def build(self, page: ft.Page):
         self.llbot_card.build()
 
         # 检查更新/立即更新按钮
+        self._button_text = ft.Text("检查更新")
         self.check_update_button = ft.ElevatedButton(
-            "检查更新",
-            icon=ft.Icons.CLOUD_DOWNLOAD,
+            content=ft.Row(
+                [ft.Icon(ft.Icons.CLOUD_DOWNLOAD), self._button_text],
+                tight=True,
+                spacing=8,
+            ),
             on_click=self._on_check_or_update_click,
             style=ft.ButtonStyle(
                 color=ft.Colors.ON_PRIMARY,
@@ -168,6 +172,7 @@ def build(self, page: ft.Page):
                 padding=ft.padding.symmetric(horizontal=24, vertical=12),
             )
         )
+        self._button_icon = self.check_update_button.content.controls[0]
 
         # 加载中指示器
         self.loading_indicator = ft.ProgressRing(
@@ -305,6 +310,7 @@ def load_versions_async():
             async def update_ui():
                 self.pmhq_card.update_version(pmhq_version if pmhq_version else "未知")
                 self.llbot_card.update_version(llbot_version if llbot_version else "未知")
+                self._sync_update_status()
                 if self.page:
                     self.page.update()
 
@@ -356,11 +362,11 @@ async def update_ui():
 
                 has_any_update = any(info.has_update for _, info in all_check_results)
                 if has_any_update:
-                    self.check_update_button.text = "立即更新"
-                    self.check_update_button.icon = ft.Icons.DOWNLOAD
+                    self._button_text.value = "立即更新"
+                    self._button_icon.name = ft.Icons.DOWNLOAD
                 else:
-                    self.check_update_button.text = "检查更新"
-                    self.check_update_button.icon = ft.Icons.CLOUD_DOWNLOAD
+                    self._button_text.value = "检查更新"
+                    self._button_icon.name = ft.Icons.CLOUD_DOWNLOAD
 
                 if self.page:
                     self.page.update()
@@ -380,11 +386,11 @@ async def update_ui():
 
     def set_updates_found(self, updates_found: list):
         if updates_found:
-            self.check_update_button.text = "立即更新"
-            self.check_update_button.icon = ft.Icons.DOWNLOAD
+            self._button_text.value = "立即更新"
+            self._button_icon.name = ft.Icons.DOWNLOAD
         else:
-            self.check_update_button.text = "检查更新"
-            self.check_update_button.icon = ft.Icons.CLOUD_DOWNLOAD
+            self._button_text.value = "检查更新"
+            self._button_icon.name = ft.Icons.CLOUD_DOWNLOAD
 
         for component_name, update_info in updates_found:
             if component_name == "管理器":
@@ -394,11 +400,10 @@ def set_updates_found(self, updates_found: list):
             elif component_name == "LLBot":
                 self.llbot_card.update_check_result(update_info)
 
-        if self.page:
-            try:
-                self.page.update()
-            except:
-                pass
+        try:
+            self.check_update_button.update()
+        except:
+            pass
 
     def _start_all_updates(self):
         if not self.update_manager or not self.update_manager.has_updates:
@@ -495,8 +500,8 @@ async def on_complete():
                 if self.page:
                     self.page.pop_dialog()
 
-                self.check_update_button.text = "检查更新"
-                self.check_update_button.icon = ft.Icons.CLOUD_DOWNLOAD
+                self._button_text.value = "检查更新"
+                self._button_icon.name = ft.Icons.CLOUD_DOWNLOAD
 
                 self.app_card.clear_update_status()
                 self.pmhq_card.clear_update_status()
@@ -571,14 +576,14 @@ def _close_dialog(self, dialog: ft.AlertDialog):
             self.page.pop_dialog()
 
     def refresh(self):
+        self._sync_update_status()
         self._load_versions()
-        
-        # 同步更新管理器的状态到卡片
+    
+    def _sync_update_status(self):
         if self.update_manager and self.update_manager.has_updates:
-            self.check_update_button.text = "立即更新"
-            self.check_update_button.icon = ft.Icons.DOWNLOAD
+            self._button_text.value = "立即更新"
+            self._button_icon.name = ft.Icons.DOWNLOAD
 
-            # 同步更新状态到卡片显示
             for name, info in self.update_manager.updates_found:
                 if name == "管理器":
                     self.app_card.update_check_result(info)
@@ -587,11 +592,5 @@ def refresh(self):
                 elif name == "LLBot":
                     self.llbot_card.update_check_result(info)
         else:
-            self.check_update_button.text = "检查更新"
-            self.check_update_button.icon = ft.Icons.CLOUD_DOWNLOAD
-        
-        if self.page:
-            try:
-                self.page.update()
-            except:
-                pass
+            self._button_text.value = "检查更新"
+            self._button_icon.name = ft.Icons.CLOUD_DOWNLOAD

ui/home_page.py

@@ -929,13 +929,9 @@ def _do_start_services(self):
         pmhq_path = config.get("pmhq_path", DEFAULT_CONFIG["pmhq_path"])
         llbot_path = config.get("llbot_path", DEFAULT_CONFIG["llbot_path"])
         node_path = config.get("node_path", DEFAULT_CONFIG["node_path"])
-        ffmpeg_path = config.get("ffmpeg_path", DEFAULT_CONFIG["ffmpeg_path"])
-        ffprobe_path = config.get("ffprobe_path", DEFAULT_CONFIG["ffprobe_path"])
         logger.info(f"PMHQ路径: {pmhq_path}")
         logger.info(f"LLBot路径: {llbot_path}")
         logger.info(f"Node.exe路径: {node_path}")
-        logger.info(f"FFmpeg.exe路径: {ffmpeg_path}")
-        logger.info(f"FFprobe.exe路径: {ffprobe_path}")
 
         # 检查PMHQ文件是否存在
         pmhq_exists = self.downloader.check_file_exists(pmhq_path)
@@ -969,40 +965,24 @@ def _do_start_services(self):
                     self.config_manager.save_config(config)
         logger.info(f"Node.exe可用: {node_exists}")
 
-        # 检查FFmpeg.exe文件是否存在（先检查配置路径，再检查环境变量，最后检查bin/llbot/ffmpeg.exe）
-        ffmpeg_exists = self.downloader.check_file_exists(ffmpeg_path)
-        if not ffmpeg_exists:
+        # 检查FFmpeg.exe是否存在（先检查环境变量，再检查bin/llbot/）
+        ffmpeg_exists = self.downloader.check_ffmpeg_exists()
+        if ffmpeg_exists:
             system_ffmpeg = self.downloader.check_ffmpeg_available()
             if system_ffmpeg:
                 logger.info(f"在系统PATH中找到FFmpeg: {system_ffmpeg}")
-                ffmpeg_exists = True
-                config["ffmpeg_path"] = system_ffmpeg
-                self.config_manager.save_config(config)
             else:
-                local_ffmpeg_path = "bin/llbot/ffmpeg.exe"
-                if self.downloader.check_file_exists(local_ffmpeg_path):
-                    logger.info(f"在本地目录找到FFmpeg: {local_ffmpeg_path}")
-                    ffmpeg_exists = True
-                    config["ffmpeg_path"] = local_ffmpeg_path
-                    self.config_manager.save_config(config)
+                logger.info("在本地目录找到FFmpeg: bin/llbot/ffmpeg.exe")
         logger.info(f"FFmpeg.exe可用: {ffmpeg_exists}")
 
-        # 检查FFprobe.exe文件是否存在（先检查配置路径，再检查环境变量，最后检查bin/llbot/ffprobe.exe）
-        ffprobe_exists = self.downloader.check_file_exists(ffprobe_path)
-        if not ffprobe_exists:
+        # 检查FFprobe.exe是否存在（先检查环境变量，再检查bin/llbot/）
+        ffprobe_exists = self.downloader.check_ffprobe_exists()
+        if ffprobe_exists:
             system_ffprobe = self.downloader.check_ffprobe_available()
             if system_ffprobe:
                 logger.info(f"在系统PATH中找到FFprobe: {system_ffprobe}")
-                ffprobe_exists = True
-                config["ffprobe_path"] = system_ffprobe
-                self.config_manager.save_config(config)
             else:
-                local_ffprobe_path = "bin/llbot/ffprobe.exe"
-                if self.downloader.check_file_exists(local_ffprobe_path):
-                    logger.info(f"在本地目录找到FFprobe: {local_ffprobe_path}")
-                    ffprobe_exists = True
-                    config["ffprobe_path"] = local_ffprobe_path
-                    self.config_manager.save_config(config)
+                logger.info("在本地目录找到FFprobe: bin/llbot/ffprobe.exe")
         logger.info(f"FFprobe.exe可用: {ffprobe_exists}")
 
         # 检查LLBot文件是否存在
@@ -1108,10 +1088,8 @@ def progress_callback(downloaded: int, total: int):
                 if not node_exists:
                     self._show_node_download_dialog()
                 else:
-                    ffmpeg_path = config.get("ffmpeg_path", DEFAULT_CONFIG["ffmpeg_path"])
-                    ffprobe_path = config.get("ffprobe_path", DEFAULT_CONFIG["ffprobe_path"])
-                    ffmpeg_exists = self.downloader.check_file_exists(ffmpeg_path)
-                    ffprobe_exists = self.downloader.check_file_exists(ffprobe_path)
+                    ffmpeg_exists = self.downloader.check_ffmpeg_exists()
+                    ffprobe_exists = self.downloader.check_ffprobe_exists()
 
                     if not ffmpeg_exists or not ffprobe_exists:
                         self._show_ffmpeg_download_dialog()
@@ -1311,11 +1289,8 @@ def progress_callback(downloaded: int, total: int):
                 if self.page:
                     self.page.pop_dialog()
 
-                config = self.config_manager.load_config()
-                ffmpeg_path = config.get("ffmpeg_path", DEFAULT_CONFIG["ffmpeg_path"])
-                ffprobe_path = config.get("ffprobe_path", DEFAULT_CONFIG["ffprobe_path"])
-                ffmpeg_exists = self.downloader.check_file_exists(ffmpeg_path)
-                ffprobe_exists = self.downloader.check_file_exists(ffprobe_path)
+                ffmpeg_exists = self.downloader.check_ffmpeg_exists()
+                ffprobe_exists = self.downloader.check_ffprobe_exists()
 
                 if not ffmpeg_exists or not ffprobe_exists:
                     self._show_ffmpeg_download_dialog()

ui/main_window.py

@@ -140,6 +140,9 @@ def build(self, page: ft.Page):
         self.about_page.config_manager = self.config_manager
         self.about_page.build(page)
 
+        # 注册更新发现回调，同时通知首页和关于页面
+        self.update_manager.set_updates_found_callback(self._on_updates_found)
+        
         # 创建导航栏
         self.nav_rail = ft.NavigationRail(
             selected_index=0,
@@ -373,6 +376,14 @@ def _update_home_title(self, uin: str, nickname: str):
     def _on_about_page_update_complete(self, component: str):
         self.home_page.clear_update_banner(component)
 
+    def _on_updates_found(self, updates_found: list):
+        if self.page:
+            async def notify_pages():
+                self.about_page.set_updates_found(updates_found)
+                if self.page:
+                    self.page.update()
+            self.page.run_task(notify_pages)
+    
     def _on_restart_service_after_update(self):
         import logging
         logger = logging.getLogger(__name__)

utils/constants.py

@@ -19,8 +19,6 @@
     "pmhq_path": "bin/pmhq/pmhq-win-x64.exe",
     "llbot_path": "bin/llbot/llbot.js",
     "node_path": "bin/llbot/node.exe",
-    "ffmpeg_path": "bin/llbot/ffmpeg.exe",
-    "ffprobe_path": "bin/llbot/ffprobe.exe",
     "auto_start_pmhq": False,
     "auto_start_llbot": False,
     "auto_start_bot": False,

utils/downloader.py

@@ -70,6 +70,14 @@ def check_ffmpeg_available(self) -> Optional[str]:
     def check_ffprobe_available(self) -> Optional[str]:
         return self.find_in_path("ffprobe.exe") or self.find_in_path("ffprobe")
 
+    def check_ffmpeg_exists(self) -> bool:
+        """先检查环境变量，再检查 bin/llbot/"""
+        return bool(self.check_ffmpeg_available()) or self.check_file_exists("bin/llbot/ffmpeg.exe")
+    
+    def check_ffprobe_exists(self) -> bool:
+        """先检查环境变量，再检查 bin/llbot/"""
+        return bool(self.check_ffprobe_available()) or self.check_file_exists("bin/llbot/ffprobe.exe")
+
     def _get_npm_tarball_url(self, package_name: str) -> str:
         return get_package_tarball_url(
             package_name,