pindo 5.13.1 → 5.13.2

data/lib/pindo/module/xcode/xcode_build_config.rb

@@ -364,12 +364,18 @@ module Pindo
         # 更新entitlements配置
         # 根据entitlements文件内容，同步更新config.json中的配置
         # 如果entitlements中没有icloud或app group，则从config.json中移除对应配置
+        # 使用 IosConfigParser 单例类获取和更新配置
         # @param project_dir [String] 项目目录路径
-        # @param config_file [String] config.json文件路径
         # @return [Boolean] 是否成功更新
-        def self.update_entitlements_config(project_dir: nil, config_file: nil)
+        def self.update_entitlements_config(project_dir: nil)
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
-            raise ArgumentError, "配置文件路径不能为空" if config_file.nil?
+
+            # 使用 IosConfigParser 单例获取配置
+            config_parser = Pindo::IosConfigParser.instance
+            config_json = config_parser.config_json
+            config_file_path = config_parser.config_file_path
+
+            return false if config_json.nil? || config_file_path.nil?
 
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             return false if project_fullname.nil?
@@ -389,13 +395,6 @@ module Pindo
 
             # 处理entitlements配置
             if entitlements_plist_path && File.exist?(entitlements_plist_path)
-                config_json = nil
-                if File.exist?(config_file)
-                    config_json = JSON.parse(File.read(config_file))
-                end
-
-                return false if config_json.nil?
-
                 entitlements_plist_dict = Xcodeproj::Plist.read_from_path(entitlements_plist_path)
 
                 # 如果entitlements中没有icloud配置，从config.json中移除
@@ -413,7 +412,7 @@ module Pindo
                 end
 
                 # 保存更新后的config.json
-                File.open(config_file, "w") do |f|
+                File.open(config_file_path, "w") do |f|
                     f.write(JSON.pretty_generate(config_json))
                 end
 
@@ -442,13 +441,15 @@ module Pindo
             puts "\n检测到项目 Icon URL: #{icon_url}"
 
             # 创建临时目录（所有 icon 处理都在此目录内完成）
-            temp_icon_dir = File.join(project_dir, ".pindo_temp_icon")
+            temp_icon_dir = File.join(project_dir, ".pindo_temp_ios_icon")
             icon_download_path = nil
             replace_success = false
 
             begin
-                FileUtils.mkdir_p(temp_icon_dir) unless File.exist?(temp_icon_dir)
-                icon_download_path = File.join(temp_icon_dir, "downloaded_icon.png")
+                # 先清理旧的临时目录，确保干净的环境
+                FileUtils.rm_rf(temp_icon_dir) if File.exist?(temp_icon_dir)
+                FileUtils.mkdir_p(temp_icon_dir)
+                icon_download_path = File.join(temp_icon_dir, "ios_downloaded_icon.png")
 
                 # 使用带重试机制的下载
                 unless IconDownloader.download_icon_with_retry(icon_url: icon_url, save_path: icon_download_path, max_retries: 3)
@@ -456,8 +457,10 @@ module Pindo
                     return false
                 end
 
-                # 生成新的 icon 目录（放在临时目录内部）
-                new_icon_dir = File.join(temp_icon_dir, "generated_icons")
+                # 生成新的 icon 目录（放在临时目录内部），先清理确保干净环境
+                new_icon_dir = File.join(temp_icon_dir, "ios_generated_icons")
+                FileUtils.rm_rf(new_icon_dir) if File.exist?(new_icon_dir)
+                FileUtils.mkdir_p(new_icon_dir)
 
                 # 创建各种尺寸的 icon
                 Funlog.instance.fancyinfo_start("正在创建 icon...")
@@ -482,12 +485,144 @@ module Pindo
                 replace_success = false
             ensure
                 # 清理临时文件（无论成功失败都清理）
