pindo 5.10.4 → 5.10.8

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

@@ -3,9 +3,9 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/buildhelper'
-require 'pindo/module/build/versionhelper'
-require 'pindo/module/xcode/xcodebuildconfig'
+require 'pindo/module/build/build_helper'
+require 'pindo/module/build/version_helper'
+require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/base/pindocontext'
 
 module Pindo
@@ -15,7 +15,7 @@ module Pindo
 
                 include Appselect
                 include Pindo::Githelper
-                # 命令的简要说明 - 打包iOS工程并发布到蒲公英
+                # 命令的简要说明 - 打包iOS工程并发布到JPS
                 self.summary = '打包iOS工程并发布到测试平台'
 
                 # 启用缓存机制
@@ -91,10 +91,22 @@ module Pindo
                     # 加载 JPS 配置（如果存在）
                     context = Pindo::PindoContext.instance
                     context.load_and_apply_jps_config(pindo_project_dir)
-
                     # 确认并应用缓存（如果有）
                     context.confirm_and_apply_cache
 
+
+                    @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()
+                        end
+                    end
+
+
                     build_helper = Pindo::BuildHelper.share_instance
                     project_type = build_helper.project_type(pindo_project_dir)
 
@@ -102,7 +114,7 @@ module Pindo
                     args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
                     args_temp << "--upload" if @args_upload_flag
                     args_temp << "--send" if @args_send_flag
-                    args_temp << "--bundleid=#{@args_bundle_id}" if @args_bundle_id
+                    args_temp << "--bundleid=#{@mainapp_bundleid}" if @mainapp_bundleid
                     case project_type
                     when :ios
                         ios_autobuild
@@ -133,19 +145,7 @@ module Pindo
                     if !new_project_fullname.nil? && File.exist?(new_project_fullname)
                         build_helper.delete_libtarget_firebase_shell(pindo_project_dir)
                     end
-                    
-                    
-                    mainapp_bundleid= nil
-                    puts "args_bundle_id: #{@args_bundle_id}"
-                    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()
-                        end
-                    end
+                                    
 
                     app_info_obj = nil
                     workflow_info = nil
@@ -159,16 +159,16 @@ module Pindo
 
                     # ===== 使用 workflow 配置更新项目 =====
                     if workflow_info && workflow_info[:package_name]
-                      package_name = workflow_info[:package_name]
+                      workflow_packname = workflow_info[:package_name]
                       project_id = app_info_obj ? app_info_obj["id"] : nil
 
                       puts "\n使用工作流配置更新 iOS 项目:"
-                      puts "  Package Name: #{package_name}"
+                      puts "  Workflow Package Name: #{workflow_packname}"
 
                       # 一次性更新 Display Name、Bundle ID、URL Schemes 和 JPS 快捷操作
-                      Pindo::XcodeBuildConfig.update_project_with_packagename(
+                      Pindo::XcodeBuildConfig.update_project_with_workflow(
                         project_dir: pindo_project_dir,
-                        package_name: package_name,
+                        workflow_packname: workflow_packname,
                         project_id: project_id
                       )
                     else
@@ -206,7 +206,7 @@ module Pindo
                     end
 
                     args_temp = []
-                    args_temp << mainapp_bundleid
+                    args_temp << @mainapp_bundleid
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
                     Dir.chdir(pindo_project_dir)
@@ -272,7 +272,7 @@ module Pindo
                     # 因为 Cert::run 可能会修改 PRODUCT_BUNDLE_IDENTIFIER
                     Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
                         project_dir: pindo_project_dir,
-                        package_name: package_name
+                        package_name: workflow_packname
                     )
 
                     Dir.chdir(pindo_project_dir)

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

@@ -3,7 +3,8 @@ require 'fileutils'
 require 'json'
 require 'xcodeproj'
 require 'gym'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/build/build_helper'
+require 'pindo/module/xcode/xcode_build_config'
 
 module Pindo
     class Command
@@ -123,23 +124,23 @@ module Pindo
 
                         # ===== 使用 workflow 配置更新项目 =====
                         if workflow_info && workflow_info[:package_name]
-                          package_name = workflow_info[:package_name]
+                          workflow_packname = workflow_info[:package_name]
                           project_id = app_info_obj ? app_info_obj["id"] : nil
 
                           puts "\n使用工作流配置更新 iOS 项目:"
