pindo 5.11.2 → 5.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c01ace2237a0df141f7e2194f2826d967a770b00ceff2baf2fae6b1d0af8d7e1
-  data.tar.gz: 778177150ddcdb9aea701bb48c095d63d19ef6d2affb9478ea39f845e1c060d4
+  metadata.gz: a75938a4d1faa0bfd2b4495da318e4eabda71704345a47af18fa252c0f8d78ca
+  data.tar.gz: 8cb15952591243cee1081720169bd5835626ac990cc3e91a1fac6964114e122e
 SHA512:
-  metadata.gz: 918922d789aeba7a7def7ccf5f43eb387044ceb1cf4b477ac845e3406ea5303e8764053cb39d6c0c7b5523e4bac49f3e27125accb7963b611c50965df4204157
-  data.tar.gz: 5d31433f1670b8ccee41d4c6d8cc62c9d57d4f86031b72b5d6974a725970e5629357e3d7f74554caf30e8d3dea3bbfbe72da7ec227b17948a3426f2fe33908ce
+  metadata.gz: 11e4c1ba858176b538827aa9bed454f1d1294d10a90ea6f6c0f4665e12ed02e0a32ad33145dade2adda700b8e41098b79e4775e8fca71191c67cc85d7da26552
+  data.tar.gz: f50d76e666f5d061c41e89c23791aa347299e4c157a52eb5080c37f7bd750e58bb76f0ad6c3ddace280e7c64d69223ca61b152b1c0fd56b2c6a8d78dd5aa42f5

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

@@ -4,7 +4,7 @@ require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/build/version_helper'
 require 'pindo/module/android/android_build_helper'
-require 'pindo/module/android/android_build_config_helper'
+require 'pindo/module/android/android_config_helper'
 
 module Pindo
   class Command
@@ -151,7 +151,7 @@ module Pindo
             puts "  Workflow Package Name: #{workflow_packname}"
 
             # 一次性更新 App Name、Application ID 和 URL Schemes
