pindo 5.13.1 → 5.13.3

data/lib/pindo/module/task/model/build/{ios_dev_build_task.rb → ios_build_dev_task.rb}

@@ -1,16 +1,17 @@
-require_relative '../build_task'
+require_relative 'ios_build_task'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/build/version_helper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
+require 'pindo/module/xcode/cocoapods_helper'
 require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo
   module TaskSystem
     # iOS Dev 模式构建任务
     # 使用 Development 证书编译 iOS 工程
-    class IosDevBuildTask < BuildTask
+    class IosBuildDevTask < IosBuildTask
       def initialize(options = {})
         @bundle_id = options[:bundle_id]
         @proj_name = options[:proj_name]
@@ -45,12 +46,13 @@ module Pindo
         update_version_info
         pull_config
         update_entitlements
-        handle_cocoapods
+        
       end
 
       def execute_build
         configure_certificate
         update_url_schemes_final
+        handle_cocoapods
         build_ios_project
       end
 
@@ -92,14 +94,6 @@ module Pindo
         end
       end
 
-      # 清理 Firebase Shell Script
-      def cleanup_firebase_shell
-        project_fullname = Dir.glob(File.join(@project_path, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
-        if !project_fullname.nil? && File.exist?(project_fullname)
-          Pindo::XcodeBuildHelper.delete_libtarget_firebase_shell(@project_path)
-        end
-      end
-
       # 更新工程配置
       def update_project_config
         workflow_packname = @workflow_info[:package_name]
@@ -146,19 +140,21 @@ module Pindo
         end
       end
 
-      # 拉取配置
+      # 检查配置
       def pull_config
-        args_temp = []
-        args_temp << @bundle_id if @bundle_id
-        Pindo::Command::Deploy::Pullconfig::run(args_temp)
+        # 检查 IosConfigParser 单例中是否已加载配置
+        config_parser = Pindo::IosConfigParser.instance
+        if config_parser.config_json.nil?
+          raise Informative, "IosBuildDevTask 配置未加载，请确保在命令层已正确加载 config.json"
+        end
+
+        puts "  使用已加载的配置..."
       end
 
       # 更新 Entitlements
       def update_entitlements
-        config_json_file = File.join(@project_path, "config.json")
         Pindo::XcodeBuildConfig.update_entitlements_config(
-          project_dir: @project_path,
-          config_file: config_json_file
+          project_dir: @project_path
         )
       end
 
@@ -166,29 +162,14 @@ module Pindo
       def handle_cocoapods
         return unless File.exist?(File.join(@project_path, "Podfile"))
 
-        Dir.chdir(@project_path)
-        Pindo::Command::Ios::Podupdate::run([])
-
-        begin
-          # 清理现有 Pods
-          FileUtils.rm_rf(File.join(@project_path, "Podfile.lock")) if File.exist?(File.join(@project_path, "Podfile.lock"))
-          FileUtils.rm_rf(File.join(@project_path, "Pods")) if File.exist?(File.join(@project_path, "Pods"))
-
-          puts "正在执行 pod deintegrate..."
-          system 'pod deintegrate'
-
-          puts "正在执行 pod install..."
-          system 'pod install'
-        rescue => error
-          puts(error.to_s)
-          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
-        end
+        # 1. 更新私有索引库
+        Pindo::CocoaPodsHelper.update_pod_repo(
+          install: false,
+          project_dir: @project_path
+        )
 
-        # 检查 pod install 是否成功
-        pod_lock_file = File.join(@project_path, "Podfile.lock")
-        unless File.exist?(pod_lock_file)
-          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
-        end
+        # 2. 清理并重新安装
+        Pindo::CocoaPodsHelper.deintegrate_and_install(@project_path)
       end
 
       # 配置证书
@@ -196,22 +177,14 @@ module Pindo
         # 检查是否是 macOS 工程
         detect_macos_platform
 
-        args_temp = ['--dev']
-        args_temp << '--macos' if @macos_flag
-
-        # 如果有 Unity 根目录路径，需要从那里读取 config.json
-        if @unity_root_path
-          # 临时切换到 Unity 根目录读取 config.json
-          config_path = File.join(@unity_root_path, 'config.json')
-          if File.exist?(config_path)
-            args_temp << config_path
-          end
-        end
-
-        # 切换到 iOS 工程目录，确保 Cert::run 能找到 xcodeproj
-        Dir.chdir(@project_path) do
-          Pindo::Command::Deploy::Cert::run(args_temp)
-        end
+        # 使用新的证书安装方法
+        # config.json 已经通过 pull_config 方法拉取到 @project_path 目录
+        require 'pindo/module/cert/xcode_cert_helper'
+        Pindo::XcodeCertHelper.install_and_config_certs(
+          build_type: 'dev',
+          platform_type: @macos_flag ? 'macos' : 'ios',
+          project_dir: @project_path
+        )
       end
 
       # 检测是否为 macOS 平台
@@ -241,10 +214,18 @@ module Pindo
       def build_ios_project
         Dir.chdir(@project_path)
 
-        args_temp = ['--dev']
-        args_temp << '--macos' if @macos_flag
+        # 使用 XcodeBuildHelper 进行构建
+        ipa_file = Pindo::XcodeBuildHelper.build_project(
+          project_dir: @project_path,
+          icloud_id: nil
+        )
+
+        if ipa_file.nil?
+          raise Informative, "构建失败：未生成 IPA 文件"
+        end
 
-        Pindo::Command::Deploy::Build::run(args_temp)
+        puts "构建成功：#{ipa_file}"
+        ipa_file
       end
     end
   end

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

@@ -0,0 +1,23 @@
+require_relative '../build_task'
+require 'pindo/module/xcode/xcode_build_helper'
+
+module Pindo
+  module TaskSystem
+    # iOS 构建任务基类
+    # 所有 iOS 平台构建任务的抽象基类
+    # 子类包括：IosBuildDevTask、IosBuildAdhocTask、IosBuildAppStoreTask
+    class IosBuildTask < BuildTask
+
+      protected
+
+      # 清理 Firebase Shell Script
+      # 删除 Xcode 项目中的 Firebase Shell Script Build Phase
+      def cleanup_firebase_shell
+        project_fullname = Dir.glob(File.join(@project_path, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+        if !project_fullname.nil? && File.exist?(project_fullname)
+          Pindo::XcodeBuildHelper.delete_libtarget_firebase_shell(@project_path)
+        end
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/build/{web_dev_build_task.rb → web_build_dev_task.rb}

@@ -5,7 +5,7 @@ module Pindo
     # Web 构建任务
     # Web 平台不需要编译，Unity 导出后即为最终产物
     # 此任务只检查构建产物是否存在
-    class WebDevBuildTask < BuildTask
+    class WebBuildDevTask < BuildTask
       def initialize(options = {})
         super(:web, :dev, options)
       end

data/lib/pindo/module/task/model/build_task.rb

@@ -81,17 +81,17 @@ module Pindo
 
       # 创建 iOS 构建任务
       def self.create_ios_task(mode, options)
-        require_relative 'build/ios_dev_build_task'
-        require_relative 'build/ios_adhoc_build_task'
-        require_relative 'build/ios_release_build_task'
+        require_relative 'build/ios_build_dev_task'
+        require_relative 'build/ios_build_adhoc_task'
+        require_relative 'build/ios_build_appstore_task'
 
         case mode
         when :dev
-          IosDevBuildTask.new(options)
+          IosBuildDevTask.new(options)
         when :adhoc
-          IosAdhocBuildTask.new(options)
+          IosBuildAdhocTask.new(options)
         when :release
-          IosReleaseBuildTask.new(options)
+          IosBuildAppStoreTask.new(options)
         else
           raise ArgumentError, "不支持的 iOS 构建模式: #{mode}"
         end
@@ -99,14 +99,17 @@ module Pindo
 
       # 创建 Android 构建任务
       def self.create_android_task(mode, options)
-        require_relative 'build/android_dev_build_task'
-        require_relative 'build/android_release_build_task'
+        require_relative 'build/android_build_dev_task'
+        require_relative 'build/android_build_adhoc_task'
+        require_relative 'build/android_build_gplay_task'
 
         case mode
         when :dev, :debug
-          AndroidDevBuildTask.new(options)
+          AndroidBuildDevTask.new(options)
+        when :adhoc
+          AndroidBuildAdhocTask.new(options)
         when :release
-          AndroidReleaseBuildTask.new(options)
+          AndroidBuildGPlayTask.new(options)
         else
           raise ArgumentError, "不支持的 Android 构建模式: #{mode}"
         end
@@ -114,12 +117,12 @@ module Pindo
 
       # 创建 Web 构建任务
       def self.create_web_task(mode, options)
-        require_relative 'build/web_dev_build_task'
+        require_relative 'build/web_build_dev_task'
 
         case mode
         when :dev, :debug, :release
           # Web 目前只有一个构建任务类
-          WebDevBuildTask.new(options)
+          WebBuildDevTask.new(options)
         else
           raise ArgumentError, "不支持的 Web 构建模式: #{mode}"
         end

data/lib/pindo/module/task/model/jps_resign_task.rb

@@ -0,0 +1,185 @@
+require_relative '../pindo_task'
+require_relative '../task_config'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  module TaskSystem
+    # JPS 重签名任务
+    # 从 JPS 平台下载应用并使用指定证书重签名
+    class JPSResignTask < PindoTask
+      attr_reader :app_info_obj, :version_info, :cert_id, :send_flag
+
+      def self.task_type
+        :jps_resign
+      end
+
+      # 重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED  # 延迟重试
+      end
+
+      def self.default_retry_count
+        2  # 默认可以重试 2 次
+      end
+
+      def self.default_retry_delay
+        10  # 默认延迟 10 秒
+      end
+
+      # 初始化 JPS 重签名任务
+      # @param options [Hash] 选项
+      # @option options [Hash] :app_info_obj JPS 应用信息对象（可选，如为 nil 则延迟获取）
+      # @option options [String] :project_name 项目名称（可选）
+      # @option options [String] :cert_id 重签名使用的 Bundle ID（可选，nil 表示交互选择）
+      # @option options [Boolean] :send_flag 是否发送到测试群（默认 false，始终会发送给自己）
+      def initialize(options = {})
+        @app_info_obj = options[:app_info_obj]
+        @project_name = options[:project_name]
+        @cert_id = options[:cert_id]
+        @send_flag = options[:send_flag] || false
+        @version_info = nil
+
+        # 设置重签名任务的优先级为 LOW，确保在上传任务之后执行
+        options[:priority] ||= TaskPriority::LOW
+
+        super("JPS 重签名", options)
+      end
+
+      def validate
+        # app_info_obj 可以延迟获取，不在这里验证
+        true
+      end
+
+      protected
+
+      def do_work
+        pgyer_helper = PgyerHelper.share_instace
+
+        # 1. 如果没有 app_info_obj，延迟获取
+        if @app_info_obj.nil?
+          fetch_jps_config
+        end
+
+        # 2. 获取要重签名的版本
+        @version_info = pgyer_helper.get_versioon_history_item(
+          app_info_obj: @app_info_obj,
+          list_select_flat: false
+        )
+
+        if @version_info.nil?
+          @retry_count = 0  # 没有版本记录时不重试
+          raise "没有找到上传记录"
+        end
+
+        # 3. 获取证书列表
+        cert_list = pgyer_helper.get_cert_list
+
+        if cert_list.nil? || cert_list.empty?
+          @retry_count = 0  # 没有证书时不重试
+          raise "没有找到可用的证书"
+        end
+
+        # 4. 选择证书
+        cert_item = select_certificate(cert_list)
+
+        if cert_item.nil?
+          @retry_count = 0  # 没有匹配的证书时不重试
+          raise "未找到匹配的证书"
+        end
+
+        # 5. 执行重签名
+        result = pgyer_helper.resign(
+          package_id: @version_info["id"],
+          cert_id: cert_item["id"]
+        )
+
+        unless result
+          raise "重签名失败"
+        end
+
+        # 6. 获取重签名后的版本信息
+        @version_info = pgyer_helper.get_versioon_history_item(
+          app_info_obj: @app_info_obj,
+          list_select_flat: false
+        )
+
+        if @version_info.nil?
+          raise "重签名成功但无法获取新版本信息"
+        end
+
+        # 7. 打印版本信息
+        pgyer_helper.print_app_version_info(
+          app_info_obj: @app_info_obj,
+          app_version_info_obj: @version_info
+        )
+
+        # 8. 发送消息给自己
+        pgyer_helper.send_apptest_msg(
+          app_info_obj: @app_info_obj,
+          app_version_info_obj: @version_info,
+          receiveType: "self"
+        )
+
+        # 9. 如果需要发送到测试群
+        if @send_flag
+          pgyer_helper.send_apptest_msg(
+            app_info_obj: @app_info_obj,
+            app_version_info_obj: @version_info,
+            chatEnv: "DevTest",
+            receiveType: "chat"
+          )
+        end
+
+        {
+          success: true,
+          version_info: @version_info,
+          cert_id: cert_item["mainBundleId"]
+        }
+      end
+
+      private
+
+      # 延迟获取 JPS 配置
+      def fetch_jps_config
+        puts "  获取 JPS 配置..."
+
+        # 获取当前工作目录
+        working_directory = Dir.pwd
+
+        # 调用 PgyerHelper 获取配置
+        @app_info_obj = PgyerHelper.share_instace.prepare_upload(
+          working_directory: working_directory,
+          proj_name: @project_name
+        )
+
+        unless @app_info_obj
+          raise "无法获取 JPS 配置"
+        end
+      end
+
+      # 选择证书
+      def select_certificate(cert_list)
+        if @cert_id.nil? && cert_list.size > 0
+          # 交互式选择证书
+          bundle_id_list = cert_list.map { |cert| [cert["certType"], cert["mainBundleId"]].join("_") }
+          cli = HighLine.new
+          selected = cli.choose do |menu|
+            menu.prompt = "请选择重签名的证书:"
+            menu.choices(*bundle_id_list)
+          end
+
+          # 根据选择找到对应的证书
+          cert_list.select { |certitem|
+            [certitem["certType"], certitem["mainBundleId"]].join("_") == selected
+          }.first
+        else
+          # 根据 cert_id 查找 adhoc 证书
+          cert_list.select { |certitem|
+            certitem["mainBundleId"] == @cert_id &&
+            certitem["certType"].downcase.include?("adhoc")
+          }.first
+        end
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/{upload_task.rb → jps_upload_task.rb}

@@ -4,9 +4,9 @@ require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo
   module TaskSystem
-    # 上传任务
-    # 上传构建产物到测试平台（JPS）
-    class UploadTask < PindoTask
+    # JPS 上传任务
+    # 上传构建产物到 JPS 测试平台
+    class JPSUploadTask < PindoTask
       attr_reader :file_type, :upload_path, :upload_file
 
       def self.task_type

data/lib/pindo/module/task/model/unity_export_task.rb

@@ -31,6 +31,7 @@ module Pindo
         @is_library_mode = false  # 不再支持库模式
         @index_count = options[:context] ? options[:context][:index_count] : nil
         @export_path = options[:export_path]  # 可由参数传入，nil 表示自动检测
+        @deploy_mode = options[:deploy_mode] || 'dev'  # 部署模式：dev/adhoc/release，默认 dev
 
         name = case platform
                when 'ios', 'ipa'
@@ -188,7 +189,8 @@ module Pindo
             project_path: @unity_project_path,
             platform: platform,
             isLibrary: @is_library_mode,
-            indexNo: @index_count
+            indexNo: @index_count,
+            deployMode: @deploy_mode
           )
 
           # 清理 Unity 进程

data/lib/pindo/module/unity/unity_helper.rb

@@ -422,7 +422,7 @@ module Pindo
         nil
       end
 
-      def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false, indexNo: nil)
+      def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false, indexNo: nil, deployMode: nil)
 
         # 检查是否有Unity进程在运行，传入Unity路径和项目路径以精确匹配
         check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
@@ -434,6 +434,7 @@ module Pindo
         additional_args[:platform] = platform if platform
         additional_args[:buildtype] = 'library' if isLibrary
         additional_args[:indexno] = indexNo if indexNo
+        additional_args[:deploymode] = deployMode || 'dev' if deployMode || true  # 默认为 dev
 
         # 使用GoodUnityBuild.BuildManager.BatchBuild进行构建
         result = execute_unity_command(unity_exe_full_path, project_path, additional_args)