-                          puts "  Package Name: #{package_name}"
+                          puts "  Workflow Package Name: #{workflow_packname}"
 
                           # 一次性更新 Display Name、Bundle ID、URL Schemes 和 JPS 快捷操作
-                          Pindo::XcodeBuildConfig.update_project_with_packagename(
+                          Pindo::XcodeBuildConfig.update_project_with_workflow(
                             project_dir: pindo_project_dir,
-                            package_name: package_name,
+                            workflow_packname: workflow_packname,
                             project_id: project_id
                           )
 
                           # 根据实际的 Bundle ID 更新 URL Schemes
                           Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
                             project_dir: pindo_project_dir,
-                            package_name: package_name
+                            package_name: workflow_packname
                           )
                         else
                           raise Informative, "未获取到工作流信息"

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

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'pindo/module/xcode/xcode_build_config'
 
 module Pindo
   class Command
@@ -42,7 +43,7 @@ module Pindo
                 ['--deploy', '默认使用开发环境的bundle id,使用此选项切换为发布环境的bundle id'],
                 ['--adhoc', '默认使用开发证书,使用此选项切换为adhoc证书'],
                 ['--macos', '指定为macOS平台的证书'],
-                ['--upload', '生成用于上传到蒲公英平台的证书'],
+                ['--upload', '生成用于上传到JPS平台的证书'],
               ].concat(super)
             end
 

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

@@ -41,8 +41,8 @@ module Pindo
                     [
                         ['--ipa', 'iap file name.'],
                         ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
-                        ['--upload', '编译完成后是否上传ipa到pyger: --upload'],
-                        ['--send', '上传到pgyer之后是否发送测试信息: --send'],
+                        ['--upload', '编译完成后是否上传ipa到JPS: --upload'],
+                        ['--send', '上传到JPS之后是否发送测试信息: --send'],
                         ['--ipa', '强制指定重签名的ipa包，用法: --ipa=path/to/demo.ipa'],
                         ['--dev', '使用dev证书，默认使用adhoc证书: --dev'],
                         ['--test', '使用测试的bundle id, 默认是用发布bundle id,用法：--test'],

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

@@ -5,7 +5,7 @@ require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/xcode/xcodeappconfig'
-require 'pindo/module/xcode/xcodebuildhelper'
+require 'pindo/module/xcode/xcode_build_helper'
 
 module Pindo
     class Command
@@ -14,7 +14,6 @@ module Pindo
 
                 include Command::DeployOptions
                 include Pindo::XcodeAppConfig
-                include XcodeBuildHelper
                 include Appselect
 
                 self.summary = '提交时设置Xcode工程编译参数'
@@ -50,7 +49,7 @@ module Pindo
                         ['--build', '修改完工程之后直接编译，用法：pindo ipa import --build'],
                         ['--increase', '自动增加编译的app版本号，用法:pindo ipa import --increase'],
                         ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
-                        ['--upload', '编译完成后是否上传ipa到pyger: 用法:pindo ipa import --upload'],
+                        ['--upload', '编译完成后是否上传ipa到JPS: 用法:pindo ipa import --upload'],
                         ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa import --send'],
                         ['--resign',  '上传到之后是否发送测试信息,用法:pindo ipa import --resign'],
 
@@ -176,7 +175,7 @@ module Pindo
 
                     if File.exist?(File.join(pindo_new_project_dir, "Podfile"))
 
-                        pull_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir)
+                        Pindo::XcodeBuildHelper.pull_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir)
                         Pindo::Command::Lib::Update::run([])
                         begin
                             remove_test_pod_modue(project_dir:pindo_new_project_dir)

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

@@ -3,7 +3,7 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/xcode/xcodebuildhelper'
+require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/module/xcode/xcodeappconfig'
 
 module Pindo
@@ -13,7 +13,6 @@ module Pindo
 
                 include Command::DeployOptions
                 
-                include XcodeBuildHelper
                 include XcodeAppConfig
                 include Appselect
                 
