【修改信息】 bug fix

ExistOrLive · ExistOrLive · commit 255b9db780b3 · 2025-06-17T01:19:22.000+08:00
diff --git a/ZLGitHubClient/Podfile b/ZLGitHubClient/Podfile
@@ -18,20 +18,20 @@ pod "SYDCentralPivot"
 pod 'ZLGithubOAuth', :git => 'https://github.com/ExistOrLive/ZLGithubOAuth.git', :tag => "1.3.1"
 #pod "ZLGithubOAuth", :path => '../../ZLGithubOAuth'
 
-pod 'ZLGitRemoteService', :git => 'https://github.com/ExistOrLive/ZLGitRemoteService.git'
+pod 'ZLGitRemoteService', :git => 'https://github.com/ExistOrLive/ZLGitRemoteService.git', :tag => "1.8.0"
 #pod "ZLGitRemoteService", :path => '../../ZLGitRemoteService'
 
 pod 'ZLBaseExtension', :git => "https://github.com/ExistOrLive/ZLBaseExtension.git", :tag => "1.3.0"
 #pod 'ZLBaseExtension', :path => "../../ZLBaseExtension"
 
-pod 'ZLUIUtilities', :git => "https://github.com/ExistOrLive/ZLUIUtilities.git", :tag => "1.3.0"
+pod 'ZLUIUtilities', :git => "https://github.com/ExistOrLive/ZLUIUtilities.git", :tag => "1.8.0"
 #pod 'ZLUIUtilities', :path => "../../ZLUIUtilities"
 
 #pod 'ZLUtilities', :path => '../../ZLUtilities'
-pod 'ZLUtilities', :git => "https://github.com/ExistOrLive/ZLUtilities.git"
+pod 'ZLUtilities', :git => "https://github.com/ExistOrLive/ZLUtilities.git", :tag => "1.8.0"
 
 #pod 'ZMMVVM', :path => '../../ZMMVVM'
-pod 'ZMMVVM', :git => "https://github.com/ExistOrLive/ZMMVVM.git", :tag => "1.3.0"
+pod 'ZMMVVM', :git => "https://github.com/ExistOrLive/ZMMVVM.git", :tag => "1.8.0"
 
 pod 'Umbrella'
 pod 'Umbrella/Firebase'
diff --git a/ZLGitHubClient/Podfile.lock b/ZLGitHubClient/Podfile.lock
@@ -215,7 +215,7 @@ PODS:
     - Alamofire
     - SnapKit
     - ZLUIUtilities
-  - ZLGitRemoteService (1.7.1):
+  - ZLGitRemoteService (1.8.0):
     - Alamofire
     - Apollo (~> 0.39.0)
     - CocoaLumberjack
@@ -225,20 +225,20 @@ PODS:
     - ObjectMapper
     - SYDCentralPivot
     - ZLUtilities
-  - ZLUIUtilities (1.3.0):
+  - ZLUIUtilities (1.8.0):
     - MBProgressHUD
     - MJRefresh
     - SnapKit
     - Toast-Swift
     - ZLBaseExtension
     - ZLUtilities
     - ZMMVVM
-  - ZLUtilities (1.3.0):
+  - ZLUtilities (1.8.0):
     - Firebase/Analytics
     - ObjectMapper
     - Umbrella
     - Umbrella/Firebase
-  - ZMMVVM (1.3.0):
+  - ZMMVVM (1.8.0):
     - SnapKit
 
 DEPENDENCIES:
@@ -269,10 +269,10 @@ DEPENDENCIES:
   - YYText
   - ZLBaseExtension (from `https://github.com/ExistOrLive/ZLBaseExtension.git`, tag `1.3.0`)
   - ZLGithubOAuth (from `https://github.com/ExistOrLive/ZLGithubOAuth.git`, tag `1.3.1`)
-  - ZLGitRemoteService (from `https://github.com/ExistOrLive/ZLGitRemoteService.git`)
-  - ZLUIUtilities (from `https://github.com/ExistOrLive/ZLUIUtilities.git`, tag `1.3.0`)
-  - ZLUtilities (from `https://github.com/ExistOrLive/ZLUtilities.git`)
-  - ZMMVVM (from `https://github.com/ExistOrLive/ZMMVVM.git`, tag `1.3.0`)
+  - ZLGitRemoteService (from `https://github.com/ExistOrLive/ZLGitRemoteService.git`, tag `1.8.0`)
+  - ZLUIUtilities (from `https://github.com/ExistOrLive/ZLUIUtilities.git`, tag `1.8.0`)
+  - ZLUtilities (from `https://github.com/ExistOrLive/ZLUtilities.git`, tag `1.8.0`)
+  - ZMMVVM (from `https://github.com/ExistOrLive/ZMMVVM.git`, tag `1.8.0`)
 
 SPEC REPOS:
   trunk:
