pindo 5.11.4 → 5.12.1

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

@@ -10,26 +10,36 @@ module Pindo
                 self.summary = '获取Assets.xcassets中所有图片，并检查是否有缺失图片'
   
                 self.description = <<-DESC
-获取Assets.xcassets中所有图片资源，并检查是否有缺失图片的工具。
-
-支持功能：
-- 扫描当前目录下Assets.xcassets文件
-- 检查所有图片资源的完整性
-- 识别缺失的@2x、@3x等分辨率图片
-- 检查AppIcon和LaunchImage的完整性
-- 生成详细的检查报告
-- 列出所有图片资源的使用情况
-
-使用示例：
-  # 检查当前工程的图片资源
-  pindo utils xcassets
-
-输出内容：
-- 所有图片资源列表
-- 缺失的图片文件提示
-- 图片资源使用统计
-- 建议的优化方案
-DESC
+                    获取Assets.xcassets中所有图片资源,并检查是否有缺失图片的工具。
+
+                    支持功能:
+
+                        * 扫描当前目录下Assets.xcassets文件
+
+                        * 检查所有图片资源的完整性
+
+                        * 识别缺失的@2x、@3x等分辨率图片
+
+                        * 检查AppIcon和LaunchImage的完整性
+
+                        * 生成详细的检查报告
+
+                        * 列出所有图片资源的使用情况
+
+                    使用示例:
+
+                        $ pindo utils xcassets                    # 检查当前工程的图片资源
+
+                    输出内容:
+
+                        * 所有图片资源列表
+
+                        * 缺失的图片文件提示
+
+                        * 图片资源使用统计
+
+                        * 建议的优化方案
+                DESC
         
 
                 self.arguments = [

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

@@ -1,10 +1,15 @@
 require 'highline/import'
 require 'xcodeproj'
-require 'find'  
+require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/unity/unity_helper'
 require 'pindo/module/build/build_helper'
+require 'pindo/module/task/task_manager'
+require 'pindo/module/task/model/git_tag_task'
+require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/build_task'
+require 'pindo/module/task/model/upload_task'
 
 module Pindo
     class Command
@@ -93,146 +98,161 @@ module Pindo
                     # 加载 JPS 配置（如果存在）
                     context = Pindo::PindoContext.instance
                     context.load_and_apply_jps_config(pindo_project_dir)
-
                     # 确认并应用缓存（如果有）
                     context.confirm_and_apply_cache
 
-                    build_helper = Pindo::BuildHelper.share_instance
-                    project_type = build_helper.project_type(pindo_project_dir)
-
-                    args_temp = []
-                    args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
-                    args_temp << "--upload" if @args_upload_flag
-                    args_temp << "--send" if @args_send_flag
-                    case project_type
-                    when :ios
-                        puts "iOS 工程， 请使用 pindo ios autobuild"
-                    when :android
-                        puts "Android 工程， 请使用 pindo and build"
-
-                    when :unity
-                        web_autobuild
-                    else
-                        raise Informative, "当前目录不是工程目录，不能编译"
-                    end
-                end
+                    # 准备配置
+                    config = prepare_web_config(pindo_project_dir)
 
-                def web_autobuild
-                    pindo_project_dir = Dir.pwd
-                    build_helper = Pindo::BuildHelper.share_instance
-                    
-                    if @args_upload_flag
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
-                        if is_need_add_tag
-                            Pindo::Command::Utils::Tag::run(tag_action_parms)
-                        end
-                    end
+                    # 创建并执行任务
+                    tasks = make_build_task(config)
 
-                    unity_helper = Pindo::Client::UnityHelper.share_instance
-                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
-                    puts
-                    puts "工程的Unity版本: #{project_unity_version}"
-                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
-                    puts "选择的Unity路径: #{unity_exe_path}"
-                    puts
-
-                    app_info_obj = nil
-                    workflow_info = nil
-                    proj_name = @args_proj_name
-                    # 传入 package_type 获取 workflow_info
-                    app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
-                      working_directory: Dir.pwd,
-                      proj_name: proj_name,
-                      package_type: 'zip'
-                    )
+                    # 添加到任务管理器并执行
+                    task_manager = Pindo::TaskSystem::TaskManager.instance
+                    task_manager.clear_all
+                    tasks.each { |task| task_manager.add_task(task) }
+                    task_manager.start
 