@@ -51,7 +50,7 @@ module Pindo
                 def self.options
                     [
                         ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
-                        ['--upload', '编译完成后是否上传ipa到pyger: 用法:pindo ipa output --upload'],
+                        ['--upload', '编译完成后是否上传ipa到JPS: 用法:pindo ipa output --upload'],
                         ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa output --send'],
                         ['--increase', '自动增加编译的app版本号，用法:pindo ipa output --increase'],
 
@@ -212,7 +211,7 @@ module Pindo
                             raise Informative, "pod install失败！！先pod install 完成后成编译 !"
                         end
 
-                        backup_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir, appversion:@config_json["app_info"]["app_build_version"])
+                        Pindo::XcodeBuildHelper.backup_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir, appversion:@config_json["app_info"]["app_build_version"])
 
                     end
 

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

@@ -3,7 +3,7 @@ require 'fileutils'
 require 'json'
 require 'faraday'
 require 'pindo/module/pgyer/pgyerhelper'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/build/build_helper'
 
 module Pindo
     class Command
@@ -122,7 +122,8 @@ module Pindo
                             build_path = File.join(current_project_dir, "build", "*.{ipa,app}")
                             @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
                         when :android
-                            build_path = File.join(current_project_dir, "build", "*.{apk}")
+                            # 搜索 build 目录下的所有 apk 文件（包括子目录）
+                            build_path = File.join(current_project_dir, "build", "**", "*.{apk}")
                             @args_ipa_file = Dir.glob(build_path).max_by {|f| File.mtime(f)}
                         when :unity
                             # Unity 工程支持三种平台的包：iOS、Android 和 WebGL
@@ -139,14 +140,14 @@ module Pindo
                                 all_packages.concat(Dir.glob(ios_build_path))
                             end
 
-                            # 检测 Android 包（收集所有 Android 包）
+                            # 检测 Android 包（收集所有 Android 包，包括子目录）
                             if File.exist?(File.join(current_project_dir, "GoodPlatform/BaseAndroid/build"))
-                                android_build_path = File.join(current_project_dir, "GoodPlatform/BaseAndroid/build", "*.{apk,aab}")
+                                android_build_path = File.join(current_project_dir, "GoodPlatform/BaseAndroid/build", "**", "*.{apk,aab}")
                                 all_packages.concat(Dir.glob(android_build_path))
                             end
 
                             if File.exist?(File.join(current_project_dir, "GoodPlatform/Android/build"))
-                                android_build_path = File.join(current_project_dir, "GoodPlatform/Android/build", "*.{apk,aab}")
+                                android_build_path = File.join(current_project_dir, "GoodPlatform/Android/build", "**", "*.{apk,aab}")
                                 all_packages.concat(Dir.glob(android_build_path))
                             end
 

data/lib/pindo/command/repo/login.rb

@@ -36,7 +36,7 @@ module Pindo
 
                 def self.options
                   [
-                    ['--force', '强制重新登录pgyer'],
+                    ['--force', '强制重新登录JPS'],
                   ].concat(super)
                 end
 

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

@@ -3,13 +3,14 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/unityhelper'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/unity/unity_helper'
+require 'pindo/module/build/build_helper'
 
 module Pindo
     class Command
         class Unity < Command
             class Apk < Unity
+                include Appselect
 
                 # 命令的简要说明 - 编译Unity工程生成Android APK
                 self.summary = '编译Unity工程生成Android APK并支持上传到测试平台'
@@ -52,6 +53,7 @@ DESC
                 def self.options
                     [
                         ['--proj=NAME',   '指定上传到测试平台的项目名称'],
+                        ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
                         ['--upload',      '编译后上传到测试平台（自动发送给自己）'],
                         ['--send',        '发送通知到测试群组（同时发送给自己）']
                     ].concat(super)
@@ -60,6 +62,7 @@ DESC
                 def initialize(argv)
 
                     @args_proj_name = argv.option('proj')
+                    @args_bundle_name = argv.option('bundle_name')
                     @args_upload_flag = argv.flag?('upload', false)
                     @args_send_flag = argv.flag?('send', false)
 
@@ -80,6 +83,14 @@ DESC
                     # 确认并应用缓存（如果有）
                     context.confirm_and_apply_cache
 
+                    @main_bundle_name = nil
+                    if @args_bundle_name
+                        @main_bundle_name = @args_bundle_name
+                    else
+                        @main_bundle_name = get_selected_dev_bundle_name()
+                    end
+
+
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
@@ -136,8 +147,14 @@ DESC
                     )
 
                     puts "Unity项目构建完成，准备处理Android项目..."
