【修改信息】 git diff 支持二进制，大文件，图片以及重命名场景

ExistOrLive · ExistOrLive · commit cf0e211404fe · 2025-05-27T00:29:08.000+08:00
diff --git a/ZLGitHubClient/Podfile.lock b/ZLGitHubClient/Podfile.lock
@@ -351,7 +351,7 @@ CHECKOUT OPTIONS:
     :git: https://github.com/ExistOrLive/ZLGithubOAuth.git
     :tag: 1.3.1
   ZLGitRemoteService:
-    :commit: fd499dd4e8cfa9bc5b7f07d81ff3df67ca9a2d3e
+    :commit: bf6ff8e5da6a8108360c0002811085751471b6a7
     :git: https://github.com/ExistOrLive/ZLGitRemoteService.git
   ZLUIUtilities:
     :git: https://github.com/ExistOrLive/ZLUIUtilities.git
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCommitInfoController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCommitInfoController.swift
@@ -44,6 +44,47 @@ class ZLCommitInfoController: ZMTableViewController {
         refreshLoadNewData()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        if ZLDeviceInfo.isIPhone() {
+            guard let appdelegate: AppDelegate = UIApplication.shared.delegate as? AppDelegate else {
+                return
+            }
+            appdelegate.allowRotation = true
+        }
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+
+        if ZLDeviceInfo.isIPhone() {
+            guard let appdelegate: AppDelegate = UIApplication.shared.delegate as? AppDelegate else {
+                return
+            }
+            appdelegate.allowRotation = false
+        }
+    }
+
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+
+        super.viewWillTransition(to: size, with: coordinator)
+
+        if ZLDeviceInfo.isIPhone() {
+            guard let navigationVC: ZMNavigationController = self.navigationController as? ZMNavigationController else {
+                return
+            }
+            if size.height > size.width {
+                // 横屏变竖屏
+                self.isZmNavigationBarHidden = false
+                navigationVC.forbidGestureBack = false
+            } else {
+                self.isZmNavigationBarHidden = true
+                navigationVC.forbidGestureBack = true
+            }
+        }
+    }
+    
     
     override func setupUI() {
         super.setupUI()
@@ -174,8 +215,8 @@ extension ZLCommitInfoController {
         
         sectionDatas.append(ZMBaseTableViewSectionData(
             cellDatas: [ZLCommitInfoHeaderCellData(model: data)],
-            headerData: ZLCommonSectionHeaderFooterViewDataV2(backColor: .clear, viewHeight: 8),
-            footerData: ZLCommonSectionHeaderFooterViewDataV2(backColor: .clear, viewHeight: 8)))
+            headerData: ZLCommonSectionHeaderFooterViewDataV2(backColor: .back(withName: "ZLVCBackColor"), viewHeight: 8),
+            footerData: ZLCommonSectionHeaderFooterViewDataV2(backColor: .back(withName: "ZLVCBackColor"), viewHeight: 8)))
    
     
         var files = data.files
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCompareCommitFilesController.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/Commit/ZLCompareCommitFilesController.swift
@@ -37,6 +37,47 @@ class ZLCompareCommitFilesController: ZMTableViewController {
         refreshLoadNewData()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        if ZLDeviceInfo.isIPhone() {
+            guard let appdelegate: AppDelegate = UIApplication.shared.delegate as? AppDelegate else {
+                return
+            }
+            appdelegate.allowRotation = true
+        }
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+
+        if ZLDeviceInfo.isIPhone() {
+            guard let appdelegate: AppDelegate = UIApplication.shared.delegate as? AppDelegate else {
+                return
+            }
+            appdelegate.allowRotation = false
+        }
+    }
+
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+
+        super.viewWillTransition(to: size, with: coordinator)
+
+        if ZLDeviceInfo.isIPhone() {
+            guard let navigationVC: ZMNavigationController = self.navigationController as? ZMNavigationController else {
+                return
+            }
+            if size.height > size.width {
+                // 横屏变竖屏
+                self.isZmNavigationBarHidden = false
+                navigationVC.forbidGestureBack = false
+            } else {
+                self.isZmNavigationBarHidden = true
+                navigationVC.forbidGestureBack = true
+            }
+        }
+    }
+    
     override func setupUI() {
         super.setupUI()
         
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/view/ZLCommitInfoFilePathHeaderView.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/view/ZLCommitInfoFilePathHeaderView.swift
@@ -27,6 +27,8 @@ class ZLCommitInfoFilePathHeaderView: UITableViewHeaderFooterView {
     override init(reuseIdentifier: String?) {
         super.init(reuseIdentifier: reuseIdentifier)
 
+        backgroundView = UIView()
+        backgroundView?.backgroundColor = .clear 
         contentView.backgroundColor = .back(withName: "ZLCellBack")
         contentView.addSubview(self.titleLabel)
  
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/view/ZLCommitInfoHeaderCell.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/view/ZLCommitInfoHeaderCell.swift
@@ -34,6 +34,7 @@ class ZLCommitInfoHeaderCell: UITableViewCell {
     
     func setupUI() {
         selectionStyle = .none
+        backgroundColor = .clear
         contentView.backgroundColor = UIColor(named: "ZLIssueCommentCellColor")
         contentView.addSubview(titleLabel)
         contentView.addSubview(authorAvatarButton)
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/viewModel/ZLCommitInfoHeaderCellData.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/viewModel/ZLCommitInfoHeaderCellData.swift
@@ -58,28 +58,22 @@ extension ZLCommitInfoHeaderCellData: ZLCommitInfoHeaderCellSourceAndDelegate {
         
         if let additions = model.stats?.additions ,
            additions > 0 {
-            str.append("\(additions)"
+            str.append("+\(additions)"
                 .asMutableAttributedString()
                 .font(.zlMediumFont(withSize: 13))
                 .foregroundColor(.label(withName: "addColor")))
-            str.append(" 个添加 "
-                .asMutableAttributedString()
-                .font(.zlRegularFont(withSize: 13))
-                .foregroundColor(.label(withName: "ZLLabelColor1")))
         }
         
         if let deletions = model.stats?.deletions ,
            deletions > 0 {
-            str.append("\(deletions)"
+            str.append(" -\(deletions)"
                 .asMutableAttributedString()
                 .font(.zlMediumFont(withSize: 13))
                 .foregroundColor(.label(withName: "deleteColor")))
-            str.append(" 个删除"
-                .asMutableAttributedString()
-                .font(.zlRegularFont(withSize: 13))
-                .foregroundColor(.label(withName: "ZLLabelColor1")))
         }
         
+        str.paraghStyle(NSMutableParagraphStyle().lineSpacing(10))
+        
         return str
     }
     
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/viewModel/ZLCommitInfoPatchCellData.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommitTableViewCell/viewModel/ZLCommitInfoPatchCellData.swift
@@ -13,15 +13,23 @@ import ZLGitRemoteService
 import ZMMVVM
 import WebKit
 
+enum PatchType {
+    case normal
+    case renamed
+    case image
+    case binary
+    case largeChanged
+}
+
 class ZLCommitInfoPatchCellData: ZMBaseTableViewCellViewModel {
     
     private var cellHeight: CGFloat = 0
     
-    let model: ZLGithubFileModel
+    let model: ZLGithubFileDiffModel
     var patchStr: String = ""
     var imagePath: String = ""
-    var isBinary: Bool = false
-    var isImage: Bool = false
+    var type: PatchType = .normal
+  
     
     var cacheHtml: String?
     
@@ -51,9 +59,6 @@ class ZLCommitInfoPatchCellData: ZMBaseTableViewCellViewModel {
                 
             })
         }
-        let script = WKUserScript(source: self.renderDiffContentScript(), injectionTime: .atDocumentEnd, forMainFrameOnly: false)
-        webView.configuration.userContentController.addUserScript(script)
-        
         return webView
     }()
     
@@ -71,7 +76,7 @@ class ZLCommitInfoPatchCellData: ZMBaseTableViewCellViewModel {
         _webView.loadHTML(cacheHtml ?? "", baseURL: Bundle.main.bundleURL)
     }
     
-    init(model: ZLGithubFileModel, cellHeight: CGFloat?) {
+    init(model: ZLGithubFileDiffModel, cellHeight: CGFloat?) {
         self.model = model
         super.init()
         self.initData(model: model)
@@ -82,45 +87,33 @@ class ZLCommitInfoPatchCellData: ZMBaseTableViewCellViewModel {
         _webView.loadHTML(cacheHtml ?? "", baseURL: Bundle.main.bundleURL)
     }
     
-    func initData(model: ZLGithubFileModel) {
+    func initData(model: ZLGithubFileDiffModel) {
         if !model.patch.isEmpty {
             let patch = model.patch
             self.patchStr = patch.htmlEscaped()
-            self.isBinary = false
-            self.isImage = false
+            self.type = .normal
+        } else if model.changes == 0 && model.status == "renamed" {
+            self.type = .renamed
+        } else if model.changes > 0 {
+            self.type = .largeChanged
         } else {
-            self.isBinary = true
             let pathExtension = (model.filename as NSString).pathExtension.lowercased()
             if ["png","jpg","jpeg","gif","svg","webp","bmp","icon"].contains(pathExtension) {
-                self.isImage = true
+                self.type = .image
                 let imagePath = model.raw_url
                 self.imagePath = imagePath.htmlEscaped()
+            } else {
+                self.type = .binary
             }
         }
-        
     }
     
 }
 
 // MARK: - HTML
 extension ZLCommitInfoPatchCellData {
     
-    func renderDiffContentScript() -> String {
-        if !isBinary {
-            return """
-            render(`\(patchStr)`,\(isLight ? "false" : "true"));
-            """
-        } else if isImage {
-            return """
-            renderImage(`\(imagePath)`,\(isLight ? "false" : "true"));
-            """
-        } else {
-            return """
-            renderBinary()
-            """
-        }
-    }
-    
+ 
     var isLight: Bool {
         if #available(iOS 12.0, *) {
             return getRealUserInterfaceStyle() == .light
@@ -145,20 +138,31 @@ extension ZLCommitInfoPatchCellData {
     
     func generateHTML() {
         var gitPatchDivContent = ""
-        if !isBinary {
+        switch type {
+        case .normal:
             let tag = parsePatchAndGenerateHTML(patchText: self.patchStr)
             gitPatchDivContent = tag?.toHTMLString() ?? ""
-        } else if isImage {
+        case .image:
             gitPatchDivContent = "<img src=\"\(imagePath)\" class=\"img_binary\"/>"
-        } else {
+        case .binary,.largeChanged,.renamed:
+            var text = ""
+            switch type {
+            case .binary:
+                text = ZLLocalizedString(string:"Binary File Patch", comment: "")
+            case .largeChanged:
+                text = ZLLocalizedString(string:"Large File Changed", comment: "")
+            case .renamed:
+                text = ZLLocalizedString(string:"File Renamed", comment: "")
+            default:
+                break
+            }
             if isLight {
-                gitPatchDivContent = "<div class=\"div_binary\">Binary File</div>"
+                gitPatchDivContent = "<div class=\"div_binary\">\(text)</div>"
             } else {
-                gitPatchDivContent = "<div class=\"div_binary dark\">Binary File</div>"
+                gitPatchDivContent = "<div class=\"div_binary dark\">\(text)</div>"
             }
-            
         }
-        
+     
         let htmlURL: URL? = Bundle.main.url(forResource: "gitpatchV2", withExtension: "html")
         
         if let url = htmlURL {
@@ -180,7 +184,7 @@ extension ZLCommitInfoPatchCellData {
                 self.cacheHtml = newHtmlStr as String
                 
             } catch {
-                ZLToastView.showMessage("load Code index html failed")
+                ZLToastView.showMessage("load Diff Patch failed")
             }
         }
     }
diff --git a/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommonTableViewCell/ZLCommonSectionHeaderFooterView.swift b/ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLCommonTableViewCell/ZLCommonSectionHeaderFooterView.swift
@@ -16,6 +16,7 @@ class ZLCommonSectionHeaderFooterView: UITableViewHeaderFooterView {
     
     override init(reuseIdentifier: String?) {
         super.init(reuseIdentifier: reuseIdentifier)
+        backgroundView = UIView()
     }
     
     required init?(coder: NSCoder) {
@@ -26,5 +27,6 @@ extension ZLCommonSectionHeaderFooterView: ZMBaseViewUpdatableWithViewData {
     func zm_fillWithViewData(viewData: ZLCommonSectionHeaderFooterViewDataV2) {
         contentView.backgroundColor = viewData.backColor
         backgroundColor = viewData.backColor
+        backgroundView?.backgroundColor = viewData.backColor
     }
 }
diff --git a/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/GitPatch/gitpatchV2.html b/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/GitPatch/gitpatchV2.html
@@ -40,11 +40,12 @@
 
         /* 二进制文安 默认根字体大小 */
         .div_binary {
-            width: 50%;
-            height: 100px;
-            font-size: 1.5rem;
+            margin-top: 20px;
+            margin-bottom: 20px;
+            font-size: 1.2rem;
             color: #093069;
             display: flex;
+            text-align: center;
             justify-content: center;
             /* 横向居中 */
             align-items: center;
diff --git a/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/en.lproj/ZLGitHubClientLocalizable.strings b/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/en.lproj/ZLGitHubClientLocalizable.strings
@@ -238,3 +238,8 @@
 "Draft Release" = "Draft";
 "Pre Release" = "Pre";
 "released" = "released";
+
+/// diff patch
+"Binary File Patch" = "Binary file not shown";
+"File Renamed" = "File renamed without changes";
+"Large File Changed" = "File vary greatly not shown";
diff --git a/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/zh-Hans.lproj/ZLGitHubClientLocalizable.strings b/ZLGitHubClient/ZLGitHubClient/System/ZLSupportFiles/zh-Hans.lproj/ZLGitHubClientLocalizable.strings
@@ -239,3 +239,8 @@
 "Draft Release" = "草稿";
 "Pre Release" = "预发版";
 "released" = "发布于";
+
+// git diff
+"Binary File Patch" = "二进制文件不展示";
+"File Renamed" = "文件重命名，没有修改";
+"Large File Changed" = "文件差异过大，不直接展示";

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class ZLCommonSectionHeaderFooterView: UITableViewHeaderFooterView {`
`16`	`16`
`17`	`17`	`override init(reuseIdentifier: String?) {`
`18`	`18`	`super.init(reuseIdentifier: reuseIdentifier)`
	`19`	`+ backgroundView = UIView()`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`required init?(coder: NSCoder) {`
`@@ -26,5 +27,6 @@ extension ZLCommonSectionHeaderFooterView: ZMBaseViewUpdatableWithViewData {`
`26`	`27`	`func zm_fillWithViewData(viewData: ZLCommonSectionHeaderFooterViewDataV2) {`
`27`	`28`	`contentView.backgroundColor = viewData.backColor`
`28`	`29`	`backgroundColor = viewData.backColor`
	`30`	`+ backgroundView?.backgroundColor = viewData.backColor`
`29`	`31`	`}`
`30`	`32`	`}`