pindo 5.14.2 → 5.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a15faac4b09101141fbe0171f2e02a65da002bd1762c35bf63e94fa097ba95
-  data.tar.gz: d4c540cda86db3508754c8077911ca590f79b467323849b6f82de64188ec98d7
+  metadata.gz: cb15b2496f39d434ab25b2609b651779fc38187e56990a40f66aeee02411da83
+  data.tar.gz: c0abb252891099cf6c45bda365737415d662b1d165bb027064779db171c0fbe0
 SHA512:
-  metadata.gz: b254d7dc053a1d2714f1bf4c42fc85f21e49cca9e49215444b337543449442e5a92a8232ccb89283738366397bb487d28307dadca23c3e91a515b75ca7e53b3f
-  data.tar.gz: fd2c8fb44d319093d8fe7eed45f64842d6a2bfe037d7d657e28a65b9e1f3b3dca607d4b6f596c52febfd342fd830066cadea157d61a791011d2173ef4166148e
+  metadata.gz: 3271d2f0516402ea4ee3f8716fe6d1fd4c1d0c1bc46e39ac65ed9c2fb00cb9f707dc44485acafb3e26a28b03b9069681f8a8d31c891534d144de614b53befb42
+  data.tar.gz: 170f1753ee18dd359dea8a8f918625f82a4cdbaf34ce0f4dcfc342492b5b3086296589ef650f942ca000772a033d796f7f7e949b20cc52c45deda55ae56cafe6

data/lib/pindo/base/aeshelper.rb

@@ -1,6 +1,7 @@
 
 require 'openssl'
 require 'match'
+require 'pindo/base/informative'
 
 module Pindo
 

data/lib/pindo/base/executable.rb

@@ -1,3 +1,5 @@
+require 'pindo/base/informative'
+
 module Pindo
   # Module which provides support for running executables.
   #

data/lib/pindo/base/git_handler.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'pindo/base/executable'
+require 'pindo/base/informative'
 require 'etc'
 require 'claide'
 require 'highline/import'
@@ -460,11 +461,21 @@ module Pindo
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
 
             begin
+                # 1. 检查是否是 Git 仓库，并获取 Git 根目录
+                git_root = git_root_directory(local_repo_dir: project_dir)
+
+                # 2. 如果不是 Git 仓库，返回 nil
+                unless git_root
+                    Funlog.instance.fancyinfo_warning("当前目录不是Git仓库，跳过Git操作")
+                    return nil
+                end
+
+                # 3. 使用 Git 根目录执行 Git 命令
                 # 重置暂存区