@@ -331,14 +331,16 @@ EXTERNAL SOURCES:
     :tag: 1.3.1
   ZLGitRemoteService:
     :git: https://github.com/ExistOrLive/ZLGitRemoteService.git
+    :tag: 1.8.0
   ZLUIUtilities:
     :git: https://github.com/ExistOrLive/ZLUIUtilities.git
-    :tag: 1.3.0
+    :tag: 1.8.0
   ZLUtilities:
     :git: https://github.com/ExistOrLive/ZLUtilities.git
+    :tag: 1.8.0
   ZMMVVM:
     :git: https://github.com/ExistOrLive/ZMMVVM.git
-    :tag: 1.3.0
+    :tag: 1.8.0
 
 CHECKOUT OPTIONS:
   MBProgressHUD:
@@ -351,17 +353,17 @@ CHECKOUT OPTIONS:
     :git: https://github.com/ExistOrLive/ZLGithubOAuth.git
     :tag: 1.3.1
   ZLGitRemoteService:
-    :commit: a97300c794ac7fa347363ea1c6a47110f43e0fe9
     :git: https://github.com/ExistOrLive/ZLGitRemoteService.git
+    :tag: 1.8.0
   ZLUIUtilities:
     :git: https://github.com/ExistOrLive/ZLUIUtilities.git
-    :tag: 1.3.0
+    :tag: 1.8.0
   ZLUtilities:
-    :commit: 9bb195a37c432111e3ecee6c45e887097c137943
     :git: https://github.com/ExistOrLive/ZLUtilities.git
+    :tag: 1.8.0
   ZMMVVM:
     :git: https://github.com/ExistOrLive/ZMMVVM.git
-    :tag: 1.3.0
+    :tag: 1.8.0
 
 SPEC CHECKSUMS:
   Alamofire: f36a35757af4587d8e4f4bfa223ad10be2422b8c
@@ -410,11 +412,11 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZLBaseExtension: b19ba7680506b4e3211ec31dac27f2355f189845
   ZLGithubOAuth: 19f4b9c205ff550131f004a140e09e0f5f9f3ae7
-  ZLGitRemoteService: 5d98f351b2b762782aa4fe736f3f33aa9dfa3cca
-  ZLUIUtilities: 4971f48f43971fe39eb65832abb47af68d21a9de
-  ZLUtilities: cc526fb2d1a47ca55345cc2dc03ed05f11068bf7
-  ZMMVVM: 92ef04990cd7d0ae5bb3ea9ddf778023bc5c5d9e
+  ZLGitRemoteService: e7fda9ae61a2ceba4cbc3f5101dbfb175cfce236
+  ZLUIUtilities: d5a61d55d1318b8b53c0c1948a920c7d72591bdd
+  ZLUtilities: 4fb9c6da4c56277195f4f429e2772e72651d3015
+  ZMMVVM: be8e6ae251edb9b72461d1a1c3db446f540afe9d
 
