pindo 5.6.6 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a103f5b0b21922ee65ea260859524a5d28e3d51e51d261f422a49e2c05e5d28a
-  data.tar.gz: 2e369bea1dd6cce3d79090818bda9a76fa7f09be3421cd1258a9f078e7603509
+  metadata.gz: b2c0a15b51042f5ec552927e91ec27520410303e55c09b649d34cf57f5368bb8
+  data.tar.gz: 3bd8415b61c8fa8628d0369740a68ab0e83fcaf30fae3e7b399a814e83d8aab0
 SHA512:
-  metadata.gz: 50126fe316c91e26e05325badb5b85c3ec92ac5f03037bc14e694feea9d62ad31624cd42f0c85d5364e008294473db031eca50f48532b9b6a6b5dfc3c000d1c9
-  data.tar.gz: 5a91cf5933357cff53735dbf7664f2df83e01bb6eb2afae3def775ca82a06903de611201532dcb8d63ea207e64f29ecba67b38066214cb37a17fc351136d610c
+  metadata.gz: 23d4e4087e51f318f48894781856534fb462f6cb476ac9e16104fb22e759dfa9a3ec4617fb4720798eaf1c6fd9f31b8da7fa91203fe6f339b70c9818bbdf365b
+  data.tar.gz: 80cb1d494c4f3913af733560f2492a0203a96ffc5e0ff7ace90b204d0ebd2c08f95d3c645f5fbc7e866e6365addd6444554c224d5d5fc4ecbba5291b1e4174f7

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

@@ -96,12 +96,48 @@ module Pindo
         private
 
         def android_autobuild
+          # 记录构建开始时间
+          build_start_time = Time.now
 
           pindo_project_dir = Dir.pwd
-          
+
           app_info_obj = nil
+          workflow_info = nil
           proj_name = @args_proj_name
-          app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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: 'apk'
+          )
+
+          # ===== 使用 workflow 配置修改 Android 配置 =====
+          if workflow_info && workflow_info[:package_name]
+            package_name = workflow_info[:package_name]
+
+            puts "\n使用工作流配置更新 Android 配置:"
+            puts "  Package Name: #{package_name}"
+
+            # 修改 App Name
+            Pindo::AndroidBuildConfigHelper.update_app_name_with_packagename(
+              project_dir: pindo_project_dir,
+              package_name: package_name
+            )
+
+            # 修改 Application ID
+            Pindo::AndroidBuildConfigHelper.update_applicationid_with_packagename(
+              project_dir: pindo_project_dir,
+              package_name: package_name
+            )
+
+            # 添加基于 package_name 的 Scheme
+            Pindo::AndroidBuildConfigHelper.add_scheme_packagename(
+              project_dir: pindo_project_dir,
+              package_name: package_name
+            )
+          else
+            raise Informative, "未获取到工作流信息"
+          end
 
           build_helper = Pindo::BuildHelper.share_instance
           if @args_upload_flag
@@ -185,8 +221,18 @@ module Pindo
                 end
             end
 
-            # 只在构建成功完成时弹出目标文件夹
-            puts "\e[32m构建完成！正在打开目标文件夹...\e[0m"
+            # 计算并显示总耗时
+            total_time = Time.now - build_start_time
+            minutes = (total_time / 60).to_i
+            seconds = (total_time % 60).to_i
+            
+            if minutes > 0
+              puts "\e[32m构建完成！总耗时: #{minutes}分#{seconds}秒\e[0m"
+            else
+              puts "\e[32m构建完成！总耗时: #{seconds}秒\e[0m"
+            end
+            
+            puts "\e[32m正在打开目标文件夹...\e[0m"
             system "open #{pindo_project_dir}"
             
           rescue => e

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

@@ -87,9 +87,43 @@ module Pindo
           end
           
           app_info_obj = nil
+          workflow_info = nil
           if @args_upload_flag
               proj_name = @args_proj_name