-                git!(%W(-C #{project_dir} restore --staged #{project_dir}))
+                git!(%W(-C #{git_root} restore --staged #{git_root}))
 
                 # 获取未跟踪和已修改的文件
-                files_list = git!(%W(-C #{project_dir} ls-files --other --modified --exclude-standard)) || []
+                files_list = git!(%W(-C #{git_root} ls-files --other --modified --exclude-standard)) || []
 
                 # 返回文件列表（如果为空则返回 nil）
                 if files_list.nil? || files_list.empty?
@@ -488,7 +499,14 @@ module Pindo
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
             raise ArgumentError, "处理方式不能为空" if process_type.nil?
 
-            current_project_dir = project_dir
+            # 获取 Git 根目录
+            git_root = git_root_directory(local_repo_dir: project_dir)
+            unless git_root
+                Funlog.instance.fancyinfo_warning("当前目录不是Git仓库，跳过处理未提交文件")
+                return
+            end
+
+            current_project_dir = git_root
             origin_path = Dir.pwd
 
             begin
@@ -555,9 +573,23 @@ module Pindo
 
             Funlog.instance.fancyinfo_start("开始提交文件...")
             git! ['add', '-A']
-            git! ['commit', '-m', message]
+
+            # 检查是否有文件需要提交
+            begin
+                git! ['commit', '-m', message]
+                Funlog.instance.fancyinfo_success("commit文件完成!")
+            rescue => e
+                # 如果是 "nothing to commit" 错误，说明没有变更，这是正常情况
+                if e.message.include?("nothing to commit") || e.message.include?("working tree clean")
+                    Funlog.instance.fancyinfo_warning("没有需要提交的变更")
+                    return  # 直接返回，不需要 push
+                else
+                    # 其他错误则继续抛出
+                    raise e
+                end
+            end
+
             git!(%W(-C #{project_dir} fetch origin))
-            Funlog.instance.fancyinfo_success("commit文件完成!")
             Funlog.instance.fancyinfo_start("正在push...")
             if remote_branch_exists?(local_repo_dir: project_dir, branch: branch)
                 git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch}))
@@ -802,8 +834,14 @@ module Pindo
           return 'skip'
         end
 
-        # 4. 获取当前分支名并显示状态
-        current_branch = git!(%W(-C #{project_dir} rev-parse --abbrev-ref HEAD)).strip
+        # 4. 获取 Git 根目录并获取当前分支名
+        git_root = git_root_directory(local_repo_dir: project_dir)
+        unless git_root
+          Funlog.instance.fancyinfo_warning("当前目录不是Git仓库")
+          return 'skip'
+        end
+
+        current_branch = git!(%W(-C #{git_root} rev-parse --abbrev-ref HEAD)).strip
         display_file_status(current_branch, uncommitted_files)
 
         # 5. 交互式选择

data/lib/pindo/base/informative.rb

@@ -0,0 +1,11 @@
+require 'pindo/base/plaininformative'
+
+module Pindo
+  # Pindo 的标准异常类，带有红色错误消息格式
+  # 用于所有需要向用户显示错误信息的场景
+  class Informative < PlainInformative
+    def message
+      "[!] #{super}".red
+    end
+  end
+end

data/lib/pindo/base/plistbuddyexecutable.rb

@@ -1,3 +1,5 @@
+require 'pindo/base/informative'
+
 module Pindo
 
   module Plistbuddyexecutable

data/lib/pindo/client/feishuclient.rb

@@ -85,7 +85,7 @@ module Pindo
       result
     rescue => e
       puts "请求发送失败: #{e.message}"
-      puts e.backtrace
+      puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
       raise
     end
     

data/lib/pindo/command/android/autobuild.rb

@@ -276,14 +276,10 @@ module Pindo
             tasks << build_task
 
             # 4. Git 标签任务（依赖第一个编译任务）
-            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-              config[:project_path],
-              release_branch: @args_release_branch,
-              ver_inc: @args_ver_inc,
-              tag_type: @args_tag_type,
-              tag_pre: @args_tag_pre
-            )
+            # 所有参数都从 GitCommitTask 获取
+            git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
             git_tag_task.dependencies << build_task.id
+            git_tag_task.dependencies << git_commit_task.id
             tasks << git_tag_task
 
             # 5. 上传和消息发送任务（如果需要）

data/lib/pindo/command/appstore/autobuild.rb

@@ -280,33 +280,23 @@ module Pindo
             build_task.dependencies << last_task.id
             tasks << build_task
 
-            # 3. Git 标签任务 - 项目仓库（使用 IosConfigParser 的版本号）
-            fixed_version = Pindo::IosConfigParser.instance.app_version
-            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-              project_path,
-              release_branch: @args_release_branch,
-              tag_type: @args_tag_type,
-              tag_pre: @args_tag_pre,
-              fixed_version: fixed_version
-            )
+            # 3. Git 标签任务 - 项目仓库
+            # 所有参数（版本号、tag_pre、release_branch 等）都从 GitCommitTask 获取
+            git_tag_task = Pindo::TaskSystem::GitTagTask.new(project_path)
             git_tag_task.dependencies << build_task.id
+            git_tag_task.dependencies << git_commit_task.id
             tasks << git_tag_task
 
-            # 4. Git 标签任务 - 配置仓库（使用 IosConfigParser 的版本号）
+            # 4. Git 标签任务 - 配置仓库
+            # 所有参数都从 GitCommitTask 获取
             app_repo_name = Pindo::IosConfigParser.instance.app_repo_name
             if app_repo_name && !app_repo_name.empty?
               pindo_dir = File.expand_path(Pindoconfig.instance.pindo_dir)
               config_repo_path = File.join(pindo_dir, app_repo_name)
 
               if File.exist?(config_repo_path)
-                config_git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                  config_repo_path,
-                  release_branch: @args_release_branch,
-                  tag_type: @args_tag_type,
-                  tag_pre: @args_tag_pre,
-                  fixed_version: fixed_version
-                )
-                config_git_tag_task.dependencies << git_tag_task.id
+                config_git_tag_task = Pindo::TaskSystem::GitTagTask.new(config_repo_path)
+                config_git_tag_task.dependencies << git_commit_task.id
                 tasks << config_git_tag_task
               end
             end

data/lib/pindo/command/gplay/pullconfig.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'pindo/base/git_handler'
 
 module Pindo
   class Command
@@ -35,8 +36,8 @@ module Pindo
         end
 
         def run
-          # 克隆配置仓库（使用继承的方法）
-          app_config_dir = clong_buildconfig_repo(repo_name: @bundle_name)
+          # 克隆配置仓库
+          app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: @bundle_name)
 
           # 返回配置仓库路径
           app_config_dir

data/lib/pindo/command/ios/autobuild.rb

@@ -295,14 +295,10 @@ module Pindo
                         tasks << build_task
 
                         # 4. Git 标签任务（依赖第一个编译任务）
-                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                            config[:project_path],
-                            release_branch: @args_release_branch,
-                            ver_inc: @args_ver_inc,
-                            tag_type: @args_tag_type,
-                            tag_pre: @args_tag_pre
-                        )
+                        # 所有参数都从 GitCommitTask 获取
+                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
                         git_tag_task.dependencies << build_task.id
+                        git_tag_task.dependencies << git_commit_task.id
                         tasks << git_tag_task
 
                         # 5. 上传和消息发送任务（如果需要）

data/lib/pindo/command/repo/clone.rb

@@ -77,7 +77,7 @@ module Pindo
                         puts "Repo Url: #{@code_git_url}"
                         puts "New Branch: #{new_branch}"
 
-                        getcode_to_dir(reponame:@repo_name, remote_url:@code_git_url, path:Dir.pwd, new_branch:new_branch, new_tag:nil)
+                        Pindo::GitHandler.getcode_to_dir(reponame:@repo_name, remote_url:@code_git_url, path:Dir.pwd, new_branch:new_branch, new_tag:nil)
 
                     end
                 end

data/lib/pindo/command/unity/autobuild.rb

@@ -243,14 +243,9 @@ module Pindo
                     only_web_platform = selected_platforms == ['web']
 
                     # 如果只有 web 平台，在 Unity 导出之前创建 Git 标签任务
+                    # 所有参数都从 GitCommitTask 获取
                     if only_web_platform
-                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                            Dir.pwd,
-                            release_branch: @args_release_branch,
-                            ver_inc: @args_ver_inc,
-                            tag_type: @args_tag_type,
-                            tag_pre: @args_tag_pre
-                        )
+                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(Dir.pwd)
                         git_tag_task.dependencies << git_commit_task.id
                         all_tasks << git_tag_task
                         common_dependency_task = git_tag_task
@@ -301,17 +296,13 @@ module Pindo
 
                     # 第三步：创建 Git 标签任务（依赖第一个平台的构建任务）
                     # 注意：如果只有 web 平台，GitTagTask 已在前面创建，这里跳过
+                    # 所有参数都从 GitCommitTask 获取
                     unless only_web_platform
                         first_build_task = platform_build_tasks[selected_platforms.first]
                         if first_build_task
-                            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                                Dir.pwd,
-                                release_branch: @args_release_branch,
-                                ver_inc: @args_ver_inc,
-                                tag_type: @args_tag_type,
-                                tag_pre: @args_tag_pre
-                            )
+                            git_tag_task = Pindo::TaskSystem::GitTagTask.new(Dir.pwd)
                             git_tag_task.dependencies << first_build_task.id
+                            git_tag_task.dependencies << git_commit_task.id
                             all_tasks << git_tag_task
                         end
                     end

data/lib/pindo/command/unity/packbuild.rb

@@ -179,15 +179,10 @@ module Pindo
           tasks << nuget_build_task
 
           # 3. Git Tag 任务 (依赖构建成功)
-          git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-            package_dir,
-            release_branch: @args_release_branch,
-            ver_inc: @args_ver_inc, 
-            tag_type: @args_tag_type,
-            tag_pre: @args_tag_pre,
-            fixed_version: confirmed_version # 传入确认后的版本号
-          )
+          # 所有参数都从 GitCommitTask 获取
+          git_tag_task = Pindo::TaskSystem::GitTagTask.new(package_dir)
           git_tag_task.dependencies << nuget_build_task.id
+          git_tag_task.dependencies << git_commit_task.id
           tasks << git_tag_task
 
           # 添加并执行任务

data/lib/pindo/command/utils/tag.rb

@@ -95,13 +95,8 @@ module Pindo
           tasks << git_commit_task
 
           # 2. Git 标签任务（依赖提交任务）
-          git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-            pindo_project_dir,
-            release_branch: @args_release_branch,
-            ver_inc: @args_ver_inc,
-            tag_type: @args_tag_type,
-            tag_pre: @args_tag_pre
-          )
+          # 所有参数都从 GitCommitTask 获取
+          git_tag_task = Pindo::TaskSystem::GitTagTask.new(pindo_project_dir)
           git_tag_task.dependencies << git_commit_task.id
           tasks << git_tag_task
 

data/lib/pindo/command/utils/updateconfig.rb

@@ -2,6 +2,7 @@ require 'highline/import'
 require 'fileutils'
 require 'json'
 require 'highline'
+require 'pindo/base/git_handler'
 
 module Pindo
     class Command
@@ -39,7 +40,7 @@ module Pindo
 
 
                 def update_common_struct
-                    app_default_config_dir = clong_buildconfig_repo(repo_name: pindo_single_config.demo_bundle_id)
+                    app_default_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: pindo_single_config.demo_bundle_id)
                     default_config_file = File.join(app_default_config_dir, "config.json")
                     default_config_json = nil
                     if !default_config_file.empty? && File::file?(default_config_file)   
@@ -88,7 +89,7 @@ module Pindo
                         deploy_repo_name = get_deploy_setting_repo(tagname:menu_choice)
                         puts "deploy_repo_name: #{deploy_repo_name}"
 
-                        mainapp_config_dir = clong_buildconfig_repo(repo_name: deploy_repo_name)
+                        mainapp_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: deploy_repo_name)
                         mainapp_config_file = File.join(mainapp_config_dir, "config.json")
                         mainapp_config_json = nil
                         if !mainapp_config_file.empty? && File::file?(mainapp_config_file)   