-PODFILE CHECKSUM: 02f7d71cdf50a85dbc6c1cd9f993df797bc9885a
+PODFILE CHECKSUM: f4ae50a18b144463982bc588250ed26561c2c222
 
 COCOAPODS: 1.16.2
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCommitInfoController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCommitInfoController.swift
@@ -89,7 +89,7 @@ class ZLCommitInfoController: ZMTableViewController {
     override func setupUI() {
         super.setupUI()
         
-        self.title = "\(ZLLocalizedString(string: "Commit", comment: "提交")) #\(ref?.prefix(7) ?? "")"
+        self.title = "\(ZLLocalizedString(string: "commit", comment: "提交")) #\(ref?.prefix(7) ?? "")"
         
         self.zmNavigationBar.addRightView(moreButton)
         
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCompareCommitFilesController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCompareCommitFilesController.swift
@@ -81,7 +81,7 @@ class ZLCompareCommitFilesController: ZMTableViewController {
     override func setupUI() {
         super.setupUI()
         
-        self.title = ZLLocalizedString(string: "commits", comment: "提交")
+        self.title = ZLLocalizedString(string: "File Diff", comment: "文件差异")
         
 
         tableView.register(ZLCommitInfoPatchCell.self,
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/Discussion/ZLDiscussionInfoController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/Discussion/ZLDiscussionInfoController.swift
@@ -47,7 +47,7 @@ class ZLDiscussionInfoController: ZMTableViewController {
     override func setupUI() {
         super.setupUI()
         
-        self.title = "\(ZLLocalizedString(string: "Discussions", comment: "讨论")) #\(number)"
+        self.title = "\(ZLLocalizedString(string: "Discussion", comment: "讨论")) #\(number)"
         
         self.zmNavigationBar.addRightView(moreButton)
         
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/Release/ZLReleaseInfoController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/Release/ZLReleaseInfoController.swift
@@ -49,7 +49,7 @@ class ZLReleaseInfoController: ZMTableViewController {
     override func setupUI() {
         super.setupUI()
         
-        self.title = "\(ZLLocalizedString(string: "Releases", comment: "发行版")) \(tagName ?? "")"
+        self.title = "\(ZLLocalizedString(string: "Release", comment: "发行版")) \(tagName ?? "")"
         
         self.zmNavigationBar.addRightView(moreButton)
         
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLIssueTableViewCell/viewModel/ZLIssueTimelineTableViewCellData.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLIssueTableViewCell/viewModel/ZLIssueTimelineTableViewCellData.swift
@@ -10,6 +10,7 @@ import UIKit
 import ZLBaseExtension
 import ZLGitRemoteService
 import ZMMVVM
+import ZLUtilities
 
 class ZLIssueTimelineTableViewCellData: ZMBaseTableViewCellViewModel {
 
@@ -427,6 +428,9 @@ extension ZLIssueTimelineTableViewCellData: ZLIssueTimelineTableViewCellDelegate
             return string
         }
 
+        analytics.log(.unknownIssueTimelineType(type: data.__typename))
+        
+        
         return NSAttributedString(string: data.__typename,
                                   attributes: [.font: UIFont.zlSemiBoldFont(withSize: 15),
                                                .foregroundColor: UIColor.label(withName: "ZLLabelColor1")])
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLPullRequestTableViewCell/viewmodel/ZLPullRequestTimelineTableViewCellData.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLPullRequestTableViewCell/viewmodel/ZLPullRequestTimelineTableViewCellData.swift
@@ -10,6 +10,7 @@ import UIKit
 import ZLBaseExtension
 import ZLGitRemoteService
 import ZMMVVM
+import ZLUtilities
 
 class ZLPullRequestTimelineTableViewCellData: ZMBaseTableViewCellViewModel {
 
@@ -493,6 +494,8 @@ extension ZLPullRequestTimelineTableViewCellData: ZLPullRequestTimelineTableView
             return string
 
         }
+        
+        analytics.log(.unknownPrTimelineType(type: data.__typename))
 
         return NSAttributedString(string: data.__typename,
                                   attributes: [.font: UIFont.zlSemiBoldFont(withSize: 15),
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/issue/ZLIssueInfoController/ViewController/ZLIssueInfoController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/issue/ZLIssueInfoController/ViewController/ZLIssueInfoController.swift
@@ -53,7 +53,7 @@ class ZLIssueInfoController: ZMTableViewController {
         super.setupUI()
            
         
-        self.title = "\(ZLLocalizedString(string: "issues", comment: "合并请求")) #\(number)"
+        self.title = "\(ZLLocalizedString(string: "issue", comment: "合并请求")) #\(number)"
         
         self.zmNavigationBar.addRightView(moreButton)
        
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/repo/ZLRepoForkedReposController/Controller/ZLRepoForkedReposController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/repo/ZLRepoForkedReposController/Controller/ZLRepoForkedReposController.swift
@@ -30,7 +30,6 @@ class ZLRepoForkedReposController: ZMTableViewController {
         super.setupUI()
         
         title = ZLLocalizedString(string: "fork", comment: "")
-        title = ZLLocalizedString(string: "star", comment: "标星")
         
         tableView.contentInsetAdjustmentBehavior = .automatic
         tableView.contentInset = UIEdgeInsets(top: 5, left: 0, bottom: 0, right: 0)
diff --git a/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/en.lproj/ZLGitHubClientLocalizable.strings b/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/en.lproj/ZLGitHubClientLocalizable.strings
@@ -227,9 +227,9 @@
 "Issue_Unlock" = "Unlock Issue";
 "Save_Success" = "Save Success";
 "Save_Fail" = "Save Fail";
-"Discussions" = "Discussions";
+
 "input number" = "Input number";
-"Releases" = "Releases";
+
 
 "Comment is Empty" = "Comment is Empty";
 
@@ -247,3 +247,11 @@
 
 // gist
 "Gist Files" = "Gist Files";
+
+// release
+"Releases" = "Releases";
+"Release" = "Release";
+
+// Discussion
+"Discussions" = "Discussions";
+"Discussion" = "Discussion";
diff --git a/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/zh-Hans.lproj/ZLGitHubClientLocalizable.strings b/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/zh-Hans.lproj/ZLGitHubClientLocalizable.strings
@@ -228,9 +228,8 @@
 "Issue_Unlock" = "取消锁定问题";
 "Save_Success" = "保存成功";
 "Save_Fail" = "保存失败";
-"Discussions" = "讨论";
 "input number" = "输入数字";
-"Releases" = "发行版";
+
 
 "Comment is Empty" = "评论为空";
 
@@ -248,3 +247,11 @@
 
 // gist
 "Gist Files" = "代码片段文件";
+
+// release
+"Release" = "发行版";
+"Releases" = "发行版";
+
+// Discussion
+"Discussions" = "讨论";
+"Discussion" = "讨论";
