pindo 5.12.2 → 5.13.2

data/lib/pindo/module/task/model/appstore/appstore_upload_screenshot_task.rb

@@ -0,0 +1,276 @@
+require_relative 'appstore_task'
+require_relative '../task_config'
+
+module Pindo
+  module TaskSystem
+    # App Store Screenshot 上传任务
+    # 上传应用截图到 App Store Connect
+    class AppStoreUploadScreenshotTask < AppStoreTask
+      attr_reader :app_id, :screenshot_path
+
+      # 重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED  # 延迟重试
+      end
+
+      def self.default_retry_count
+        2  # 默认可以重试 2 次
+      end
+
+      def self.default_retry_delay
+        15  # 默认延迟 15 秒
+      end
+
+      # 初始化 Screenshot 上传任务
+      # @param app_id [String] App Store Connect 应用 ID
+      # @param screenshot_path [String] 截图目录路径
+      # @param options [Hash] 选项
+      # @option options [String] :apple_id Apple ID（App Store Connect 账号）
+      # @option options [String] :api_key_id API Key ID（使用 API Key 认证）
+      # @option options [String] :api_issuer_id API Issuer ID
+      # @option options [String] :api_key_path API Key 文件路径（.p8 文件）
+      # @option options [String] :locale 语言区域（默认 "zh-Hans"）
+      # @option options [Array<String>] :device_types 设备类型（如 ["iPhone 6.5", "iPad Pro"]）
+      # @option options [Boolean] :overwrite 是否覆盖已有截图（默认 false）
+      def initialize(app_id, screenshot_path, options = {})
+        @app_id = app_id                      # App Store Connect 应用 ID
+        @screenshot_path = screenshot_path    # 截图目录路径
+
+        # App Store Connect 认证配置
+        @apple_id = options[:apple_id]
+        @api_key_id = options[:api_key_id]
+        @api_issuer_id = options[:api_issuer_id]
+        @api_key_path = options[:api_key_path]
+
+        # 截图配置
+        @locale = options[:locale] || "zh-Hans"
+        @device_types = options[:device_types] || []
+        @overwrite = options[:overwrite] || false
+
+        # 设置上传任务的优先级为 LOW（截图上传可以最后执行）
+        options[:priority] ||= TaskPriority::LOW
+
+        super("上传 Screenshot 到 App Store", options)
+      end
+
+      def validate
+        # 验证基本参数
+        unless @app_id && !@app_id.empty?
+          @error = "缺少必需参数: app_id"
+          return false
+        end
+
+        unless @screenshot_path && !@screenshot_path.empty?
+          @error = "缺少必需参数: screenshot_path"
+          return false
+        end
+
+        # 验证截图路径
+        unless File.directory?(@screenshot_path)
+          @error = "截图路径不存在或不是目录: #{@screenshot_path}"
+          return false
+        end
+
+        # 验证认证信息（Apple ID 或 API Key）
+        has_apple_id_auth = @apple_id && !@apple_id.empty?
+        has_api_key_auth = @api_key_id && @api_issuer_id && @api_key_path
+
+        unless has_apple_id_auth || has_api_key_auth
+          @error = "缺少认证信息：需要提供 Apple ID 或 API Key"
+          return false
+        end
+
+        true
+      end
+
+      protected
+
+      def do_work
+        # 1. 扫描截图文件
+        screenshots = scan_screenshots
+
+        if screenshots.empty?
+          puts "  警告: 未找到任何截图文件"
+          return {
+            success: true,
+            app_id: @app_id,
+            screenshot_count: 0
+          }
+        end
+
+        # 2. 上传截图到 App Store Connect
+        upload_screenshots(screenshots)
+
+        {
+          success: true,
+          app_id: @app_id,
+          locale: @locale,
+          screenshot_count: screenshots.size
+        }
+      end
+
+      private
+
+      # 扫描截图文件
+      def scan_screenshots
+        puts "  扫描截图目录: #{@screenshot_path}"
+
+        screenshots = []
+
+        # 支持的截图格式
+        valid_extensions = ['.png', '.jpg', '.jpeg']
+
+        # 扫描目录结构
+        # 标准 Fastlane 结构: screenshots/{locale}/{device_type}/*.png
+        locale_path = File.join(@screenshot_path, @locale)
+
+        if File.directory?(locale_path)
+          # 有语言目录
+          scan_locale_directory(locale_path, screenshots, valid_extensions)
+        else
+          # 直接扫描根目录
+          scan_root_directory(@screenshot_path, screenshots, valid_extensions)
+        end
+
+        puts "  找到 #{screenshots.size} 个截图文件"
+        screenshots
+      end
+
+      # 扫描语言目录
+      def scan_locale_directory(locale_path, screenshots, valid_extensions)
+        # 遍历设备类型目录
+        Dir.glob(File.join(locale_path, "*")).each do |device_dir|
+          next unless File.directory?(device_dir)
+
+          device_type = File.basename(device_dir)
+
+          # 如果指定了设备类型，跳过不匹配的
+          unless @device_types.empty?
+            next unless @device_types.include?(device_type)
+          end
+
+          # 扫描设备目录下的截图
+          Dir.glob(File.join(device_dir, "*")).each do |file|
+            next unless File.file?(file)
+            next unless valid_extensions.include?(File.extname(file).downcase)
+
+            screenshots << {
+              path: file,
+              device_type: device_type,
+              locale: @locale,
+              filename: File.basename(file)
+            }
+          end
+        end
+      end
+
+      # 扫描根目录（无语言/设备分类）
+      def scan_root_directory(root_path, screenshots, valid_extensions)
+        Dir.glob(File.join(root_path, "**", "*")).each do |file|
+          next unless File.file?(file)
+          next unless valid_extensions.include?(File.extname(file).downcase)
+
+          screenshots << {
+            path: file,
+            device_type: 'unknown',
+            locale: @locale,
+            filename: File.basename(file)
+          }
+        end
+      end
+
+      # 上传截图到 App Store Connect
+      def upload_screenshots(screenshots)
+        puts "\n开始上传 Screenshot 到 App Store Connect..."
+        puts "  App ID: #{@app_id}"
+        puts "  语言区域: #{@locale}"
+        puts "  截图数量: #{screenshots.size}"
+        puts "  覆盖模式: #{@overwrite}"
+
+        # 按设备类型分组
+        screenshots_by_device = screenshots.group_by { |s| s[:device_type] }
+
+        screenshots_by_device.each do |device_type, device_screenshots|
+          puts "\n  上传 #{device_type} 截图 (#{device_screenshots.size} 张)..."
+
+          device_screenshots.each_with_index do |screenshot, index|
+            puts "    [#{index + 1}/#{device_screenshots.size}] #{screenshot[:filename]}"
+          end
+        end
+
+        # 使用 Fastlane deliver 或 API 上传截图
+        if use_api_key?
+          upload_with_api(screenshots)
+        else
+          upload_with_fastlane(screenshots)
+        end
+
+        puts "✓ Screenshot 上传成功"
+      end
+
+      # 判断是否使用 API Key 认证
+      def use_api_key?
+        @api_key_id && @api_issuer_id && @api_key_path
+      end
+
+      # 使用 App Store Connect API 上传
+      def upload_with_api(screenshots)
+        puts "  使用 App Store Connect API 上传..."
+
+        # 这里需要调用 App Store Connect API Helper
+        # require 'pindo/module/appstore/appstore_metadata_connect_api_helper'
+
+        # 示例实现（需要根据实际 Helper 调整）
+        # screenshots.each do |screenshot|
+        #   AppstoreMetadataConnectApiHelper.upload_screenshot(
+        #     app_id: @app_id,
+        #     api_key_id: @api_key_id,
+        #     api_issuer_id: @api_issuer_id,
+        #     api_key_path: @api_key_path,
+        #     locale: screenshot[:locale],
+        #     device_type: screenshot[:device_type],
+        #     screenshot_path: screenshot[:path],
+        #     overwrite: @overwrite
+        #   )
+        # end
+
+        # 临时占位实现
+        puts "  TODO: 实现 API 上传逻辑"
+        raise "API 上传功能尚未实现，请使用 Fastlane 方式"
+      end
+
+      # 使用 Fastlane deliver 上传
+      def upload_with_fastlane(screenshots)
+        puts "  使用 Fastlane deliver 上传..."
+
+        # 构建 deliver 命令参数
+        fastlane_cmd = ["fastlane", "deliver"]
+        fastlane_cmd << "--app_identifier" << @app_id
+        fastlane_cmd << "--username" << @apple_id if @apple_id
+
+        # 截图路径
+        fastlane_cmd << "--screenshots_path" << @screenshot_path
+
+        # 覆盖已有截图
+        if @overwrite
+          fastlane_cmd << "--overwrite_screenshots"
+        end
+
+        # 跳过元数据上传
+        fastlane_cmd << "--skip_metadata"
+
+        # 跳过二进制文件上传
+        fastlane_cmd << "--skip_binary_upload"
+
+        # 执行命令
+        puts "  执行命令: #{fastlane_cmd.join(' ')}"
+
+        success = system(*fastlane_cmd)
+
+        unless success
+          raise "上传失败：Fastlane deliver 命令执行出错（退出码: #{$?.exitstatus}）"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,210 @@
+require_relative 'android_build_task'
+require 'pindo/module/build/build_helper'
+require 'pindo/module/build/version_helper'
+require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/android/android_config_helper'
+require 'pindo/module/android/android_build_helper'
+require 'pindo/module/pgyer/pgyerhelper'
+require 'pindo/base/githelper'
+
+module Pindo
+  module TaskSystem
+    # Android AdHoc 模式构建任务
+    # 使用 Release 模式编译 Android 工程（AdHoc 版本）
+    class AndroidBuildAdhocTask < AndroidBuildTask
+      include Pindo::Githelper
+
+      def initialize(options = {})
+        @bundle_name = options[:bundle_name]
+        @proj_name = options[:proj_name]
+        @upload_flag = options[:upload] || false
+        @send_flag = options[:send] || false
+
+        # 接收外部传入的 JPS 配置
+        @app_info_obj = options[:app_info_obj]
+        @workflow_info = options[:workflow_info]
+
+        super(:android, :adhoc, options)
+      end
+
+      protected
+
+      def build_task_name
+        "构建 APK (AdHoc)"
+      end
+
+      def prepare_build
+        # 校验必需的参数
+        Dir.chdir(@project_path)
+        validate_workflow_info
+        check_git_tag if @upload_flag
+        update_project_config
+        update_version_info
+        handle_bundle_name_config if @bundle_name
+        add_application_id_scheme
+      end
+
+      def execute_build
+        build_android_project
+      end
+
+      def find_output
+        # 搜索 APK 和 AAB 文件
+        search_paths = []
+        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:apk].map { |p| File.join(@project_path, p) })
+        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:aab].map { |p| File.join(@project_path, p) })
+
+        package_files = []
+        search_paths.each do |pattern|
+          package_files.concat(Dir.glob(pattern))
+        end
+
+        # 过滤测试包和未签名包
+        package_files.reject! do |f|
+          basename = File.basename(f).downcase
+          TaskConfig::EXCLUDED_PATTERNS.any? { |pattern| basename.include?(pattern) }
+        end
+
+        if package_files.any?
+          # 优先返回 AAB，其次 APK
+          aab_files = package_files.select { |f| f.end_with?(".aab") }
+          apk_files = package_files.select { |f| f.end_with?(".apk") }
+
+          latest_package = if aab_files.any?
+                            aab_files.max_by { |f| File.mtime(f) }
+                          elsif apk_files.any?
+                            apk_files.max_by { |f| File.mtime(f) }
+                          else
+                            package_files.max_by { |f| File.mtime(f) }
+                          end
+
+          puts "  找到 Android 包文件: #{latest_package}"
+          latest_package
+        else
+          puts "  警告: 未找到 APK/AAB 文件"
+          nil
+        end
+      end
+
+      private
+
+      # 校验工作流信息
+      def validate_workflow_info
+        unless @workflow_info && @workflow_info[:package_name]
+          raise Informative, "未提供工作流信息，请在创建任务时传入 workflow_info 参数"
+        end
+      end
+
+      # Git 标签检查
+      def check_git_tag
+        git_repo_helper = Pindo::GitRepoHelper.share_instance
+        is_need_add_tag, tag_action_params = git_repo_helper.check_is_need_add_tag?(@project_path)
+        if is_need_add_tag
+          git_repo_helper.create_and_push_tag(
+            project_dir: @project_path,
+            mode: 'minor',
+            force_retag: tag_action_params&.include?('--retag') || false,
+            custom_tag: nil,
+            release_branch: 'master'
+          )
+        end
+      end
+
+      # 更新工程配置
+      def update_project_config
+        workflow_packname = @workflow_info[:package_name]
+
+        puts "\n使用工作流配置更新 Android 项目:"
+        puts "  Workflow Package Name: #{workflow_packname}"
+
+        # 更新 App Name、Application ID 和 URL Schemes
+        Pindo::AndroidConfigHelper.update_project_with_workflow(
+          project_dir: @project_path,
+          workflow_packname: workflow_packname
+        )
+
+        # 下载并替换 Icon
+        if @app_info_obj && @app_info_obj["projectIcon"] && !@app_info_obj["projectIcon"].empty?
+          icon_replace_success = Pindo::AndroidConfigHelper.download_and_replace_icon_from_url(
+            project_dir: @project_path,
+            icon_url: @app_info_obj["projectIcon"]
+          )
+
+          unless icon_replace_success
+            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{@app_info_obj["projectIcon"]}"
+          end
+        else
+          Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
+        end
+      end
+
+      # 更新版本号
+      def update_version_info
+        version_helper = Pindo::VersionHelper.share_instance
+        version_info = version_helper.get_version_info(project_dir: @project_path)
+
+        if version_info[:is_git_repo]
+          Pindo::AndroidConfigHelper.update_android_project_version(
+            project_dir: @project_path,
+            version_name: version_info[:version],
+            version_code: version_info[:build_number]
+          )
+        else
+          Funlog.warning("非Git仓库，保持工程原有版本号")
+        end
+      end
+
+      # 处理 Bundle Name 特殊配置
+      def handle_bundle_name_config
+        return unless @bundle_name && !@bundle_name.empty?
+
+        puts "\n正在处理指定的 Bundle Name: #{@bundle_name}..."
+
+        # 检查是否为通配符
+        is_wildcard = @bundle_name.include?('*') ||
+                      @bundle_name.end_with?('.') ||
+                      ['com.test', 'com.example', 'com.demo'].include?(@bundle_name)
+
+        if is_wildcard
+          puts "  ⚠️  检测到通配符或通用 Bundle Name: #{@bundle_name}"
+          puts "  ⚠️  跳过 google-services.json 和 Application ID 更新"
+        else
+          # 拉取配置仓库
+          config_repo_dir = clong_buildconfig_repo(repo_name: @bundle_name)
+
+          if config_repo_dir && File.exist?(config_repo_dir)
+            # 拷贝 google-services.json
+            Pindo::AndroidConfigHelper.copy_google_services_from_config_repo(
+              config_repo_dir: config_repo_dir,
+              project_dir: @project_path
+            )
+
+            # 更新 Application ID
+            Pindo::AndroidConfigHelper.update_application_id(
+              project_dir: @project_path,
+              application_id: @bundle_name
+            )
+
+            puts "  ✓ Bundle Name 配置处理完成"
+          else
+            raise Informative, "无法获取配置仓库"
+          end
+        end
+      end
+
+      # 添加基于 Application ID 的 Scheme
+      def add_application_id_scheme
+        Pindo::AndroidConfigHelper.add_application_id_based_scheme(
+          project_dir: @project_path
+        )
+      end
+
+      # 构建 Android 工程
+      def build_android_project
+        android_build_helper = Pindo::AndroidBuildHelper.share_instance
+        # 第二个参数 false 表示 release 模式
+        android_build_helper.auto_build_apk(@project_path, false)
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/build/{android_dev_build_task.rb → android_build_dev_task.rb}

@@ -1,4 +1,4 @@
-require_relative '../build_task'
+require_relative 'android_build_task'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/build/version_helper'
 require 'pindo/module/build/git_repo_helper'
@@ -11,7 +11,7 @@ module Pindo
   module TaskSystem
     # Android Dev 模式构建任务
     # 使用 Debug 模式编译 Android 工程
-    class AndroidDevBuildTask < BuildTask
+    class AndroidBuildDevTask < AndroidBuildTask
       include Pindo::Githelper
       def initialize(options = {})
         @bundle_name = options[:bundle_name]