pindo 5.11.3 → 5.12.1

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

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/unity/unity_helper'
 require 'pindo/module/build/build_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/task/pindo_task'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/build_task'
@@ -20,11 +21,11 @@ module Pindo
                 
                 include Pindo::Githelper
                 # Unity 多平台编译和上传命令
-                self.summary = '编译Unity工程生成iOS/Android/WebGL并支持上传到测试平台'
+                self.summary = '编译Unity工程,生成IPA、APK、Html文件(默认编译三个平台的包)并支持上传到JPS平台'
 
                 # 详细说明
                 self.description = <<-DESC
-                    编译Unity工程并生成iOS IPA、Android APK和WebGL包，支持上传到JPS测试平台。
+                    编译Unity工程,生成IPA、APK、Html文件(默认编译三个平台的包)并支持上传到JPS平台。
 
                     支持功能:
 
@@ -55,8 +56,6 @@ module Pindo
                         $ pindo unity autobuild --upload               # 编译所有类型并上传到JPS
 
                         $ pindo unity autobuild --proj="My App"        # 指定项目名称
-
-                        $ pindo unity autobuild --base                 # Unity lib模式
 DESC
 
                 # 命令参数
@@ -72,7 +71,10 @@ DESC
                         ['--proj=NAME',   '指定上传到测试平台的项目名称'],
                         ['--types=TYPES', '指定要构建的类型，逗号分隔（如：ipa,apk,html），默认全部类型'],
                         ['--upload', '上传编译后的IPA/APK到测试平台'],
-                        ['--base',   'Unity工程编译lib模式（生成库而非完整应用）'],
+                        ['--send', '发送通知到测试群组（同时也会发送给自己）'],
+                        ['--adhoc', '使用AdHoc证书打包iOS（默认使用Dev证书）'],
+                        ['--deploy', '使用发布证书打包iOS'],
+                        ['--release', '使用Release模式构建Android（默认使用Debug）'],
                     ].concat(super)
                 end
 
@@ -81,11 +83,18 @@ DESC
 
                     @args_proj_name = argv.option('proj')
                     @args_upload_flag = argv.flag?('upload', false)
