perf: optimize QR code generation and connection info for phone LAN export (#11086)

* Increase QR code margin for better scanning reliability - Change QRCodeSVG marginSize from 2 to 4 pixels - Maintains same QR code size (160px) and error correction level (Q) - Improves readability and scanning success rate on mobile devices * Optimize QR code generation and connection info for phone LAN export - Increase QR code size to 180px and reduce error correction to 'L' for better mobile scanning - Replace hardcoded logo path with AppLogo config and increase logo size to 60px - Simplify connection info by removing candidates array and using only essential IP/port data * Optimize QR code data structure for LAN connection - Compress IP addresses to numeric format to reduce QR code complexity - Use compact array format instead of verbose JSON object structure - Remove debug logging to streamline connection flow * feat: 更新 WebSocket 状态和候选者响应类型，优化连接信息处理 * Increase QR code size and error correction for better scanning - Increase QR code size from 180px to 300px for improved readability - Change error correction level from L (low) to H (high) for better reliability - Reduce logo size from 60px to 40px to accommodate larger QR data - Increase margin size from 1 to 2 for better border clearance * 调整二维码大小和图标尺寸以优化扫描体验 * fix(i18n): Auto update translations for PR #11086 * fix(i18n): Auto update translations for PR #11086 * fix(i18n): Auto update translations for PR #11086 --------- Co-authored-by: GitHub Action <action@github.com>
2025-12-30 15:59:09 +08:00 · 2025-11-01 12:13:11 +08:00 · 2025-11-01 12:13:11 +08:00 · ff05179b1c
commit ff05179b1c
parent 3531fa5c3b
9 changed files with 62 additions and 52 deletions
--- a/packages/shared/config/types.ts
+++ b/packages/shared/config/types.ts
@ -31,3 +31,16 @@ export type WebviewKeyEvent = {
  shift: boolean
  alt: boolean
 }
+
+export interface WebSocketStatusResponse {
+  isRunning: boolean
+  port?: number
+  ip?: string
+  clientConnected: boolean
+}
+
+export interface WebSocketCandidatesResponse {
+  host: string
+  interface: string
+  priority: number
+}
--- a/src/main/services/WebSocketService.ts
+++ b/src/main/services/WebSocketService.ts
@ -1,4 +1,5 @@
 import { loggerService } from '@logger'
+import { WebSocketCandidatesResponse, WebSocketStatusResponse } from '@shared/config/types'
 import * as fs from 'fs'
 import { networkInterfaces } from 'os'
 import * as path from 'path'
@ -201,12 +202,7 @@ class WebSocketService {
    }
  }