-                # FileUtils.rm_rf(temp_icon_dir) if temp_icon_dir && File.exist?(temp_icon_dir)
+                FileUtils.rm_rf(temp_icon_dir) if temp_icon_dir && File.exist?(temp_icon_dir)
             end
 
             return replace_success
         end
 
+        # 配置 Xcode 项目（封装 configproj 的核心逻辑）
+        # 注意：调用此方法前必须先通过 IosConfigParser.instance.load_config 加载配置
+        # @param project_dir [String] 项目目录
+        # @return [Boolean] 是否成功
+        def self.configure_xcode_project(project_dir:)
+            require 'pindo/config/ios_config_parser'
+            require 'pindo/module/xcode/xcode_build_helper'
+            require 'pindo/module/xcode/xcode_res_helper'
+            require 'pindo/module/xcode/xcode_app_config'
+            require 'pindo/module/build/swark_helper'
+            require 'pindo/base/git_handler'
+
+            # 使用已加载的 IosConfigParser 单例
+            config_parser = Pindo::IosConfigParser.instance
+            config_json = config_parser.config_json
+            bundle_id = config_parser.bundle_id
+
+            # 验证配置已加载
+            if config_json.nil? || config_json.empty?
+                raise Informative, "配置未加载，请先调用 IosConfigParser.instance.load_config"
+            end
+
+            if bundle_id.nil? || bundle_id.empty?
+                raise Informative, "无法从配置中获取 Bundle ID"
+            end
+
+            # 获取项目名称
+            project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+            if project_fullname.nil? || !File.exist?(project_fullname)
+                raise Informative, "找不到 .xcodeproj 文件，请检查项目目录"
+            end
+            proj_name = File.basename(project_fullname, ".xcodeproj")
+
+            # 1. 安装 Google Plist
+            Funlog.instance.fancyinfo_start("正在替换 google-info.plist...")
+            google_info_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: bundle_id)
+            Pindo::XcodeBuildHelper.install_google_plist(
+                project_dir: project_dir,
+                app_config_dir: google_info_config_dir
+            )
+            Funlog.instance.fancyinfo_success("替换 google-info.plist 完成！")
+
+            # 2. 创建和替换 Icon
+            app_config_dir = google_info_config_dir
+            icon_name = File.join(app_config_dir, "fastlane", "icon.png")
+            if File.exist?(icon_name)
+                time = Time.now.strftime('%m%d-%H%M%S')
+                new_icon_dir = File.join(project_dir, "icon_#{time}")
+
+                Funlog.instance.fancyinfo_start("正在创建 icon...")
+                Pindo::XcodeResHelper.create_icons(icon_name: icon_name, new_icon_dir: new_icon_dir)
+                Funlog.instance.fancyinfo_success("创建 icon 完成!")
+
+                Funlog.instance.fancyinfo_start("正在替换 icon...")
+                Pindo::XcodeResHelper.install_icon(proj_dir: project_dir, new_icon_dir: new_icon_dir)
+                Funlog.instance.fancyinfo_success("替换 icon 完成!")
+
+                begin
+                    FileUtils.rm_rf(new_icon_dir)
+                rescue StandardError => err
+                    # 忽略清理错误
+                end
+            else
+                Funlog.instance.fancyinfo_warning("未找到 icon 文件: #{icon_name}")
+            end
+
+            # 3. 替换启动页
+            Funlog.instance.fancyinfo_start("正在替换启动页...")
+            launchimg_pub_path = File.join(app_config_dir, "launch")
+            if Dir.exist?(launchimg_pub_path)
+                Pindo::XcodeResHelper.install_launchimg(
+                    proj_dir: project_dir,
+                    launchimg_pub_path: launchimg_pub_path
+                )
+                Funlog.instance.fancyinfo_success("启动页处理完成!")
+            else
+                Funlog.instance.fancyinfo_warning("未找到启动页目录: #{launchimg_pub_path}")
+            end
+
+            # 4. 添加项目模块
+            # 需要 include XcodeAppConfig 模块的方法，这里创建一个临时对象
+            config_helper = Object.new
+            config_helper.extend(Pindo::XcodeAppConfig)
+            config_helper.add_project_modue(
+                project_dir: project_dir,
+                proj_name: proj_name,
+                config_json: config_json
+            )
+
+            # 5. 修改 Info.plist
+            Funlog.instance.fancyinfo_start("正在修改工程配置...")
+            Pindo::XcodeBuildHelper.modify_info_plist(
+                project_dir: project_dir,
+                proj_name: proj_name,
+                config_json: config_json
+            )
+
+            # 6. 修改项目配置
+            Pindo::XcodeBuildHelper.modify_project_config(
+                project_dir: project_dir,
+                proj_name: proj_name,
+                config_json: config_json
+            )
+
+            # 7. 修改 AppPrefix.plist
+            appprefix_file = "AppPrefix.plist"
+            if config_json['project_info'] && config_json['project_info']['appprefix_plist']
+                appprefix_file = config_json['project_info']['appprefix_plist']
+            end
+            config_helper.modify_appprefix_plist(
+                project_dir: project_dir,
+                appprefix_file: appprefix_file,
+                config_json: config_json
+            )
+
+            Funlog.instance.fancyinfo_success("工程配置修改完成!")
+
+            # 8. 检查 Swark 授权
+            deploy_identifier = config_json['app_info']['app_identifier'] || bundle_id
+            Pindo::SwarkHelper.check_swark_authorize(
+                config_json: config_json,
+                buid_type: 'dev',
+                deploy_identifier: deploy_identifier
+            )
+
+            return true
+        rescue StandardError => e
+            Funlog.instance.fancyinfo_error("配置 Xcode 项目失败: #{e.message}")
+            puts e.backtrace
+            return false
+        end
+
     end
 
 end

