【修改信息】 1. 组织仓库列表数量支持私有仓库 2. 修复我的页面和个人主页仓库数量不一致问题 3. 支持release跳转commit info

Author: ExistOrLive

ZLGitHubClient/Podfile

@@ -22,7 +22,7 @@ pod 'ZLGitRemoteService', :git => 'https://github.com/ExistOrLive/ZLGitRemoteSer
 #pod "ZLGitRemoteService", :path => '../../ZLGitRemoteService'
 
 pod 'ZLBaseExtension', :git => "https://github.com/ExistOrLive/ZLBaseExtension.git", :tag => "1.3.0"
-# 'ZLBaseExtension', :path => "../../ZLBaseExtension"
+#pod 'ZLBaseExtension', :path => "../../ZLBaseExtension"
 
 pod 'ZLUIUtilities', :git => "https://github.com/ExistOrLive/ZLUIUtilities.git", :tag => "1.3.0"
 #pod 'ZLUIUtilities', :path => "../../ZLUIUtilities"

ZLGitHubClient/Podfile.lock

@@ -351,7 +351,7 @@ CHECKOUT OPTIONS:
     :git: https://github.com/ExistOrLive/ZLGithubOAuth.git
     :tag: 1.3.1
   ZLGitRemoteService:
-    :commit: bf6ff8e5da6a8108360c0002811085751471b6a7
+    :commit: cf08d6a3970b6b580797d4548d91759b696028ae
     :git: https://github.com/ExistOrLive/ZLGitRemoteService.git
   ZLUIUtilities:
     :git: https://github.com/ExistOrLive/ZLUIUtilities.git
@@ -415,6 +415,6 @@ SPEC CHECKSUMS:
   ZLUtilities: cc526fb2d1a47ca55345cc2dc03ed05f11068bf7
   ZMMVVM: 92ef04990cd7d0ae5bb3ea9ddf778023bc5c5d9e
 
-PODFILE CHECKSUM: dda5175f944ccf5f49f93404610453a7daafb2ee
+PODFILE CHECKSUM: 02f7d71cdf50a85dbc6c1cd9f993df797bc9885a
 
 COCOAPODS: 1.16.2

ZLGitHubClient/ZLGitHubClient/Class/Router/ZLUIRouter.swift

@@ -162,6 +162,14 @@ extension ZLUIRouter {
         return self.getVC(key: .RepoInfoController, params: params)
     }
 
+    static func getCommitInfoViewController(login: String,
+                                            repoName: String,
+                                            ref: String) -> UIViewController? {
+        let params = ["login": login,
+                      "repoName": repoName,
+                      "ref": ref]
+        return self.getVC(key: .CommitInfoController, params: params)
+    }
 }
 
 // MARK: 解析URL

ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLReleaseTableViewCell/view/ZLReleaseInfoHeaderCell.swift

@@ -45,6 +45,8 @@ protocol ZLReleaseInfoHeaderCellDataSourceAndDelegate: AnyObject {
     func onRepoOwnerAvatarAction()
 
     func onRepoFullNameAction()
+    
+    func onCommitAction()
 }
 
 