+
                     args_temp = []
 
+                    # 传递 bundle_name 参数
+                    if @main_bundle_name
+                        args_temp << "--bundle_name=#{@main_bundle_name}"
+                    end
+
                     if @args_upload_flag
                         args_temp << "--proj=#{app_info_obj["projectName"]}"
                         args_temp << "--upload"

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

@@ -3,8 +3,8 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/unityhelper'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/unity/unity_helper'
+require 'pindo/module/build/build_helper'
 
 module Pindo
     class Command
@@ -14,16 +14,26 @@ module Pindo
                 include Appselect
                 
                 include Pindo::Githelper
-                # Unity IPA包编译和上传命令
-                self.summary = '编译Unity工程生成iOS IPA并支持上传到测试平台'
+                # Unity 多平台编译和上传命令
+                self.summary = '编译Unity工程生成iOS/Android/WebGL并支持上传到测试平台'
 
                 # 详细说明
                 self.description = <<-DESC
-编译Unity工程生成iOS IPA并支持上传到测试平台。
+编译Unity工程并生成iOS IPA、Android APK和WebGL包，支持上传到测试平台。
+
+编译顺序: iOS → Android → WebGL
+
+支持平台:
+
+    * iOS - 生成IPA文件
+
+    * Android - 生成APK文件
+
+    * WebGL - 生成Web包
 
 支持功能:
 
-    * 编译生成IPA
+    * 多平台自动构建
 
     * 上传到测试平台
 
@@ -31,11 +41,17 @@ module Pindo
 
 使用示例:
 
-    $ pindo unity autobuild                    # 编译
+    $ pindo unity autobuild                    # 编译所有平台 (iOS → Android → WebGL)
 
     $ pindo unity autobuild --upload           # 编译并上传
 
     $ pindo unity autobuild --proj=myapp       # 指定项目名称
+
+    $ pindo unity autobuild --base             # Unity lib模式
+
+    $ pindo unity autobuild --bundle_name=com.example.app  # 指定Android包名
+
+    $ pindo unity autobuild --bundleid=com.test.ios --bundle_name=com.test.android  # 同时指定iOS和Android包名
 DESC
 
                 # 命令参数
@@ -46,10 +62,11 @@ DESC
                 # 命令选项
                 def self.options
                     [
-                        ['--bundleid', '指定打包的bundleID'],
-                        ['--proj',   '指定上传到测试平台的项目名称'],
-                        ['--upload', '上传编译后的IPA到测试平台'],
-                        ['--base',   'Unity工程编译lib模式'],
+                        ['--bundleid=ID', '指定iOS打包的bundleID'],
+                        ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
+                        ['--proj=NAME',   '指定上传到测试平台的项目名称'],
+                        ['--upload', '上传编译后的IPA/APK到测试平台'],
+                        ['--base',   'Unity工程编译lib模式（生成库而非完整应用）'],
                     ].concat(super)
                 end
 
@@ -60,7 +77,8 @@ DESC
                     @args_upload_flag = argv.flag?('upload', false)
                     @args_base_flag = argv.flag?('base', false)
                     @args_bundle_id = argv.option('bundleid')
-                
+                    @args_bundle_name = argv.option('bundle_name')
+
 
                     super
                 end
@@ -69,7 +87,6 @@ DESC
                 def run
 
                     pindo_project_dir = Dir.pwd
-
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
@@ -92,34 +109,38 @@ DESC
                     puts
 
                     proj_name = @args_proj_name
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    pindo_project_dir = Dir.pwd
+                    @app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
+
+                    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)
-                    Dir.chdir(pindo_project_dir)
 
                 end
 
                 def web_autobuild(unity_helper:nil, unity_exe_path:nil)
-                    pindo_project_dir = Dir.pwd
 
-                    web_export_dir = File.join(pindo_project_dir, "GoodPlatform/WebGL")
-
-                    # 获取 zipCount 用于传递给 Unity 构建
-                    zip_count = app_info_obj&.dig("zipCount") || -1
+                    args_temp = []
 
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL', indexNo:zip_count)
+                    if @main_bundle_name
+                        args_temp << "--bundle_name=#{@main_bundle_name}"
+                    end
 
