Merge branch 'dev' into perfect_menu

tisfeng · Feb 18, 2024 · c3b8a12 · c3b8a12
2 parents c02c803 + 1c228a8
commit c3b8a12
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 62 deletions.
diff --git a/.github/workflows/objective-c-xcode.yml b/.github/workflows/objective-c-xcode.yml
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
diff --git a/Easydict/Feature/Configuration/Configuration.swift b/Easydict/Feature/Configuration/Configuration.swift
@@ -220,7 +220,7 @@ let kHideMenuBarIconKey = "EZConfiguration_kHideMenuBarIconKey"
         )
 
         cancellables.append(
-            Defaults.publisher(.launchAtStartup)
+            Defaults.publisher(.launchAtStartup, options: [])
                 .removeDuplicates()
                 .sink { [weak self] change in
                     self?.didSetLaunchAtStartup(change.oldValue, new: change.newValue)

diff --git a/Easydict/Feature/Service/Gemini/GeminiService.swift b/Easydict/Feature/Service/Gemini/GeminiService.swift
@@ -40,11 +40,6 @@ public final class GeminiService: QueryService {
         return orderedDict
     }
 
-    override public func ocr(_: EZQueryModel) async throws -> EZOCRResult {
-        NSLog("Gemini Translate does not support OCR")
-        throw QueryServiceError.notSupported
-    }
-
     override public func needPrivateAPIKey() -> Bool {
         true
     }
@@ -56,6 +51,10 @@ public final class GeminiService: QueryService {
         return true
     }
 
+    override public func totalFreeQueryCharacterCount() -> Int {
+        100000 * 1000
+    }
+
     private let defaultAPIKey = "" /* .decryptAES() */
 
     // easydict://writeKeyValue?EZGeminiAPIKey=xxx

diff --git a/Easydict/Feature/Service/Model/EZQueryService.h b/Easydict/Feature/Service/Model/EZQueryService.h
@@ -114,6 +114,7 @@ NS_SWIFT_NAME(QueryService)
 
 - (BOOL)needPrivateAPIKey;
 
+/// Default is 100 * 10000
 - (NSInteger)totalFreeQueryCharacterCount;
 
 /// 获取文本的语言

diff --git a/Easydict/Feature/Service/Niutrans/EZNiuTransTranslate.m b/Easydict/Feature/Service/Niutrans/EZNiuTransTranslate.m
@@ -120,7 +120,7 @@ - (BOOL)hasPrivateAPIKey {
 }
 
 - (NSInteger)totalFreeQueryCharacterCount {
-    return 800 * 10000;
+    return 1000 * 10000;
 }
 
 #pragma mark - NiuTrans API

diff --git a/Easydict/Feature/ViewController/Window/WindowManager/EZWindowManager.m b/Easydict/Feature/ViewController/Window/WindowManager/EZWindowManager.m
@@ -691,9 +691,13 @@ - (void)selectTextTranslate {
     [self.eventMonitor getSelectedText:^(NSString *_Nullable text) {
         self.actionType = self.eventMonitor.actionType;
 
-        // Clear query if text is nil and user don't want to keep the last result.
-        if (!text && !Configuration.shared.keepPrevResultWhenEmpty) {
-            text = @"";
+        /**
+         Clear query if text is nil and user don't want to keep the last result.
+         
+         !!!: text may be @"" when no selected text in Chrome, so we need to handle it.
+         */
+        if (text.length == 0) {
+            text = Configuration.shared.keepPrevResultWhenEmpty ? nil : @"";
         }
         self.selectedText = [text trim];
 

diff --git a/README.md b/README.md
@@ -827,6 +827,7 @@ Easydict 作为一个免费开源的非盈利项目，目前主要是作者个
 | 2024-01-28 | ㅤ | 7 | |
 | 2024-01-29 | 大帅ㅤ | 5 | 还没有，但是感受到了用心。|
 | 2024-02-04 | ll | 20 | |
+| 2024-02-10 | 盒子哥 | 100 | |
 
 </p>
 

diff --git a/README_EN.md b/README_EN.md
@@ -824,6 +824,7 @@ If you don't want your username to be displayed in the list, please choose anony
 | 2024-01-28 | ㅤ | 7 | |
 | 2024-01-29 | 大帅ㅤ | 5 | 还没有，但是感受到了用心。|
 | 2024-02-04 | ll | 20 | |
+| 2024-02-10 | 盒子哥 | 100 | |
 
 </p>