data/lib/pindo/command/web/autobuild.rb

@@ -222,40 +222,30 @@ module Pindo
                     # Web 只支持 Unity 工程
                     tasks = []
 
-                    # 1. Git 提交任务（如果需要上传）
-                    if @args_upload_flag
-                      # 提前询问用户如何处理未提交的文件
-                      process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
-                          project_dir: config[:project_path],
-                          interactive: true
-                      )
+                    # 1. Git 提交任务（总是创建）
+                    # 提前询问用户如何处理未提交的文件
+                    process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
+                        project_dir: config[:project_path],
+                        interactive: true
+                    )
 
-                      git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
-                        config[:project_path],
-                        release_branch: @args_release_branch,
-                        ver_inc: @args_ver_inc,
-                        tag_type: @args_tag_type,
-                        tag_pre: @args_tag_pre,
-                        process_type: process_type,
-                        commit_message: "feat: web autobuild 构建前提交"
-                      )
-                      tasks << git_commit_task
-                      last_task = git_commit_task
-
-                      # 2. Git 标签任务（依赖提交任务，在 Unity 导出之前创建）
-                      git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                        config[:project_path],
-                        release_branch: @args_release_branch,
-                        ver_inc: @args_ver_inc,
-                        tag_type: @args_tag_type,
-                        tag_pre: @args_tag_pre
-                      )
-                      git_tag_task.dependencies << git_commit_task.id
-                      tasks << git_tag_task
-                      last_task = git_tag_task
-                    else
-                      last_task = nil
-                    end
+                    git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
+                      config[:project_path],
+                      release_branch: @args_release_branch,
+                      ver_inc: @args_ver_inc,
+                      tag_type: @args_tag_type,
+                      tag_pre: @args_tag_pre,
+                      process_type: process_type,
+                      commit_message: "feat: web autobuild 构建前提交"
+                    )
+                    tasks << git_commit_task
+
+                    # 2. Git 标签任务（总是创建，依赖提交任务，在 Unity 导出之前创建）
+                    # 所有参数都从 GitCommitTask 获取
+                    git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
+                    git_tag_task.dependencies << git_commit_task.id
+                    tasks << git_tag_task
+                    last_task = git_tag_task
 
                     # 3. Unity 更新必备库任务（可选）
                     unless @args_skip_lib