-                    @args_base_flag = argv.flag?('base', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_adhoc_flag = argv.flag?('adhoc', false)
+                    @args_deploy_flag = argv.flag?('deploy', false)
+                    @args_release_flag = argv.flag?('release', false)
                     @args_bundle_id = argv.option('bundleid')
                     @args_bundle_name = argv.option('bundle_name')
                     @args_types = argv.option('types')
 
+                    # 如果开启 send，自动开启 upload
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
 
                     super
                 end
@@ -131,277 +140,356 @@ DESC
                     end
 
                     if @args_upload_flag
-                        build_helper = Pindo::BuildHelper.share_instance
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+                        git_repo_helper = Pindo::GitRepoHelper.share_instance
+                        is_need_add_tag, tag_action_parms = git_repo_helper.check_is_need_add_tag?(pindo_project_dir)
                         if is_need_add_tag
-                            Pindo::Command::Utils::Tag::run(tag_action_parms)
+                            git_repo_helper.create_and_push_tag(
+                                project_dir: pindo_project_dir,
+                                mode: 'minor',
+                                force_retag: tag_action_parms&.include?('--retag') || false,
+                                custom_tag: nil,
+                                release_branch: 'master'
+                            )
                         end
                     end
 
-                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
-                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
-                    puts
-                    puts "工程的Unity版本: #{project_unity_version}"
-                    puts "选择的Unity路径: #{unity_exe_path}"
-                    puts
-
-                    proj_name = @args_proj_name
-                    @app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-
-                    # 获取要构建的类型列表
+                    # 1. 获取要构建的类型列表
                     selected_platforms = get_selected_build_types()
 
-                    # 使用任务系统执行构建
-                    execute_with_task_system(selected_platforms, unity_helper, unity_exe_path)
-                end
+                    # 2. 按平台顺序准备所有配置（iOS → Android → Web）
+                    all_platform_configs = prepare_all_platform_configs(selected_platforms)
 
-                def execute_with_task_system(selected_platforms, unity_helper, unity_exe_path)
-                    # 初始化任务管理器
+                    # 3. 按平台顺序创建所有任务
+                    all_tasks = make_task_with_config(selected_platforms, all_platform_configs)
+
+                    # 4. 统一添加到任务管理器并执行
                     task_manager = Pindo::TaskSystem::TaskManager.instance
                     task_manager.clear_all  # 清空之前的任务
 
-                    # 类型到显示名称的映射
-                    display_names = {
-                        'ios' => 'IPA',
-                        'android' => 'APK',
-                        'web' => 'HTML'
-                    }
-
-                    # 显示任务计划
-                    puts
-                    puts "========================================".cyan
-                    puts "任务执行计划".green
-                    puts "========================================".cyan
-                    puts "构建类型: #{selected_platforms.map { |p| display_names[p] }.join(', ')}"
-                    puts "上传: #{@args_upload_flag ? '是' : '否'}"
-
-                    task_count = selected_platforms.length * 2  # Unity导出 + 构建
-                    task_count += selected_platforms.length if @args_upload_flag  # 上传任务
-                    puts "总任务数: #{task_count}"
-                    puts "========================================".cyan
-                    puts
-
-                    # 创建任务
-                    unity_tasks = {}
-                    build_tasks = {}
-                    upload_tasks = {}
-
-                    # 1. 创建 Unity 导出任务
-                    selected_platforms.each do |platform|
-                        unity_task = Pindo::TaskSystem::UnityExportTask.new(
-                            platform,
-                            project_path: Dir.pwd,
-                            unity_exe_path: unity_exe_path,
-                            unity_helper: unity_helper,
-                            context: {
-                                project_name: @app_info_obj["projectName"]
-                            }
-                        )
-                        unity_tasks[platform] = unity_task
-                        task_manager.add_task(unity_task)
+                    # 按顺序添加所有任务
+                    all_tasks.each do |task|
+                        task_manager.add_task(task)
                     end
 
-                    # 2. 创建构建任务
+                    # 执行任务
+                    task_manager.start
+                end
+
+                # 按平台顺序创建所有任务
+                def make_task_with_config(selected_platforms, all_platform_configs)
+                    all_tasks = []
+                    build_tasks = []  # 收集所有构建任务
+
+                    # 第一步：创建所有导出和构建任务
                     selected_platforms.each do |platform|
-                        # 准备构建配置
-                        build_config = prepare_build_config(platform)
-
-                        build_task = Pindo::TaskSystem::BuildTask.new(
-                            platform,
-                            project_path: Dir.pwd,
-                            build_config: build_config,
-                            context: {
-                                project_name: @app_info_obj["projectName"],
-                                bundle_id: build_config[:bundle_id],
-                                bundle_name: build_config[:bundle_name]
-                            },
-                            dependencies: [unity_tasks[platform].id]  # 依赖 Unity 导出
-                        )
-                        build_tasks[platform] = build_task
-                        task_manager.add_task(build_task)
+                        platform_config = all_platform_configs[platform]
+
+                        # 1. 创建 Unity 导出任务
+                        unity_task = create_unity_export_task(platform, all_platform_configs)
+                        all_tasks << unity_task
+
+                        # 2. 创建构建任务
+                        build_task = create_build_task(platform, platform_config, all_platform_configs, unity_task)
+                        all_tasks << build_task
+                        build_tasks << build_task  # 收集构建任务
                     end
 
-                    # 3. 如果需要上传，创建上传任务
+                    # 第二步：创建所有上传任务（如果需要）
                     if @args_upload_flag
-                        selected_platforms.each do |platform|
-                            upload_task = Pindo::TaskSystem::UploadTask.new(
-                                platform,
-                                nil,  # 文件路径将从构建任务结果获取
-                                project_name: @app_info_obj["projectName"],
-                                context: {
-                                    project_name: @app_info_obj["projectName"]
-                                },
-                                dependencies: [build_tasks[platform].id]  # 依赖构建任务
-                            )
+                        selected_platforms.each_with_index do |platform, index|
+                            # 获取对应平台的构建任务
+                            platform_build_task = build_tasks[index]
+
+                            # 创建上传任务
+                            upload_task = create_upload_task(platform, all_platform_configs, platform_build_task)
 
-                            # 设置构建完成后传递输出路径
-                            build_tasks[platform].on(:on_success) do |task|
-                                if task.result && task.result[:output]
-                                    upload_task.context[:output_path] = task.result[:output]
+                            # 让上传任务依赖所有构建任务完成
+                            build_tasks.each do |build_task|
+                                unless upload_task.dependencies.include?(build_task.id)
+                                    upload_task.dependencies << build_task.id
                                 end
                             end
 
-                            upload_tasks[platform] = upload_task
-                            task_manager.add_task(upload_task)
+                            all_tasks << upload_task
                         end
                     end
 
-                    # 执行任务
-                    task_manager.start
-
-                    # 显示执行报告
-                    show_execution_report(task_manager.execution_report)
+                    # 返回所有任务
+                    all_tasks
                 end
 
-                def prepare_build_config(platform)
-                    config = {}
-
+                # 获取平台对应的导出/构建路径
+                # 优先使用 Base 目录，如果不存在则使用普通目录
+                def get_platform_path(platform)
                     case platform
                     when 'ios'
-                        # 获取 iOS Bundle ID
-                        if @args_bundle_id
-                            config[:bundle_id] = @args_bundle_id
-                        else
-                            if @args_deploy_flag
-                                config[:bundle_id] = get_selected_deploy_bundleid()
-                            else
-                                config[:bundle_id] = get_selected_dev_bundleid()
-                            end
-                        end
-                    when 'android', 'web'
-                        # 获取 Android/Web Bundle Name
-                        if @args_bundle_name
-                            config[:bundle_name] = @args_bundle_name
-                        else
-                            config[:bundle_name] = get_selected_dev_bundle_name()
-                        end
+                        base_ios_path = File.join(Dir.pwd, "GoodPlatform", "BaseiOS")
+                        ios_path = File.join(Dir.pwd, "GoodPlatform", "iOS")
+                        File.exist?(base_ios_path) ? base_ios_path : ios_path
+                    when 'android'
+                        base_android_path = File.join(Dir.pwd, "GoodPlatform", "BaseAndroid")
+                        android_path = File.join(Dir.pwd, "GoodPlatform", "Android")
+                        File.exist?(base_android_path) ? base_android_path : android_path
+                    when 'web'
+                        File.join(Dir.pwd, "GoodPlatform", "WebGL")
+                    else
+                        Dir.pwd
                     end
+                end
 
-                    config
+                # 创建 Unity 导出任务
+                def create_unity_export_task(platform, all_platform_configs)
+                    platform_config = all_platform_configs[platform]
+
+                    # 构建 context
+                    context = {
+                    }
+
+                    # 添加 project_name
+                    context[:project_name] = all_platform_configs["project_name"] if all_platform_configs["project_name"]
+
+                    # 添加 index_count
+                    context[:index_count] = platform_config["index_count"] if platform_config["index_count"]
+
+                    # 获取平台路径
+                    export_path = get_platform_path(platform)
+
+                    Pindo::TaskSystem::UnityExportTask.new(
+                        platform,
+                        project_path: Dir.pwd,
+                        export_path: export_path,
+                        context: context
+                    )
                 end
 
-                def show_execution_report(report)
-                    puts
-                    puts "========================================".cyan
-                    puts "任务执行报告".green
-                    puts "========================================".cyan
-
-                    # 显示统计
-                    puts "执行统计:"
-                    puts "  成功: #{report[:success]}".green if report[:success] > 0
-                    puts "  失败: #{report[:failed]}".red if report[:failed] > 0
-                    puts
-
-                    # 显示每个任务的状态
-                    puts "任务详情:"
-                    report[:tasks].each do |task|
-                        status_icon = case task[:status]
-                                     when :success then "✅"
-                                     when :failed then "❌"
-                                     when :cancelled then "⏹"
-                                     else "⏸"
-                                     end
-
-                        status_color = case task[:status]
-                                      when :success then :green
-                                      when :failed then :red
-                                      when :cancelled then :yellow
-                                      else :gray
-                                      end
-
-                        time_str = task[:execution_time] ? " (#{task[:execution_time].round(2)}s)" : ""
-                        status_str = "#{status_icon} #{task[:name]}#{time_str}"
-
-                        if status_color == :green && defined?(String.green)
-                            puts status_str.green
-                        elsif status_color == :red && defined?(String.red)
-                            puts status_str.red
-                        elsif status_color == :yellow && defined?(String.yellow)
-                            puts status_str.yellow
-                        else
-                            puts status_str
-                        end
+                # 创建构建任务
+                def create_build_task(platform, platform_config, all_platform_configs, unity_task)
+                    # 确定构建模式
+                    build_mode = determine_build_mode(platform)
+
+                    # 获取平台路径
+                    platform_path = get_platform_path(platform)
+
+                    # 准备构建选项
+                    build_options = {
+                        proj_name: all_platform_configs["project_name"],
+                        upload: @args_upload_flag,
+                        send: @args_send_flag,
+                        app_info_obj: all_platform_configs["app_info_obj"],      # 共享的项目信息
+                        workflow_info: platform_config["workflow_info"],     # 平台特定的工作流
+                        project_path: platform_path
+                    }
 
-                        if task[:status] == :failed && task[:error]
-                            puts "    错误: #{task[:error]}".red if defined?(String.red)
-                        end
+                    # 设置平台特定参数
+                    case platform
+                    when 'ios'
+                        build_options[:bundle_id] = platform_config["bundle_id"]
+                        build_options[:unity_root_path] = Dir.pwd  # 传递 Unity 根目录路径
+                    when 'android'
+                        build_options[:bundle_name] = platform_config["bundle_name"]
+                    when 'web'
+                        build_options[:project_path] = Dir.pwd  # Web 平台使用根目录
+                        build_options[:force_select_unity] = false
                     end
 
-                    puts "========================================".cyan
+                    # 使用工厂方法创建任务
+                    build_task = Pindo::TaskSystem::BuildTask.create_task(
+                        platform: platform,
+                        mode: build_mode,
+                        options: build_options
+                    )
+
+                    # 设置依赖关系
+                    build_task.dependencies << unity_task.id
+
+                    build_task
                 end
 
-                def web_autobuild(unity_helper:nil, unity_exe_path:nil)
+                # 创建上传任务
+                def create_upload_task(platform, all_platform_configs, build_task)
+                    # 获取平台路径
+                    platform_path = get_platform_path(platform)
+
+                    # 获取平台特定的配置
+                    platform_config = all_platform_configs[platform]
+
+                    # 确定文件类型和上传路径
+                    file_type, upload_path = case platform
+                                             when 'ios'
+                                                 ['ipa', File.join(platform_path, 'build')]
+                                             when 'android'
+                                                 ['apk', File.join(platform_path, 'build')]
+                                             when 'web'
+                                                 ['html', File.join(platform_path, 'build')]
+                                             else
+                                                 [platform, platform_path]
+                                             end
+
+                    upload_task = Pindo::TaskSystem::UploadTask.new(
+                        file_type,
+                        upload_path,
+                        nil,
+                        app_info_obj: all_platform_configs["app_info_obj"],  # 使用共享的项目信息
+                        workflow_info: platform_config["workflow_info"],  # 使用平台特定的工作流
+                        project_name: all_platform_configs["project_name"],
+                        context: {
+                            send_to_chat: @args_send_flag  # 是否发送到测试群
+                        },
+                        dependencies: [build_task.id]  # 依赖构建任务
+                    )
+
+                    upload_task
+                end
 
-                    args_temp = []
+                # 按平台顺序准备所有配置（iOS → Android → Web）
+                def prepare_all_platform_configs(selected_platforms)
 
-                    if @main_bundle_name
-                        args_temp << "--bundle_name=#{@main_bundle_name}"
-                    end
+                    # 按优先级排序：iOS → Android → Web
+                    platform_order = ['ios', 'android', 'web']
+                    sorted_platforms = selected_platforms.sort_by { |p| platform_order.index(p) || 999 }
 
-                    if @args_upload_flag
-                        args_temp << "--proj=#{@app_info_obj["projectName"]}"
-                        args_temp << "--upload"
-                    end
+                    # 初始化配置结构
+                    configs = {
+                        "project_name" => nil,
+                        "app_info_obj" => nil,
+                        "ios" => {},
+                        "android" => {},
+                        "web" => {}
+                    }
 
-                    Pindo::Command::Android::Autobuild::run(args_temp)
+                    # ========== 为每个平台准备特定配置 ==========
+
+                    sorted_platforms.each do |platform|
+                        puts "\n准备 #{platform.upcase} 配置:"
+                        puts "----------------------------------------"
+
+                        platform_config = {}
+
+                        # 确定当前平台的 package_type
+                        package_type = case platform
+                                       when 'ios'
+                                           'ipa'
+                                       when 'android'
+                                           'apk'
+                                       when 'web'
+                                           'zip'
+                                       else
+                                           'ipa'
+                                       end
+
+                        # 获取当前平台的 JPS 配置
+                        app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
+                            working_directory: Dir.pwd,
+                            proj_name: @args_proj_name,
+                            package_type: package_type
+                        )
 