data/lib/pindo/module/xcode/xcode_build_helper.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'xcodeproj'
 require 'json'
-require 'pindo/module/cert/xcodecerthelper'
 
 module Pindo
 
@@ -114,6 +113,25 @@ module Pindo
             end
         end
 
+        # 获取 Target 名称映射
+        def get_target_name_map
+            return {
+                "MainTarget" => "bundle_id",
+                "Content" => "bundle_id_pushcontent",
+                "Service" => "bundle_id_pushservice",
+                "Keyboard" => "bundle_id_keyboard",
+                "iMessage" => "bundle_id_imessage",
+                "Siri" => "bundle_id_siri",
+                "SiriUI" => "bundle_id_siriui",
+                "Widget" => "bundle_id_widget",
+                "Extension" => "bundle_id_extension",
+                "ExtensionAd" => "bundle_id_extensionad",
+                "ExtensionPorn" => "bundle_id_extensionporn",
+                "WatchApp" => "bundle_id_watchapp",
+                "WatchAppComplication" => "bundle_id_watchapp_extension"
+            }
+        end
+
         def modify_project_config(project_dir:nil, proj_name:nil,  config_json:nil)
 
             proj_fullname = File.join(project_dir, proj_name) + ".xcodeproj"
@@ -419,6 +437,138 @@ module Pindo
             end
         end
 