-              app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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: 'apk'
+              )
+
+              # ===== 使用 workflow 配置修改 Android 配置 =====
+              if workflow_info && workflow_info[:package_name]
+                package_name = workflow_info[:package_name]
+
+                puts "\n使用工作流配置更新 Android 配置:"
+                puts "  Package Name: #{package_name}"
+
+                # 修改 App Name
+                Pindo::AndroidBuildConfigHelper.update_app_name_with_packagename(
+                  project_dir: pindo_project_dir,
+                  package_name: package_name
+                )
+
+                # 修改 Application ID
+                Pindo::AndroidBuildConfigHelper.update_applicationid_with_packagename(
+                  project_dir: pindo_project_dir,
+                  package_name: package_name
+                )
+
+                # 添加基于 package_name 的 Scheme
+                Pindo::AndroidBuildConfigHelper.add_scheme_packagename(
+                  project_dir: pindo_project_dir,
+                  package_name: package_name
+                )
+              else
+                raise Informative, "未获取到工作流信息"
+              end
           end
 
 

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

@@ -79,9 +79,43 @@ module Pindo
 
 
           app_info_obj = nil
+          workflow_info = nil
           if @upload_flag
               proj_name = @proj_name
-              app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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: 'apk'
+              )
+
+              # ===== 使用 workflow 配置修改 Android 配置 =====
+              if workflow_info && workflow_info[:package_name]
+                package_name = workflow_info[:package_name]
+
+                puts "\n使用工作流配置更新 Android 配置:"
+                puts "  Package Name: #{package_name}"
+
+                # 修改 App Name
+                Pindo::AndroidBuildConfigHelper.update_app_name_with_packagename(
+                  project_dir: pindo_project_dir,
+                  package_name: package_name
+                )
+
+                # 修改 Application ID
+                Pindo::AndroidBuildConfigHelper.update_applicationid_with_packagename(
+                  project_dir: pindo_project_dir,
+                  package_name: package_name
+                )
+
+                # 添加基于 package_name 的 Scheme
+                Pindo::AndroidBuildConfigHelper.add_scheme_packagename(
+                  project_dir: pindo_project_dir,
+                  package_name: package_name
+                )
+              else
+                raise Informative, "未获取到工作流信息"
+              end
           end
 
           begin

data/lib/pindo/command/ios/adhoc.rb

@@ -76,7 +76,43 @@ module Pindo
                 end
 
                 def run
-                    
+
+                    project_dir = Dir.pwd
+
+                    app_info_obj = nil
+                    workflow_info = nil
+                    if @args_upload_flag
+                        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: 'ipa'
+                        )
+
+                        # ===== 使用 workflow 配置修改 plist =====
+                        if workflow_info && workflow_info[:package_name]
+                          package_name = workflow_info[:package_name]
+
+                          puts "\n使用工作流配置更新 Info.plist:"
+                          puts "  Package Name: #{package_name}"
+
+                          # 修改 Display Name
+                          Pindo::XcodeBuildConfig.update_display_name_with_packagename(
+                            project_dir: project_dir,
+                            package_name: package_name
+                          )
+
+                          # 修改 Bundle ID
+                          Pindo::XcodeBuildConfig.update_bundleid_with_packagename(
+                            project_dir: project_dir,
+                            package_name: package_name
+                          )
+                        else
+                          raise Informative, "未获取到工作流信息"
+                        end
+                    end
+
                     mainapp_bundleid= nil
                     if @args_deploy_flag
                         mainapp_bundleid = get_selected_deploy_bundleid()
@@ -84,22 +120,33 @@ module Pindo
                         mainapp_bundleid = get_selected_dev_bundleid()
                     end
 
-                    app_info_obj = nil
-                    if @args_upload_flag 
-                        proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    end
-
                     args_temp = []
                     args_temp << mainapp_bundleid
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
-                    project_dir = Dir.pwd
                     Dir.chdir(project_dir)
+
                     config_json_file = File.join(project_dir,"config.json")
                     # 处理entitlements配置
                     Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: project_dir, config_file: config_json_file)
 
+                    # 添加URL Scheme（基于 package_name）
+                    if @args_upload_flag && workflow_info && workflow_info[:package_name]
+                      Pindo::XcodeBuildConfig.add_url_scheme_packagename(
+                        project_dir: project_dir,
+                        package_name: workflow_info[:package_name]
+                      )
+                    end
+
+                    # 添加URL Schemes（基于 scheme_name 和 Bundle ID）
+                    if @args_upload_flag
+                      scheme_name = @args_proj_name
+                      Pindo::XcodeBuildConfig.add_url_schemes(
+                        project_dir: project_dir,
+                        scheme_name: scheme_name
+                      )
+                    end
+
                     if File.exist?(File.join(project_dir, "Podfile"))
                         
                         args_temp = []

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