-                    web_export_dir = File.join(pindo_project_dir, "GoodPlatform/WebGL")
-
-                    # 获取 zipCount 用于传递给 Unity 构建
-                    # 根据 workflow_info 的 package_name 从 JPS API 获取 WebGL 包的 indexNo
-                    zip_count = -1
-                    if workflow_info && workflow_info[:package_name]
-                      begin
-                        jps_client = JPSClient::Client.share_client
-                        project_id = jps_client.get_project_id
-
-                        # 根据 workflow_info 的 package_name 获取 WebGL 包列表
-                        result = jps_client.project_package.get_project_package_list(
-                          projectId: project_id,
-                          params: {
-                            pageNo: 1,
-                            pageSize: 1,
-                            nativePackageType: 'zip',
-                            packageName: workflow_info[:package_name]
-                          }
-                        )
-
-                        # 从返回结果中获取 indexNo
-                        if result && result['data'] && !result['data'].empty?
-                          latest_package = result['data'].first
-                          zip_count = latest_package['indexNo'] || 0
-                          puts "  ✓ 获取到WebGL包序号: #{zip_count}"
-                        else
-                          puts "  ⚠ 未找到WebGL包，使用初始序号: 0"
-                          zip_count = 0
-                        end
-                      rescue => e
-                        puts "  ⚠ 获取WebGL包序号失败: #{e.message}，使用默认值: -1"
-                        zip_count = -1
-                      end
-                    end
+                    system "open #{pindo_project_dir}"
+
+                    # 可选运行 WebGL
+                    Pindo::Command::Web::Run.run([]) if @args_run_flag
+                end
+
+                private
+
+                # 准备 Web 配置
+                def prepare_web_config(pindo_project_dir)
+                  # 获取 JPS 配置
+                  app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
+                    working_directory: pindo_project_dir,
+                    proj_name: @args_proj_name,
+                    package_type: 'zip'
+                  )
+
+                  # 获取 WebGL 包序号
+                  index_count = fetch_webgl_index_no(app_info_obj, workflow_info)
+
+                  {
+                    project_path: pindo_project_dir,
+                    app_info_obj: app_info_obj,
+                    workflow_info: workflow_info,
+                    index_count: index_count
+                  }
+                end
+
+                # 获取 WebGL 包序号
+                def fetch_webgl_index_no(app_info_obj, workflow_info)
+                  index_count = -1
 
+                  if workflow_info && workflow_info[:package_name] && app_info_obj
                     begin
-                        unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL', indexNo:zip_count)
+                      pgyer_helper = PgyerHelper.share_instace
+
+                      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 result && result['data'] && !result['data'].empty?
+                        latest_package = result['data'].first
+                        index_count = latest_package['indexNo'] || 0
+                      else
+                        index_count = 0
+                      end
                     rescue => e
-                        Funlog.instance.fancyinfo_error("调用GoodUnityBuild导出工程失败！")
-                        Funlog.instance.fancyinfo_error("错误信息: #{e.message}")
-                        raise e
+                      puts "  ⚠ 获取WebGL包序号失败: #{e.message}"
+                      index_count = -1
                     end
-                    
-                    build_path = File.join(web_export_dir, "build", "index.{html}")
-                    html_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-                    # 调试输出已移除，保持界面简洁
-                    # puts "html_file_upload: #{html_file_upload}"
-                    # puts "app_info_obj: #{app_info_obj}"
-
-                    if !html_file_upload.nil? && !app_info_obj.nil? && @args_upload_flag
-                        description = nil
-                        result_data = PgyerHelper.share_instace.start_upload(
-                            app_info_obj: app_info_obj,
-                            ipa_file_upload: html_file_upload,
-                            description: description,
-                            workflow_info: workflow_info
-                        )
-                        if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
-                            PgyerHelper.share_instace.print_app_version_info(
-                                app_info_obj: app_info_obj,
-                                app_version_info_obj: result_data["data"]
-                            )
-                            if @args_send_flag
-                                # 始终发送给自己
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    receiveType: "self"
-                                )
-
-                                # 额外发送到测试群
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    chatEnv: "DevTest",
-                                    receiveType: "chat"
-                                )
-                            end
-                        end
+                  end
+
+                  index_count
+                end
+
+                # 创建构建任务
+                def make_build_task(config)
+                  # 检测项目类型
+                  build_helper = Pindo::BuildHelper.share_instance
+                  project_type = build_helper.project_type(config[:project_path])
+
+                  case project_type
+                  when :ios
+                    raise Informative, "iOS 工程， 请使用 pindo ios autobuild"
+                  when :android
+                    raise Informative, "Android 工程， 请使用 pindo android autobuild"
+                  when :unity
+                    # Web 只支持 Unity 工程
+                    tasks = []
+
+                    # 1. Git 标签任务（如果需要上传）
+                    if @args_upload_flag
+                      git_tag_task = Pindo::TaskSystem::GitTagTask.new(
+                        config[:project_path]
+                      )
+                      tasks << git_tag_task
                     end