data/lib/pindo/command.rb

@@ -6,18 +6,11 @@ require 'pindo/version'
 require 'pindo/base/funlog'
 require 'pindo/base/hashhelper'
 require 'pindo/base/plaininformative'
+require 'pindo/base/informative'
 require 'pindo/client/giteeclient'
 require 'pindo/config/pindoconfig'
 
-
-
 module Pindo
-    class Informative < PlainInformative
-        def message
-          "[!] #{super}".red
-        end
-    end
-
     class Command < CLAide::Command
 
         include Pindoconfig::Mixin

data/lib/pindo/config/ios_config_parser.rb

@@ -318,10 +318,10 @@ module Pindo
 
         # 1.5 替换 Apple ID（使用 AdHoc 配置的 Apple ID）
         if adhoc_config_json.dig('account_info', 'apple_acount_id')
-          original_apple_id = @config_json.dig('account_info', 'apple_acount_id')
-          adhoc_apple_id = adhoc_config_json['account_info']['apple_acount_id']
+          original_apple_id = @config_json.dig('account_info', 'apple_acount_id')&.strip  # 去除前后空格
+          adhoc_apple_id = adhoc_config_json['account_info']['apple_acount_id']&.strip  # 去除前后空格
 
-          if original_apple_id && adhoc_apple_id && original_apple_id != adhoc_apple_id
+          if original_apple_id && adhoc_apple_id && !adhoc_apple_id.empty? && original_apple_id != adhoc_apple_id
             @config_json['account_info']['apple_acount_id'] = adhoc_apple_id
             puts "  替换 Apple ID:"
             puts "    原始 Apple ID: #{original_apple_id}"