-                end
-                
+                        # 保存 app_info_obj 到共享配置（所有平台共享同一个项目）
+                        if configs["app_info_obj"].nil?
+                            configs["app_info_obj"] = app_info_obj
+                            configs["project_name"] = app_info_obj ? app_info_obj["projectName"] : nil
+                        end
 
-                def ios_autobuild(unity_helper:nil, unity_exe_path:nil)
+                        # 保存平台特定的 workflow_info（每个平台有不同的工作流）
+                        platform_config["workflow_info"] = workflow_info
 
-                    pindo_project_dir = Dir.pwd
-                    mainapp_bundleid= nil
-                    if @args_bundle_id
-                        mainapp_bundleid = @args_bundle_id
-                    else
-                        if @args_deploy_flag
-                            mainapp_bundleid = get_selected_deploy_bundleid()
-                        else
-                            mainapp_bundleid = get_selected_dev_bundleid()
+                        puts "  ✓ Project: #{app_info_obj ? app_info_obj["projectName"] : "N/A"}"
+                        puts "  ✓ Package Type: #{package_type}"
+                        puts "  ✓ Workflow: #{workflow_info[:package_name]}" if workflow_info
+
+                        case platform
+                        when 'ios'
+                            # 获取 iOS Bundle ID
+                            if @args_bundle_id
+                                platform_config["bundle_id"] = @args_bundle_id
+                            else
+                                if @args_deploy_flag
+                                    platform_config["bundle_id"] = get_selected_deploy_bundleid()
+                                else
+                                    platform_config["bundle_id"] = get_selected_dev_bundleid()
+                                end
+                            end
+                            puts "  Bundle ID: #{platform_config["bundle_id"]}"
+
+                        when 'android'
+                            # 获取 Android Package Name
+                            if @args_bundle_name
+                                platform_config["bundle_name"] = @args_bundle_name
+                            else
+                                platform_config["bundle_name"] = get_selected_dev_bundle_name()
+                            end
+                            puts "  Package Name: #{platform_config["bundle_name"]}"
+
+                        when 'web'
+                            # Web 平台获取 indexNo
+                            platform_config["index_count"] = fetch_webgl_index_no(
+                                app_info_obj: app_info_obj,
+                                workflow_info: workflow_info
+                            )
+                            puts "  WebGL Index: #{platform_config["index_count"]}"
                         end