-                    
-                    system "open #{pindo_project_dir}"
 
-                    if @args_run_flag
-                        Pindo::Command::Web::Run.run([])
+                    # 2. Unity 导出任务
+                    # Web 平台导出路径
+                    web_export_path = File.join(config[:project_path], "GoodPlatform", "WebGL")
+
+                    unity_context = {}
+                    unity_context[:project_name] = @args_proj_name if @args_proj_name
+                    unity_context[:index_count] = config[:index_count]
+
+                    unity_task = Pindo::TaskSystem::UnityExportTask.new(
+                      'web',
+                      project_path: config[:project_path],
+                      export_path: web_export_path,
+                      context: unity_context
+                    )
+                    unity_task.dependencies << tasks.first.id if tasks.any?
+                    tasks << unity_task
+
+                    # 3. 构建任务（Web 只需要检查输出）
+                    build_task = Pindo::TaskSystem::BuildTask.create_task(
+                      platform: :web,
+                      mode: :dev,
+                      options: {
+                        project_path: config[:project_path],
+                        proj_name: @args_proj_name,
+                        upload: @args_upload_flag,
+                        send: @args_send_flag,
+                        app_info_obj: config[:app_info_obj],
+                        workflow_info: config[:workflow_info]
+                      }
+                    )
+                    build_task.dependencies << unity_task.id
+                    tasks << build_task
+
+                    # 4. 上传任务（如果需要）
+                    if @args_upload_flag
+                      # WebGL 输出路径: GoodPlatform/WebGL/build
+                      webgl_build_path = File.join(config[:project_path], 'GoodPlatform', 'WebGL', 'build')
+                      upload_task = Pindo::TaskSystem::UploadTask.new(
+                        'html',
+                        webgl_build_path,
+                        nil,
+                        app_info_obj: config[:app_info_obj],
+                        workflow_info: config[:workflow_info],
+                        project_name: @args_proj_name,
+                        context: {
+                          send_to_chat: @args_send_flag
+                        },
+                        dependencies: [build_task.id]
+                      )
+                      tasks << upload_task
                     end
+
+                    tasks
+                  else
+                    raise Informative, "Web 编译只支持 Unity 工程"
+                  end
                 end
 
 

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

@@ -69,9 +69,7 @@ module Pindo
             copy_so_files(unity_dir, project_dir)
 
             # SO 库拷贝完成后，重新配置主工程的 Java Home 和 Gradle 环境
-            puts "\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
             puts "Unity SO库编译完成，切换到主工程编译环境"
-            puts "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n"
             Pindo::JavaEnvHelper.setup_java_home_from_project(project_dir, use_main: true)
             Pindo::GradleHelper.check_gradle_with_project(project_dir, configure_main: true)
 
@@ -93,10 +91,6 @@ module Pindo
 
       # 配置 Keystore 签名
       build_type = debug ? "debug" : "release"
-      puts "\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-      puts "配置 Keystore 签名 (#{build_type})"
-      puts "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n"
-
       if Pindo::KeystoreHelper.apply_keystore_config(project_dir, build_type)
         puts "✓ Keystore 签名配置成功"
       else

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

@@ -4,6 +4,7 @@ require_relative '../../base/funlog'
 require_relative 'android_project_helper'
 require_relative '../../base/executable'
 require_relative 'android_res_helper'
+require 'pindo/module/build/icon_downloader'
 
 module Pindo
 
@@ -931,32 +932,9 @@ module Pindo
                 FileUtils.mkdir_p(temp_icon_dir) unless File.exist?(temp_icon_dir)
                 icon_download_path = File.join(temp_icon_dir, "downloaded_icon.png")
 
-                # 下载 icon
-                Funlog.instance.fancyinfo_start("正在从 JPS 下载项目 Icon...")
-
-                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
-
-                # 验证文件已下载
-                unless File.exist?(icon_download_path)
-                    Funlog.instance.fancyinfo_error("Icon 下载失败: 文件未创建")
+                # 使用带重试机制的下载
+                unless IconDownloader.download_icon_with_retry(icon_url: icon_url, save_path: icon_download_path, max_retries: 3)
+                    Funlog.instance.fancyinfo_error("Icon 下载失败: 已重试3次")
                     return false
                 end