-            Pindo::AndroidBuildConfigHelper.update_project_with_workflow(
+            Pindo::AndroidConfigHelper.update_project_with_workflow(
               project_dir: pindo_project_dir,
               workflow_packname: workflow_packname
             )
@@ -161,7 +161,7 @@ module Pindo
 
           # ===== 从 JPS 下载并替换项目 Icon =====
           if app_info_obj && app_info_obj["projectIcon"] && !app_info_obj["projectIcon"].empty?
-            icon_replace_success = Pindo::AndroidBuildConfigHelper.download_and_replace_icon_from_url(
+            icon_replace_success = Pindo::AndroidConfigHelper.download_and_replace_icon_from_url(
               project_dir: pindo_project_dir,
               icon_url: app_info_obj["projectIcon"]
             )
@@ -180,7 +180,7 @@ module Pindo
 
           if version_info[:is_git_repo]
             # 更新Android工程版本
-            Pindo::AndroidBuildConfigHelper.update_android_project_version(
+            Pindo::AndroidConfigHelper.update_android_project_version(
               project_dir: pindo_project_dir,
               version_name: version_info[:version],
               version_code: version_info[:build_number]
@@ -211,13 +211,13 @@ module Pindo
 
               if config_repo_dir && File.exist?(config_repo_dir)
                 # 1. 拷贝 google-services.json 到 launcher 目录
-                Pindo::AndroidBuildConfigHelper.copy_google_services_from_config_repo(
+                Pindo::AndroidConfigHelper.copy_google_services_from_config_repo(
                   config_repo_dir: config_repo_dir,
                   project_dir: pindo_project_dir
                 )
 
                 # 2. 更新 Application ID 为指定的 bundle_name（覆盖工作流设置）
-                Pindo::AndroidBuildConfigHelper.update_application_id(
+                Pindo::AndroidConfigHelper.update_application_id(
                   project_dir: pindo_project_dir,
                   application_id: @main_bundle_name
                 )
@@ -231,7 +231,7 @@ module Pindo
 
           # 添加基于 Application ID 的 Scheme
           # 无论是使用 workflow 的默认 Application ID，还是通过 bundle_name 覆盖的，都需要添加对应的 Scheme
-          Pindo::AndroidBuildConfigHelper.add_application_id_based_scheme(
+          Pindo::AndroidConfigHelper.add_application_id_based_scheme(
             project_dir: pindo_project_dir
           )
 

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

@@ -107,13 +107,13 @@ module Pindo
                 puts "  Workflow Package Name: #{workflow_packname}"
 
                 # 一次性更新 App Name、Application ID 和 URL Schemes
-                Pindo::AndroidBuildConfigHelper.update_project_with_workflow(
+                Pindo::AndroidConfigHelper.update_project_with_workflow(
                   project_dir: pindo_project_dir,
                   workflow_packname: workflow_packname
                 )
 
                 # 添加基于 Application ID 的 Scheme（在 workflow 设置完成后）
-                Pindo::AndroidBuildConfigHelper.add_application_id_based_scheme(
+                Pindo::AndroidConfigHelper.add_application_id_based_scheme(
                   project_dir: pindo_project_dir
                 )
               else

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

@@ -87,13 +87,13 @@ module Pindo
                 puts "  Workflow Package Name: #{workflow_packname}"
 
                 # 一次性更新 App Name、Application ID 和 URL Schemes
-                Pindo::AndroidBuildConfigHelper.update_project_with_workflow(
+                Pindo::AndroidConfigHelper.update_project_with_workflow(
                   project_dir: pindo_project_dir,
                   workflow_packname: workflow_packname
                 )
 
                 # 添加基于 Application ID 的 Scheme（在 workflow 设置完成后）
-                Pindo::AndroidBuildConfigHelper.add_application_id_based_scheme(
+                Pindo::AndroidConfigHelper.add_application_id_based_scheme(
                   project_dir: pindo_project_dir
                 )
               else

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

@@ -5,6 +5,11 @@ require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/unity/unity_helper'
 require 'pindo/module/build/build_helper'
+require 'pindo/module/task/pindo_task'
+require 'pindo/module/task/task_manager'
+require 'pindo/module/task/model/build_task'
+require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/upload_task'
 
 module Pindo
     class Command
@@ -23,13 +28,15 @@ module Pindo
 
                     支持功能:
 
-                        * 多平台自动构建（iOS → Android → WebGL）
+                        * 多类型自动构建（IPA → APK → HTML）
+
+                        * 支持选择性构建指定类型
 
                         * 生成iOS IPA文件
 
                         * 生成Android APK文件
 
-                        * 生成WebGL包
+                        * 生成WebGL HTML包
 
                         * 支持上传到JPS测试平台
 
@@ -37,15 +44,19 @@ module Pindo
 
                     使用示例:
 
-                        $ pindo unity autobuild                  # 编译所有平台
+                        $ pindo unity autobuild                        # 编译所有类型（默认）
+
+                        $ pindo unity autobuild --types=ipa            # 仅编译IPA
 
-                        $ pindo unity autobuild --upload         # 编译并上传到JPS
+                        $ pindo unity autobuild --types=apk,html       # 编译APK和HTML
 
-                        $ pindo unity autobuild --send           # 编译、上传并发送通知
+                        $ pindo unity autobuild --types=ipa,apk        # 编译IPA和APK
 
-                        $ pindo unity autobuild --proj="My App"  # 指定项目名称
+                        $ pindo unity autobuild --upload               # 编译所有类型并上传到JPS
 
-                        $ pindo unity autobuild --base           # Unity lib模式
+                        $ pindo unity autobuild --proj="My App"        # 指定项目名称
+
+                        $ pindo unity autobuild --base                 # Unity lib模式
 DESC
 
                 # 命令参数
@@ -59,6 +70,7 @@ DESC
                         ['--bundleid=ID', '指定iOS打包的bundleID'],
                         ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
                         ['--proj=NAME',   '指定上传到测试平台的项目名称'],
+                        ['--types=TYPES', '指定要构建的类型，逗号分隔（如：ipa,apk,html），默认全部类型'],
                         ['--upload', '上传编译后的IPA/APK到测试平台'],
                         ['--base',   'Unity工程编译lib模式（生成库而非完整应用）'],
                     ].concat(super)
@@ -72,15 +84,46 @@ DESC
                     @args_base_flag = argv.flag?('base', false)
                     @args_bundle_id = argv.option('bundleid')
                     @args_bundle_name = argv.option('bundle_name')
+                    @args_types = argv.option('types')
 
 
                     super
                 end
-                
 
-                def run
+                # 获取要构建的类型列表
+                def get_selected_build_types
+                    # 定义类型映射关系
+                    type_mapping = {
+                        'ipa' => 'ios',
+                        'apk' => 'android',
+                        'html' => 'web'
+                    }
+
+                    available_types = ['ipa', 'apk', 'html']
+
+                    # 如果指定了 --types 参数
+                    if @args_types
+                        # 解析类型参数
+                        types = @args_types.downcase.split(',').map(&:strip)
+
+                        # 验证类型是否有效
+                        invalid_types = types - available_types
+                        unless invalid_types.empty?
+                            raise Informative, "无效的构建类型: #{invalid_types.join(', ')}。可用类型: #{available_types.join(', ')}"
+                        end
 
+                        # 转换为平台列表
+                        platforms = types.map { |type| type_mapping[type] }
+                        return platforms.empty? ? type_mapping.values : platforms
+                    end
+
+                    # 默认返回所有平台
+                    return type_mapping.values
+                end
+
+                def run
                     pindo_project_dir = Dir.pwd
+
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
@@ -105,17 +148,186 @@ DESC
                     proj_name = @args_proj_name
                     @app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
+                    # 获取要构建的类型列表
+                    selected_platforms = get_selected_build_types()
 
-                    pindo_project_dir = Dir.pwd
-                    Dir.chdir(pindo_project_dir)
-                    ios_autobuild(unity_helper:unity_helper, unity_exe_path:unity_exe_path)
-                    
-                    Dir.chdir(pindo_project_dir)
-                    and_autobuild(unity_helper:unity_helper, unity_exe_path:unity_exe_path)
-                    
-                    Dir.chdir(pindo_project_dir)
-                    web_autobuild(unity_helper:unity_helper, unity_exe_path:unity_exe_path)
+                    # 使用任务系统执行构建
+                    execute_with_task_system(selected_platforms, unity_helper, unity_exe_path)
+                end
+
+                def execute_with_task_system(selected_platforms, unity_helper, unity_exe_path)
+                    # 初始化任务管理器
+                    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)
+                    end
+
+                    # 2. 创建构建任务
+                    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)
+                    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]  # 依赖构建任务
+                            )
+
+                            # 设置构建完成后传递输出路径
+                            build_tasks[platform].on(:on_success) do |task|
+                                if task.result && task.result[:output]
+                                    upload_task.context[:output_path] = task.result[:output]
+                                end
+                            end
+
+                            upload_tasks[platform] = upload_task
+                            task_manager.add_task(upload_task)
+                        end
+                    end
+
+                    # 执行任务
+                    task_manager.start
+
+                    # 显示执行报告
+                    show_execution_report(task_manager.execution_report)
+                end
+
+                def prepare_build_config(platform)
+                    config = {}
+
+                    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
+                    end
+
+                    config
+                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
+
+                        if task[:status] == :failed && task[:error]
+                            puts "    错误: #{task[:error]}".red if defined?(String.red)
+                        end
+                    end
 
+                    puts "========================================".cyan
                 end
 
                 def web_autobuild(unity_helper:nil, unity_exe_path:nil)

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

@@ -169,9 +169,19 @@ module Pindo
           config_json = jps_client.config_json
           config_json['upload_config']['bucket_name'] = 'nuget-resource'
 
+          # 开始上传主文件，记录开始时间
+          file_size_mb = File.size(nupkg_file) / (1024.0 * 1024.0)
+          puts "\n开始上传文件 (#{file_size_mb.round(2)} MB)..."
+          upload_start_time = Time.now
+
           upload_client = JPSClient::UploadClient.new(jps_client)
           file_url = upload_client.upload_file(binary_file: nupkg_file)
 
+          # 计算上传耗时
+          upload_duration = Time.now - upload_start_time
+          upload_speed = file_size_mb / upload_duration
+          puts "✅ 文件上传完成! 耗时: #{upload_duration.round(2)} 秒, 平均速度: #{upload_speed.round(2)} MB/s"
+
           if file_url.nil?
             raise Informative, "文件上传失败"
           end

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

@@ -274,18 +274,8 @@ module Pindo
           # 确保目标目录存在
           FileUtils.mkdir_p(dst_dir)
 
-          # 拷贝目录内容（不包括目录本身）
-          Dir.glob(File.join(src_dir, "*")).each do |src_item|
-            dst_item = File.join(dst_dir, File.basename(src_item))
-
-            if File.directory?(src_item)
-              # 递归拷贝子目录
-              FileUtils.cp_r(src_item, dst_item, remove_destination: true)
-            else
-              # 拷贝文件
-              FileUtils.cp(src_item, dst_item)
-            end
-          end
+          # 递归拷贝函数，合并内容而不是替换整个目录
+          copy_merge_recursive(src_dir, dst_dir)
         else
           puts "  ⚠ 跳过: #{dir} (目录不存在)"
         end
@@ -294,6 +284,26 @@ module Pindo
       puts "Unity 编译产物拷贝完成\n"
     end
 
+    # 递归合并拷贝：将源目录的内容合并到目标目录
+    def copy_merge_recursive(src_dir, dst_dir)
+      # 获取源目录中的所有文件和子目录
+      Dir.glob(File.join(src_dir, "{*,.*}")).each do |src_item|
+        # 跳过 . 和 ..
+        next if File.basename(src_item) == '.' || File.basename(src_item) == '..'
+
+        dst_item = File.join(dst_dir, File.basename(src_item))
+
+        if File.directory?(src_item)
+          # 如果是目录，确保目标子目录存在，然后递归拷贝
+          FileUtils.mkdir_p(dst_item)
+          copy_merge_recursive(src_item, dst_item)
+        else
+          # 如果是文件，直接覆盖（Unity 编译的文件应该覆盖旧的）
+          FileUtils.cp(src_item, dst_item)
+        end
+      end
+    end
+
 
   end
 end

data/lib/pindo/module/android/{android_build_config_helper.rb → android_config_helper.rb}

@@ -7,7 +7,7 @@ require_relative 'android_res_helper'
 
 module Pindo
 
-    class AndroidBuildConfigHelper
+    class AndroidConfigHelper
 
         # 使用工作流配置一次性更新App Name、Application ID和URL Schemes
         # 优化版本：提高性能，减少代码重复
@@ -933,10 +933,26 @@ module Pindo
 
                 # 下载 icon
                 Funlog.instance.fancyinfo_start("正在从 JPS 下载项目 Icon...")
-                URI.open(icon_url) do |file|
-                    File.binwrite(icon_download_path, file.read)
+
+                begin
+                    require 'open-uri'
+                    require 'openssl'
+
+                    options = {
+                        :read_timeout => 30,
+                        :open_timeout => 10,
+                        :redirect => true,
+                        :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE
+                    }
+
+                    URI.open(icon_url, options) do |file|
+                        File.binwrite(icon_download_path, file.read)
+                    end
+
+                    Funlog.instance.fancyinfo_success("Icon 下载成功!")
+                rescue => download_error
+                    raise Informative, "Icon 下载失败: #{download_error.message}"
                 end
-                Funlog.instance.fancyinfo_success("Icon 下载成功!")
 
                 # 验证文件已下载
                 unless File.exist?(icon_download_path)