-                    end
-                    
-                    args_temp = []
-                    args_temp << "--bundleid=#{mainapp_bundleid}"
 
-                    if @args_upload_flag
-                        args_temp << "--proj=#{@app_info_obj["projectName"]}"
-                        args_temp << "--upload"
+                        # 存储平台配置
+                        configs[platform] = platform_config
                     end
-                    
-                    
-                    Pindo::Command::Ios::Autobuild::run(args_temp)
 
+                    configs
                 end
 
-                def and_autobuild(unity_helper:nil, unity_exe_path:nil)
-
+                private
 
-                    @main_bundle_name = nil
-                    if @args_bundle_name
-                        @main_bundle_name = @args_bundle_name
-                    else
-                        @main_bundle_name = get_selected_dev_bundle_name()
-                    end
+                # 获取 WebGL 包序号
+                def fetch_webgl_index_no(app_info_obj:, workflow_info:)
+                    index_count = -1
 
-                    puts "Unity项目构建完成，准备处理Android项目..."
-                    args_temp = []
+                    if workflow_info && workflow_info[:package_name] && app_info_obj
+                        begin
+                            pgyer_helper = PgyerHelper.share_instace
 
-                    if @main_bundle_name
-                        args_temp << "--bundle_name=#{@main_bundle_name}"
-                    end
+                            result = pgyer_helper.instance_variable_get(:@pgyer_client).get_project_package_list(
+                                projectId: app_info_obj["id"],
+                                params: {
+                                    pageNo: 1,
+                                    pageSize: 1,
+                                    nativePackageType: 'zip',
+                                    packageName: workflow_info[:package_name]
+                                }
+                            )
 