-  public getStatus = async (): Promise<{
-    isRunning: boolean
-    port?: number
-    ip?: string
-    clientConnected: boolean
-  }> => {
+  public getStatus = async (): Promise<WebSocketStatusResponse> => {
    return {
      isRunning: this.isStarted,
      port: this.isStarted ? this.port : undefined,
@ -215,13 +211,7 @@ class WebSocketService {
    }
  }

-  public getAllCandidates = async (): Promise<
-    Array<{
-      host: string
-      interface: string
-      priority: number
-    }>
-  > => {
+  public getAllCandidates = async (): Promise<WebSocketCandidatesResponse[]> => {
    const interfaces = networkInterfaces()

    // 按优先级排序的网络接口名称模式
--- a/src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx
+++ b/src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx
@ -3,7 +3,9 @@ import { Modal, ModalBody, ModalContent, ModalFooter, ModalHeader } from '@herou
 import { Progress } from '@heroui/progress'
 import { Spinner } from '@heroui/spinner'
 import { loggerService } from '@logger'
+import { AppLogo } from '@renderer/config/env'
 import { SettingHelpText, SettingRow } from '@renderer/pages/settings'
+import { WebSocketCandidatesResponse } from '@shared/config/types'
 import { QRCodeSVG } from 'qrcode.react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@ -38,12 +40,12 @@ const ScanQRCode: React.FC<{ qrCodeValue: string }> = ({ qrCodeValue }) => {
      <QRCodeSVG
        marginSize={2}
        value={qrCodeValue}
-        level="Q"
-        size={160}
+        level="H"
+        size={200}
        imageSettings={{
-          src: '/src/assets/images/logo.png',
-          width: 40,
-          height: 40,
+          src: AppLogo,
+          width: 60,
+          height: 60,
          excavate: true
        }}
      />
@ -198,17 +200,28 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
      const { port, ip } = await window.api.webSocket.status()

      if (ip && port) {
-        const candidates = await window.api.webSocket.getAllCandidates()
-        const connectionInfo = {
-          type: 'cherry-studio-app',
-          candidates,
-          selectedHost: ip,
-          port,
-          timestamp: Date.now()
+        const candidatesData = await window.api.webSocket.getAllCandidates()
+
+        const optimizeConnectionInfo = () => {
+          const ipToNumber = (ip: string) => {
+            return ip.split('.').reduce((acc, octet) => (acc << 8) + parseInt(octet), 0)
+          }
+
+          const compressedData = [
+            'CSA',
+            ipToNumber(ip),
+            candidatesData.map((candidate: WebSocketCandidatesResponse) => ipToNumber(candidate.host)),
+            port, // 端口号
+            Date.now() % 86400000
+          ]
+
+          return compressedData
        }
-        setQrCodeValue(JSON.stringify(connectionInfo))
+
+        const compressedData = optimizeConnectionInfo()
+        const qrCodeValue = JSON.stringify(compressedData)
+        setQrCodeValue(qrCodeValue)
        setConnectionPhase('waiting_qr_scan')
-        logger.info(`QR code generated: ${ip}:${port} with ${candidates.length} IP candidates`)
      } else {
        setError(t('settings.data.export_to_phone.lan.error.no_ip'))
        setConnectionPhase('error')
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@ -2573,15 +2573,14 @@
      },
      "description": "Ένα AI ασιστάντα που έχει σχεδιαστεί για δημιουργούς",
      "downloading": "Λήψη ενημερώσεων...",
+      "enterprise": {
+        "title": "Επιχείρηση"
+      },
      "feedback": {
        "button": "Σχόλια και Παρατηρήσεις",
        "title": "Αποστολή σχολίων"
      },
      "label": "Περί μας",
-      "license": {
-        "button": "Προβολή",
-        "title": "Licenses"
-      },
      "releases": {
        "button": "Προβολή",
        "title": "Ημερολόγιο Ενημερώσεων"
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@ -2573,15 +2573,14 @@
      },
      "description": "Una asistente de IA creada para los creadores",
      "downloading": "Descargando actualización...",
+      "enterprise": {
+        "title": "Empresa"
+      },
      "feedback": {
        "button": "Enviar feedback",
        "title": "Enviar comentarios"
      },
      "label": "Acerca de nosotros",
-      "license": {
-        "button": "Ver",
-        "title": "Licencia"
-      },
      "releases": {
        "button": "Ver",
        "title": "Registro de cambios"
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@ -2573,15 +2573,14 @@
      },
      "description": "Un assistant IA conçu pour les créateurs",
      "downloading": "Téléchargement de la mise à jour en cours...",
+      "enterprise": {
+        "title": "Entreprise"
+      },
      "feedback": {
        "button": "Faire un retour",
        "title": "Retour d'information"
      },
      "label": "À propos de nous",
-      "license": {
-        "button": "Afficher",
-        "title": "Licence"
-      },
      "releases": {
        "button": "Afficher",
        "title": "Journal des mises à jour"
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@ -2573,15 +2573,14 @@
      },
      "description": "クリエイターのための強力なAIアシスタント",
      "downloading": "ダウンロード中...",
+      "enterprise": {
+        "title": "エンタープライズ"
+      },
      "feedback": {
        "button": "フィードバック",
        "title": "フィードバック"
      },
      "label": "について",
-      "license": {
-        "button": "ライセンス",
-        "title": "ライセンス"
-      },
      "releases": {
        "button": "リリース",
        "title": "リリースノート"
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@ -2573,15 +2573,14 @@
      },
      "description": "Um assistente de IA criado para criadores",
      "downloading": "Baixando atualizações...",
+      "enterprise": {
+        "title": "Empresa"
+      },
      "feedback": {
        "button": "Feedback",
        "title": "Enviar feedback"
      },
      "label": "Sobre Nós",
-      "license": {
-        "button": "Ver",
-        "title": "Licença"
-      },
      "releases": {
        "button": "Ver",
        "title": "Registro de alterações"
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@ -2573,15 +2573,14 @@
      },
      "description": "Мощный AI-ассистент для созидания",
      "downloading": "Загрузка...",
+      "enterprise": {
+        "title": "Предприятие"
+      },
      "feedback": {
        "button": "Обратная связь",
        "title": "Обратная связь"
      },
      "label": "О программе и обратная связь",
-      "license": {
-        "button": "Лицензия",
-        "title": "Лицензия"
-      },
      "releases": {
        "button": "Релизы",
        "title": "Заметки о релизах"
@ -2693,7 +2692,7 @@
        "confirm": {
          "button": "[to be translated]:选择备份文件"
        },
-        "content": "[to be translated]:导出部分数据，包括聊天记录、设置。请注意，备份过程可能需要一些时间，感谢您的耐心等待。",
+        "content": "Экспорт части данных, включая историю чатов и настройки. Обратите внимание, процесс резервного копирования может занять некоторое время, благодарим за ваше терпение.",
        "lan": {
          "auto_close_tip": "[to be translated]:Auto-closing in {{seconds}} seconds...",
          "confirm_close_message": "[to be translated]:File transfer is in progress. Closing will interrupt the transfer. Are you sure you want to force close?",