-                    system "open #{pindo_project_dir}"
+                    if @args_upload_flag
+                        args_temp << "--proj=#{@app_info_obj["projectName"]}"
+                        args_temp << "--upload"
+                    end
 
+                    Pindo::Command::Android::Autobuild::run(args_temp)
 
                 end
+                
 
                 def ios_autobuild(unity_helper:nil, unity_exe_path:nil)
 
@@ -134,31 +155,15 @@ DESC
                             mainapp_bundleid = get_selected_dev_bundleid()
                         end
                     end
-                    isLibrary = @args_base_flag
-                    ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
-                    if File.directory?(ios_export_lib_dir)
-                        isLibrary = true
-                    end
-                    pindo_ios_project_dir = File.join(pindo_project_dir, "GoodPlatform/iOS")
-                    if isLibrary
-                        pindo_ios_project_dir = ios_export_lib_dir
-                    end
-
-                    # 获取 ipaCount 用于传递给 Unity 构建
-                    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 
-                        args_temp << "--proj=#{app_info_obj["projectName"]}"
+                    if @args_upload_flag
+                        args_temp << "--proj=#{@app_info_obj["projectName"]}"
                         args_temp << "--upload"
                     end
                     
-                    Dir.chdir(pindo_ios_project_dir)
                     
                     Pindo::Command::Ios::Autobuild::run(args_temp)
 
@@ -166,36 +171,26 @@ DESC
 
                 def and_autobuild(unity_helper:nil, unity_exe_path:nil)
 
-                    pindo_project_dir = Dir.pwd
-                    isLibrary = @args_base_flag
-
-                    android_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseAndroid")
-                    if File.directory?(android_export_lib_dir)
-                        isLibrary = true
-                    end
 
-                    pindo_android_project_dir = File.join(pindo_project_dir, "GoodPlatform/Android")
-                    if isLibrary
-                        pindo_android_project_dir = android_export_lib_dir
+                    @main_bundle_name = nil
+                    if @args_bundle_name
+                        @main_bundle_name = @args_bundle_name
+                    else
+                        @main_bundle_name = get_selected_dev_bundle_name()
                     end
 
-                    # 获取 apkCount 用于传递给 Unity 构建
-                    apk_count = app_info_obj&.dig("apkCount") || -1
-
-                    puts "开始构建Unity项目..."
-
-                    unity_helper.build_project(unity_exe_full_path: unity_exe_path, project_path: pindo_project_dir, platform: 'Android', isLibrary: isLibrary, indexNo: apk_count)
-
                     puts "Unity项目构建完成，准备处理Android项目..."
                     args_temp = []
 
+                    if @main_bundle_name
+                        args_temp << "--bundle_name=#{@main_bundle_name}"
+                    end
+
                     if @args_upload_flag
-                        args_temp << "--proj=#{app_info_obj["projectName"]}"
+                        args_temp << "--proj=#{@app_info_obj["projectName"]}"
                         args_temp << "--upload"
                     end
 
-                    Dir.chdir(pindo_android_project_dir)
-
                     Pindo::Command::Android::Autobuild::run(args_temp)
 
                 end

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

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'json'
-require 'pindo/module/unity/nugethelper'
+require 'pindo/module/unity/nuget_helper'
 
 module Pindo
   class Command

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

@@ -3,8 +3,8 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/unityhelper'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/unity/unity_helper'
+require 'pindo/module/build/build_helper'
 require 'pindo/base/pindocontext'
 
 module Pindo
@@ -99,6 +99,20 @@ DESC
                     # 确认并应用缓存（如果有）
                     context.confirm_and_apply_cache
 
+
+                    @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()
+                        end
+                    end
+
+
+
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
@@ -130,17 +144,6 @@ DESC
                       package_type: 'ipa'
                     )
 
-                    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()
-                        end
-                    end
-
                     isLibrary = @args_base_flag
 
                     ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
@@ -160,7 +163,7 @@ DESC
 
 
                     args_temp = []
-                    args_temp << "--bundleid=#{mainapp_bundleid}"
+                    args_temp << "--bundleid=#{@mainapp_bundleid}"
 
                     if @args_upload_flag
                         args_temp << "--proj=#{app_info_obj["projectName"]}"

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

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'json'
-require 'pindo/module/unity/nugethelper'
+require 'pindo/module/unity/nuget_helper'
 
 module Pindo
   class Command