-                    if @args_upload_flag
-                        args_temp << "--proj=#{@app_info_obj["projectName"]}"
-                        args_temp << "--upload"
+                            if result && result['data'] && !result['data'].empty?
+                                latest_package = result['data'].first
+                                index_count = latest_package['indexNo'] || 0
+                            else
+                                index_count = 0
+                            end
+                        rescue => e
+                            puts "  ⚠ 获取WebGL包序号失败: #{e.message}"
+                            index_count = -1
+                        end
                     end
 
-                    Pindo::Command::Android::Autobuild::run(args_temp)
-
+                    index_count
                 end
 
-
+                # 确定构建模式
+                def determine_build_mode(platform)
+                    case platform
+                    when 'ios'
+                        # iOS 支持 dev/adhoc/release
+                        return :release if @args_deploy_flag
+                        return :adhoc if @args_adhoc_flag
+                        return :dev
+                    when 'android'
+                        # Android 支持 dev/release
+                        return :release if @args_release_flag
+                        return :dev
+                    when 'web'
+                        # Web 目前只有 dev 模式
+                        return :dev
+                    else
+                        return :dev
+                    end
+                end
             end
         end
     end

data/lib/pindo/command/unity.rb

@@ -1,8 +1,5 @@
 
 
-require 'pindo/command/unity/ipa'
-require 'pindo/command/unity/apk'
-require 'pindo/command/unity/web'
 require 'pindo/command/unity/autobuild'
 require 'pindo/command/unity/packinit'
 require 'pindo/command/unity/packbuild'