@@ -330,7 +330,8 @@ module Pindo
 
           # 如果 AdHoc 配置包含 company_name，也一并替换
           if adhoc_config_json.dig('account_info', 'acount_company_name')
-            @config_json['account_info']['acount_company_name'] = adhoc_config_json['account_info']['acount_company_name']
+            company_name = adhoc_config_json['account_info']['acount_company_name']&.strip  # 去除前后空格
+            @config_json['account_info']['acount_company_name'] = company_name if company_name && !company_name.empty?
           end
         end
 
@@ -438,7 +439,7 @@ module Pindo
         true
       rescue => e
         puts "合并发布配置失败: #{e.message}"
-        puts e.backtrace.join("\n")
+        puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
         false
       end
     end
@@ -489,40 +490,40 @@ module Pindo
       # 解析账号信息
       if @config_json['account_info']
         account_info = @config_json['account_info']
-        @config_data[:apple_id] = account_info['apple_acount_id']
-        @config_data[:company_name] = account_info['acount_company_name']
+        @config_data[:apple_id] = account_info['apple_acount_id']&.strip  # 去除前后空格
+        @config_data[:company_name] = account_info['acount_company_name']&.strip  # 去除前后空格
       end
 
       # 解析应用信息
       if @config_json['app_info']
         app_info = @config_json['app_info']