+        # 构建 Xcode 工程的主入口方法
+        # @param project_dir [String] 工程目录
+        # @param icloud_id [String, nil] iCloud ID（可选）
+        # @return [String, nil] 生成的 IPA 文件路径，失败返回 nil
+        def build_project(project_dir:, icloud_id: nil)
+            project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+
+            if project_fullname.nil?
+                puts "未找到 Xcode 工程文件"
+                return nil
+            end
+
+            # 修复 Xcode 16 链接器兼容性问题
+            fix_xcode16_linker_flags(project_dir: project_dir)
+
+            # 清理旧的 build 目录
+            build_dir = File.join(project_dir, "build")
+            FileUtils.rm_rf(build_dir) if File.exist?(build_dir)
+
+            # 获取构建参数
+            gym_options = get_gym_build_options(
+                project_fullname: project_fullname,
+                icloud_id: icloud_id
+            )
+
+            # 执行构建
+            require 'gym'
+            config = FastlaneCore::Configuration.create(Gym::Options.available_options, gym_options)
+            Gym::Manager.new.work(config)
+
+            # 查找生成的 IPA 文件
+            build_path = File.join(project_dir, "build", "*.ipa")
+            ipa_file = Dir.glob(build_path).max_by { |f| File.mtime(f) }
+
+            ipa_file
+        end
+
+        # 获取 Gym 构建参数
+        # @param project_fullname [String] 工程文件完整路径
+        # @param icloud_id [String, nil] iCloud ID（可选）
+        # @return [Hash] Gym 构建参数
+        def get_gym_build_options(project_fullname:, icloud_id: nil)
+            if project_fullname.nil?
+                raise "请指定要编译的工程"
+            end
+
+            project_path = File.dirname(project_fullname)
+            proj_name = File.basename(project_fullname, ".xcodeproj")
+            project_obj = Xcodeproj::Project.open(project_fullname)
+
+            project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
+            main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) }.first
+            provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
+
+            # 确定构建类型和 iCloud 环境
+            build_type = "app-store"
+            icloud_env = "Production"
+
+            if !project_build_platform.nil? && project_build_platform.eql?("macosx")
+                # macOS 平台
+                if provisioning_profile_name.include?("development")
+                    build_type = "development"
+                    icloud_env = "Development"
+                elsif provisioning_profile_name.include?("appstore")
+                    build_type = "mac-application"
+                    icloud_env = "Production"
+                else
+                    build_type = "developer-id"
+                    icloud_env = "Production"
+                end
+            else
+                # iOS 平台
+                if provisioning_profile_name.include?("adhoc")
+                    build_type = "ad-hoc"
+                    icloud_env = "Development"
+                elsif provisioning_profile_name.include?("development")
+                    build_type = "development"
+                    icloud_env = "Development"
+                else
+                    build_type = "app-store"
+                    icloud_env = "Production"
+                end
+            end
+
+            # 检查 Unity 测试模板
+            if build_type.eql?("app-store") || build_type.eql?("ad-hoc")
+                if File.exist?(File.join(project_path, "Unity/Data/Raw/SettingsPluginFlag.txt"))
+                    raise Informative, "Unity代码包含测试模板，请重新导出Unity代码"
+                end
+            end
+
+            # 获取应用名称
+            app_ipaname_temp = main_target.build_configurations.first.build_settings['INFOPLIST_KEY_CFBundleDisplayName'] || main_target.display_name
+            app_ipaname_temp = app_ipaname_temp.gsub(/ /, '')
+            app_ipaname_temp = app_ipaname_temp.gsub(/\'/, '')
+
+            # 构建基本参数
+            values = {
+                project: "#{proj_name}.xcodeproj",
+                scheme: "#{proj_name}",
+                configuration: "Release",
+                clean: true,
+                export_method: build_type,
+                output_directory: "./build/",
+                output_name: "#{app_ipaname_temp}.ipa"
+            }
+
+            # macOS 平台特殊处理
+            if !project_build_platform.nil? && project_build_platform.eql?("macosx")
+                values[:output_name] = nil
+                values[:destination] = "generic/platform=macosx"
+            end
+
+            # 如果使用 CocoaPods
+            if File.exist?(File.join(project_path, "Podfile"))
+                values[:workspace] = "#{proj_name}.xcworkspace"
+                values[:project] = nil
+            end
+
+            # 导出选项
+            values[:export_options] ||= {}
+            values[:export_options][:compileBitcode] = false
+            values[:export_options][:stripSwiftSymbols] = true
+            values[:export_options][:uploadSymbols] = false
+
+            if !icloud_id.nil?
+                values[:export_options][:iCloudContainerEnvironment] = icloud_env
+            end
+
+            values
+        end
+
         end
     end