@@ -199,6 +201,8 @@ class ZLReleaseInfoHeaderCell: UITableViewCell {
         let view = UIView()
         view.addSubview(commitIcon)
         view.addSubview(commitLabel)
+        let tap = UITapGestureRecognizer(target: self, action: #selector(onCommitInfoClicked))
+        view.addGestureRecognizer(tap)
         commitIcon.snp.makeConstraints { make in
             make.left.top.bottom.equalToSuperview()
             make.size.equalTo(15)
@@ -257,6 +261,10 @@ extension ZLReleaseInfoHeaderCell {
     @objc func onAuthorAvatarButtonClicked(_ button: UIButton) {
         delegate?.onAuthorAvatarAction()
     }
+    
+    @objc func onCommitInfoClicked() {
+        delegate?.onCommitAction()
+    }
 }
 
 extension ZLReleaseInfoHeaderCell: ZMBaseViewUpdatableWithViewData {

ZLGitHubClient/ZLGitHubClient/Class/UI/ZLReuseView/ZLReleaseTableViewCell/viewModel/ZLReleaseInfoHeaderCellData.swift

@@ -41,6 +41,10 @@ extension ZLReleaseInfoHeaderCellData: ZLReleaseInfoHeaderCellDataSourceAndDeleg
         data?.repository.nameWithOwner ?? ""
     }
 
+    var repoName: String {
+        data?.repository.name ?? ""
+    }
+    
     var commitSha: String {
         String(data?.tagCommit?.oid.prefix(7) ?? "")
     }
@@ -59,6 +63,13 @@ extension ZLReleaseInfoHeaderCellData: ZLReleaseInfoHeaderCellDataSourceAndDeleg
         }
     }
 
+    func onCommitAction() {
+        if let commitInfoVC = ZLUIRouter.getCommitInfoViewController(login: repoOwnerLogin, repoName: repoName, ref: data?.tagCommit?.oid ?? "") {
+            commitInfoVC.hidesBottomBarWhenPushed = true
+            zm_viewController?.navigationController?.pushViewController(commitInfoVC, animated: true)
+        }
+    }
+    
 
     var authorLogin: String {
         data?.author?.login ?? ""

ZLGitHubClient/ZLGitHubClient/Class/UI/profile/ZLUserAdditionInfoController/ZLUserAdditionInfoController.swift

@@ -16,6 +16,7 @@ import ZMMVVM
     var type: ZLUserAdditionInfoType = .repositories                       // ! 附加信息类型 仓库/代码片段等
     var login: String = ""                                        // login
     var currentPage: Int  =  0                     // 当前页号
+    var isOrg: Bool = false
     static let per_page: UInt = 20                            // 每页多少记录
 
     @objc init() {
@@ -86,6 +87,7 @@ extension ZLUserAdditionInfoController {
         }
 
         ZLUserServiceShared()?.getAdditionInfo(forUser: login,
+                                               isOrg: isOrg,
                                                infoType: type,
                                                page: UInt(page),
                                                per_page: Self.per_page,

ZLGitHubClient/ZLGitHubClient/Class/UI/repo/StarRepoViewController/controller/ZLStarRepoViewController.swift

@@ -61,6 +61,7 @@ extension ZLStarRepoViewController {
         let login = ZLViewerServiceShared()?.currentUserLoginName ?? ""
 
         ZLUserServiceShared()?.getAdditionInfo(forUser: login,
+                                               isOrg: false,
                                                infoType: .starredRepos,
                                                page: UInt(isLoadNew ? 1 : pageNum) ,
                                                per_page: 20,

ZLGitHubClient/ZLGitHubClient/Class/UI/user/ZLUserOrOrgInfoController/Presenter/ZLUserInfoStateModel.swift

@@ -17,6 +17,8 @@ protocol ZLUserInfoStateModelDelegate: AnyObject {
 
     func onPinnedRepoLoad(result: Bool, msg: String)
 
+    func onOrgRepoInfoLoad()
+    
     func onFollowStatusChanged()
 
     func onBlockStatusChanged()
@@ -86,14 +88,14 @@ extension ZLUserInfoStateModel {
 // MARK: - Request
 extension ZLUserInfoStateModel {
 
-    func getUserInfo() {
+    func getUserOrOrgInfo() {
 
         guard !login.isEmpty else {
             self.delegate?.onUserInfoLoad(result: false, msg: "login name is nil")
             return
         }
 
-        let userOrOrgInfo = ZLUserServiceShared()?.getUserInfo(withLoginName: login,
+        let userOrOrgInfo = ZLUserServiceShared()?.getUserOrOrgInfo(withLoginName: login,
                                                                serialNumber: NSString.generateSerialNumber())
         { [weak self] model in
 
@@ -108,9 +110,11 @@ extension ZLUserInfoStateModel {
                     self.getBlockStatus()
                     self.delegate?.onUserInfoLoad(result: true, msg: "")
                 } else if let model = model.data as? ZLGithubOrgModel {
+                    model.repositories = self.orgModel?.repositories ?? 0
                     self.infoModel = model
                     self.isOrg = true
                     self.getOrgPinnedRepos()
+                    self.getOrgReposInfo() 
                     self.delegate?.onUserInfoLoad(result: true, msg: "")
                 } else {
                     self.delegate?.onUserInfoLoad(result: false, msg: "Get User Info Failed ")
@@ -189,6 +193,23 @@ extension ZLUserInfoStateModel {
         }
     }
 
+    /// 更新组织的仓库数量
+    /** https://docs.github.com/en/organizations/managing-programmatic-access-to-your-organization/limiting-oauth-app-and-github-app-access-requests
+         * 如果组织的所有者没有授权，oauth app 不能通过 graphql api 访问组织的私有数据，因此这里通过rest api 获取
+     **/
+    func getOrgReposInfo() {
+        ZLUserServiceShared()?.getOrgInfo(withLoginName: login, serialNumber: NSString.generateSerialNumber())
+        { [weak self] model in
+
+            guard let self = self else { return }
+
+            if model.result,let model = model.data as? ZLGithubOrgModel {
+                self.orgModel?.repositories = model.repositories
+                self.delegate?.onOrgRepoInfoLoad()
+            }
+        }
+    }
+    
 
     func getFollowStatus() {
 

ZLGitHubClient/ZLGitHubClient/Class/UI/user/ZLUserOrOrgInfoController/controller/ZLUserOrOrgInfoController.swift

@@ -111,7 +111,7 @@ class ZLUserOrOrgInfoController: ZMTableViewController {
 
 
     override func refreshLoadNewData() {
-        stateModel.getUserInfo()
+        stateModel.getUserOrOrgInfo()
     }
 }
 
@@ -277,23 +277,25 @@ extension ZLUserOrOrgInfoController {
         // baseInfo
         var itemCellDatas = [ZMBaseTableViewCellViewModel]()
 
-        // company
-        if model.repositories > 0 {
-            let cellData = ZLCommonTableViewCellDataV3(canClick: true,
-                                                       title: { ZLLocalizedString(string: "repositories", comment: "")},
-                                                       info: { "\(model.repositories)" },
-                                                       cellHeight: 50,
-                                                       showSeparateLine: true) { [weak self] in
-                guard let self = self else { return }
-                
-                let login = self.stateModel.login
-                if let vc = ZLUIRouter.getVC(key: .UserAdditionInfoController, params: ["login": login, "type": ZLUserAdditionInfoType.repositories.rawValue]) {
-                    vc.hidesBottomBarWhenPushed = true
-                    self.navigationController?.pushViewController(vc, animated: true)
-                }
+        // repo
+        let cellData = ZLCommonTableViewCellDataV3(canClick: true,
+                                                   title: { ZLLocalizedString(string: "repositories", comment: "")},
+                                                   info: { [weak self] in
+            guard let self, let repositories = stateModel.orgModel?.repositories else { return "" }
+            return repositories > 0 ? "\(repositories)" : ""
+        },
+                                                   cellHeight: 50,
+                                                   showSeparateLine: true) { [weak self] in
+            guard let self = self else { return }
+            
+            let login = self.stateModel.login
+            if let vc = ZLUIRouter.getVC(key: .UserAdditionInfoController, params: ["login": login, "type": ZLUserAdditionInfoType.repositories.rawValue, "isOrg": true]) {
+                vc.hidesBottomBarWhenPushed = true
+                self.navigationController?.pushViewController(vc, animated: true)
             }
-            itemCellDatas.append(cellData)
         }
+        itemCellDatas.append(cellData)
+        
 
         // address
         if let location = model.location,
@@ -390,6 +392,10 @@ extension ZLUserOrOrgInfoController {
 }
 
 extension ZLUserOrOrgInfoController: ZLUserInfoStateModelDelegate {
+    func onOrgRepoInfoLoad() {
+        tableView.reloadData()
+    }
+    
     func onUserInfoLoad(result: Bool, msg: String) {
         viewStatus = .normal
         endRefreshViews()