-        @config_data[:bundle_id] = app_info['app_identifier']
+        @config_data[:bundle_id] = app_info['app_identifier']&.strip  # 去除前后空格
 
         # 保存原始 Bundle ID 作为配置仓库名称（只在第一次设置，后续不覆盖）
         if @app_repo_name.nil? && app_info['app_identifier']
-          repo_name = app_info['app_identifier']
+          repo_name = app_info['app_identifier']&.strip  # 去除前后空格
           # 如果是通配符 Bundle ID（以 .* 结尾），去除通配符后缀
-          if repo_name.end_with?('.*')
+          if repo_name && repo_name.end_with?('.*')
             repo_name = repo_name[0...-2]  # 去除最后的 .*
           end
           @app_repo_name = repo_name
         end
 
-        @config_data[:bundle_id_pushcontent] = app_info['app_identifier_pushcontent']
-        @config_data[:bundle_id_pushservice] = app_info['app_identifier_pushservice']
-        @config_data[:bundle_id_keyboard] = app_info['app_identifier_keyboard']
-        @config_data[:bundle_id_imessage] = app_info['app_identifier_imessage']
-        @config_data[:bundle_id_extension] = app_info['app_identifier_extension']
-        @config_data[:bundle_id_siri] = app_info['app_identifier_siri']
-        @config_data[:bundle_id_siriui] = app_info['app_identifier_siriui']
-        @config_data[:bundle_id_widget] = app_info['app_identifier_widget']
-        @config_data[:bundle_id_extensionad] = app_info['app_identifier_extensionad']
-        @config_data[:bundle_id_extensionporn] = app_info['app_identifier_extensionporn']
-        @config_data[:bundle_id_watchapp] = app_info['app_identifier_watchapp']
-        @config_data[:bundle_id_watchapp_extension] = app_info['app_identifier_watchapp_extension']
-
-        @config_data[:app_name] = app_info['app_name']
-        @config_data[:app_version] = app_info['app_version']
+        @config_data[:bundle_id_pushcontent] = app_info['app_identifier_pushcontent']&.strip
+        @config_data[:bundle_id_pushservice] = app_info['app_identifier_pushservice']&.strip
+        @config_data[:bundle_id_keyboard] = app_info['app_identifier_keyboard']&.strip
+        @config_data[:bundle_id_imessage] = app_info['app_identifier_imessage']&.strip
+        @config_data[:bundle_id_extension] = app_info['app_identifier_extension']&.strip
+        @config_data[:bundle_id_siri] = app_info['app_identifier_siri']&.strip
+        @config_data[:bundle_id_siriui] = app_info['app_identifier_siriui']&.strip
+        @config_data[:bundle_id_widget] = app_info['app_identifier_widget']&.strip
+        @config_data[:bundle_id_extensionad] = app_info['app_identifier_extensionad']&.strip
+        @config_data[:bundle_id_extensionporn] = app_info['app_identifier_extensionporn']&.strip
+        @config_data[:bundle_id_watchapp] = app_info['app_identifier_watchapp']&.strip
+        @config_data[:bundle_id_watchapp_extension] = app_info['app_identifier_watchapp_extension']&.strip
+
+        @config_data[:app_name] = app_info['app_name']&.strip
+        @config_data[:app_version] = app_info['app_version']&.strip
         @config_data[:app_id_ios] = app_info['app_id_ios']
       end
 

data/lib/pindo/module/android/android_build_helper.rb