@@ -118,6 +118,8 @@ module Pindo
                 end
 
                 def ios_autobuild
+                    # 记录构建开始时间
+                    build_start_time = Time.now
 
                     pindo_project_dir = Dir.pwd
                     build_helper = Pindo::BuildHelper.share_instance
@@ -146,9 +148,36 @@ module Pindo
                     end
 
                     app_info_obj = nil
+                    workflow_info = nil
                     proj_name = @args_proj_name
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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: 'ipa'
+                    )
+
+                    # ===== 使用 workflow 配置修改 plist =====
+                    if workflow_info && workflow_info[:package_name]
+                      package_name = workflow_info[:package_name]
+
+                      puts "\n使用工作流配置更新 Info.plist:"
+                      puts "  Package Name: #{package_name}"
+
+                      # 修改 Display Name
+                      Pindo::XcodeBuildConfig.update_display_name_with_packagename(
+                        project_dir: pindo_project_dir,
+                        package_name: package_name
+                      )
+
+                      # 修改 Bundle ID
+                      Pindo::XcodeBuildConfig.update_bundleid_with_packagename(
+                        project_dir: pindo_project_dir,
+                        package_name: package_name
+                      )
+                    else
+                      raise Informative, "未获取到工作流信息"
+                    end
 
                     args_temp = []
                     args_temp << mainapp_bundleid
@@ -156,7 +185,7 @@ module Pindo
 
                     Dir.chdir(pindo_project_dir)
                     config_json_file = File.join(pindo_project_dir,"config.json")
-                    
+
                     scheme_name = @args_proj_name if @args_proj_name
                     if !app_info_obj.nil? && !app_info_obj["scheme"].nil? && !app_info_obj["scheme"].empty?
                         scheme_name = app_info_obj["scheme"]
@@ -174,8 +203,19 @@ module Pindo
                     # 处理entitlements配置
                     Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: pindo_project_dir, config_file: config_json_file)
 
-                    # 添加URL Schemes
-                    Pindo::XcodeBuildConfig.add_url_schemes(project_dir: pindo_project_dir, scheme_name: scheme_name)
+                    # 添加URL Scheme（基于 package_name）
+                    if workflow_info && workflow_info[:package_name]
+                      Pindo::XcodeBuildConfig.add_url_scheme_packagename(
+                        project_dir: pindo_project_dir,
+                        package_name: workflow_info[:package_name]
+                      )
+                    end
+
+                    # 添加URL Schemes（基于 scheme_name 和 Bundle ID）
+                    Pindo::XcodeBuildConfig.add_url_schemes(
+                      project_dir: pindo_project_dir,
+                      scheme_name: scheme_name
+                    )
 
                     if File.exist?(File.join(pindo_project_dir, "Podfile"))
                         
@@ -278,6 +318,18 @@ module Pindo
                         end
                     end
                     
+                    # 计算并显示总耗时
+                    total_time = Time.now - build_start_time
+                    minutes = (total_time / 60).to_i
+                    seconds = (total_time % 60).to_i
+                    
+                    if minutes > 0
+                      puts "\e[32m构建完成！总耗时: #{minutes}分#{seconds}秒\e[0m"
+                    else
+                      puts "\e[32m构建完成！总耗时: #{seconds}秒\e[0m"
+                    end
+                    
+                    puts "\e[32m正在打开目标文件夹...\e[0m"
                     system "open #{pindo_project_dir}"
 
                 end

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

@@ -94,7 +94,7 @@ module Pindo
                 end
 
                 def ios_build
-                    
+
                     pindo_project_dir = Dir.pwd
                     build_helper = Pindo::BuildHelper.share_instance
                     if @args_upload_flag
@@ -111,9 +111,50 @@ module Pindo
                     end
 
                     app_info_obj = nil
-                    if @args_upload_flag 
+                    workflow_info = nil
+                    if @args_upload_flag
                         proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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: 'ipa'