@@ -397,7 +397,7 @@ module Pindo
         end
       rescue => e
         puts "警告：设置 Play Asset Delivery 失败: #{e.message}"
-        puts e.backtrace.first(5).join("\n")
+        puts e.backtrace.first(5).join("\n") if ENV['PINDO_DEBUG']
       end
     end
 

data/lib/pindo/module/android/android_config_helper.rb

@@ -955,7 +955,7 @@ module Pindo
 
             rescue => e
                 Funlog.instance.fancyinfo_error("Icon 处理失败: #{e.message}")
-                puts e.backtrace
+                puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
                 replace_success = false
             ensure
                 # 清理临时文件（无论成功失败都清理）

data/lib/pindo/module/android/android_res_helper.rb

@@ -287,7 +287,7 @@ module Pindo
 
             rescue => e
                 Funlog.instance.fancyinfo_error("安装icon时出错: #{e.message}")
-                puts e.backtrace
+                puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
                 return false
             end
         end

data/lib/pindo/module/cert/xcode_cert_helper.rb

@@ -501,7 +501,7 @@ module Pindo
                 cert_git_url = pindo_single_config.dev_cert_giturl
             end
             cert_reponame = cert_git_url.split("/").last.chomp(".git")
-            certs_dir = getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:apple_id)
+            certs_dir = Pindo::GitHandler.getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:apple_id)
 
 
             keys = Dir[File.join(certs_dir, "certs", cert_sub_dir, "*.p12")]   

data/lib/pindo/module/task/model/build/android_build_dev_task.rb

@@ -129,25 +129,39 @@ module Pindo
       # 更新版本号
       def update_version_info
         git_repo_helper = Pindo::GitRepoHelper.share_instance
+        build_version = nil
+        build_number = nil
 
-        # 检查是否是 Git 仓库
-        git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: @project_path)
-        unless git_root
-          Funlog.warning("非Git仓库，保持工程原有版本号")
-          return
-        end
+        # 优先级 1: 从 GitCommitTask 获取版本号（无论当前目录是否为 Git 仓库）
+        git_commit_data = get_data_param_by_key(:git_commit)
+        if git_commit_data && git_commit_data[:task_param] &&
+           git_commit_data[:task_param][:build_version] && git_commit_data[:task_param][:build_number]
+          build_version = git_commit_data[:task_param][:build_version]
+          build_number = git_commit_data[:task_param][:build_number]
+          Funlog.instance.fancyinfo_success("使用 GitCommitTask 的版本号: #{build_version}, Build: #{build_number}")
 
-        # 获取 build_number（从 commit hash 计算）
-        build_number = git_repo_helper.get_build_number_from_commit(project_dir: @project_path)
+        else
+          # 优先级 2: 检查当前目录是否是 Git 仓库
+          git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: @project_path)
 
-        # 计算 build_version
-        build_version = git_repo_helper.calculate_build_version(
-          project_dir: @project_path,
-          tag_prefix: @tag_pre,
-          create_tag_type: @tag_type,
-          version_increase_type: @ver_inc
-        )
+          if git_root
+            # 是 Git 仓库，自己计算版本号
+            build_number = git_repo_helper.get_build_number_from_commit(project_dir: @project_path)
+            build_version = git_repo_helper.calculate_build_version(
+              project_dir: @project_path,
+              tag_prefix: @tag_pre,
+              create_tag_type: @tag_type,
+              version_increase_type: @ver_inc
+            )
+            Funlog.instance.fancyinfo_success("自己计算版本号: #{build_version}, Build: #{build_number}")
+          else
+            # 不是 Git 仓库且没有从 GitCommitTask 获取到版本号，跳过版本更新
+            Funlog.warning("非Git仓库且未从 GitCommitTask 获取到版本号，保持工程原有版本号")
+            return
+          end
+        end
 
+        # 更新版本号
         Pindo::AndroidConfigHelper.update_android_project_version(
           project_dir: @project_path,
           version_name: build_version,