+                        )
+
+                        # ===== 使用 workflow 配置修改 plist =====
+                        if workflow_info && workflow_info[:package_name]
+                          package_name = workflow_info[:package_name]
+
+                          puts "\n使用工作流配置更新 Info.plist:"
+                          puts "  Package Name: #{package_name}"
+
+                          # 修改 Display Name
+                          Pindo::XcodeBuildConfig.update_display_name_with_packagename(
+                            project_dir: pindo_project_dir,
+                            package_name: package_name
+                          )
+
+                          # 修改 Bundle ID
+                          Pindo::XcodeBuildConfig.update_bundleid_with_packagename(
+                            project_dir: pindo_project_dir,
+                            package_name: package_name
+                          )
+
+                          # 添加URL Scheme（基于 package_name）
+                          Pindo::XcodeBuildConfig.add_url_scheme_packagename(
+                            project_dir: pindo_project_dir,
+                            package_name: package_name
+                          )
+
+                          # 添加URL Schemes（基于 scheme_name 和 Bundle ID）
+                          scheme_name = @args_proj_name
+                          Pindo::XcodeBuildConfig.add_url_schemes(
+                            project_dir: pindo_project_dir,
+                            scheme_name: scheme_name
+                          )
+                        else
+                          raise Informative, "未获取到工作流信息"
+                        end
                     end
 
 

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

@@ -101,8 +101,14 @@ DESC
                     puts
 
                     app_info_obj = nil
+                    workflow_info = nil
                     proj_name = @args_proj_name
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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: 'apk'
+                    )
 
                     isLibrary = @args_base_flag
 

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

@@ -121,8 +121,14 @@ DESC
                     puts
 
                     app_info_obj = nil
+                    workflow_info = nil
                     proj_name = @args_proj_name
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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: 'ipa'
+                    )
 
                     mainapp_bundleid= nil
                     if @args_bundle_id
@@ -151,12 +157,12 @@ DESC
                     ipa_count = app_info_obj&.dig("ipaCount") || -1
 
                     unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary, indexNo:ipa_count)
-                    
-                    
+
+
                     args_temp = []
                     args_temp << "--bundleid=#{mainapp_bundleid}"
 
-                    if @args_upload_flag 
+                    if @args_upload_flag
                         args_temp << "--proj=#{app_info_obj["projectName"]}"
                         args_temp << "--upload"
                     end

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

@@ -220,7 +220,7 @@ module Pindo
             raise Informative, "JPS 中没有任何项目，请联系管理员创建"
           end
 
-          nuget_project = projects.find { |p| p['projectName']&.downcase == 'nuget' }
+          nuget_project = projects.find { |p| p['projectName']&.downcase == 'nuget' || p['projectName']&.downcase == 'nuget 库' }
 
           if nuget_project.nil?
             puts

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

@@ -112,15 +112,15 @@ DESC
                     puts
 
                     app_info_obj = nil
+                    workflow_info = nil
                     proj_name = @args_proj_name
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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'
+                    )
 
-                    mainapp_bundleid= nil
-                    if @args_deploy_flag
-                        mainapp_bundleid = get_selected_deploy_bundleid()
-                    else
-                        mainapp_bundleid = get_selected_dev_bundleid()
-                    end
 
                     isLibrary = @args_base_flag
 
@@ -140,21 +140,7 @@ DESC
                     unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary, indexNo:ipa_count)
                     
                     
-                    args_temp = []
-                    args_temp << "--bundleid=#{mainapp_bundleid}"
-
-                    if @args_upload_flag 
-                        args_temp << "--proj=#{app_info_obj["projectName"]}"
-                        args_temp << "--upload"
-                    end
-                    if @args_send_flag
-                        args_temp << "--send"
-                    end
-                    
-                    Dir.chdir(pindo_ios_project_dir)
                     
-                    Pindo::Command::Ios::Autobuild::run(args_temp)
-
 
                 end
 

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

@@ -137,13 +137,50 @@ module Pindo
                     puts
 
                     app_info_obj = nil
+                    workflow_info = nil
                     proj_name = @args_proj_name
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name: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'
+                    )
 
                     web_export_dir = File.join(pindo_project_dir, "GoodPlatform/WebGL")
 
                     # 获取 zipCount 用于传递给 Unity 构建
-                    zip_count = app_info_obj&.dig("zipCount") || -1
+                    # 根据 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
 
                     unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL', indexNo:zip_count)