pindo 5.13.2 → 5.13.3

data/lib/pindo/module/task/model/build/ios_build_dev_task.rb

@@ -4,6 +4,7 @@ require 'pindo/module/build/version_helper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
+require 'pindo/module/xcode/cocoapods_helper'
 require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo
@@ -45,12 +46,13 @@ module Pindo
         update_version_info
         pull_config
         update_entitlements
-        handle_cocoapods
+        
       end
 
       def execute_build
         configure_certificate
         update_url_schemes_final
+        handle_cocoapods
         build_ios_project
       end
 
@@ -92,14 +94,6 @@ module Pindo
         end
       end
 
-      # 清理 Firebase Shell Script
-      def cleanup_firebase_shell
-        project_fullname = Dir.glob(File.join(@project_path, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
-        if !project_fullname.nil? && File.exist?(project_fullname)
-          Pindo::XcodeBuildHelper.delete_libtarget_firebase_shell(@project_path)
-        end
-      end
-
       # 更新工程配置
       def update_project_config
         workflow_packname = @workflow_info[:package_name]
@@ -146,23 +140,15 @@ module Pindo
         end
       end
 
-      # 拉取配置
+      # 检查配置
       def pull_config
-        return unless @bundle_id
-
-        build_helper = Pindo::BuildHelper.share_instance
-        build_helper.pull_appconfig_with_reponame(
-          repo_name: @bundle_id,
-          target_dir: @project_path
-        )
-
-        # 重新加载配置到 IosConfigParser
-        config_file = File.join(@project_path, "config.json")
-        if File.exist?(config_file)
-          Pindo::IosConfigParser.instance.load_config(config_file: config_file)
-        else
-          raise Informative, "配置文件不存在: #{config_file}"
+        # 检查 IosConfigParser 单例中是否已加载配置
+        config_parser = Pindo::IosConfigParser.instance
+        if config_parser.config_json.nil?
+          raise Informative, "IosBuildDevTask 配置未加载，请确保在命令层已正确加载 config.json"
         end
+
+        puts "  使用已加载的配置..."
       end
 
       # 更新 Entitlements
@@ -176,29 +162,14 @@ module Pindo
       def handle_cocoapods
         return unless File.exist?(File.join(@project_path, "Podfile"))
 
-        Dir.chdir(@project_path)
-        Pindo::Command::Ios::Podupdate::run([])
-
-        begin
-          # 清理现有 Pods
-          FileUtils.rm_rf(File.join(@project_path, "Podfile.lock")) if File.exist?(File.join(@project_path, "Podfile.lock"))
-          FileUtils.rm_rf(File.join(@project_path, "Pods")) if File.exist?(File.join(@project_path, "Pods"))
-
-          puts "正在执行 pod deintegrate..."
-          system 'pod deintegrate'
-
-          puts "正在执行 pod install..."
-          system 'pod install'
-        rescue => error
-          puts(error.to_s)
-          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
-        end
+        # 1. 更新私有索引库
+        Pindo::CocoaPodsHelper.update_pod_repo(
+          install: false,
+          project_dir: @project_path
+        )
 
-        # 检查 pod install 是否成功
-        pod_lock_file = File.join(@project_path, "Podfile.lock")
-        unless File.exist?(pod_lock_file)
-          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
-        end
+        # 2. 清理并重新安装
+        Pindo::CocoaPodsHelper.deintegrate_and_install(@project_path)
       end
 
       # 配置证书

data/lib/pindo/module/task/model/build/ios_build_task.rb

@@ -1,4 +1,5 @@
 require_relative '../build_task'
+require 'pindo/module/xcode/xcode_build_helper'
 
 module Pindo
   module TaskSystem
@@ -6,8 +7,17 @@ module Pindo
     # 所有 iOS 平台构建任务的抽象基类
     # 子类包括：IosBuildDevTask、IosBuildAdhocTask、IosBuildAppStoreTask
     class IosBuildTask < BuildTask
-      # 空基类，仅用于类型标识
-      # 所有具体实现由子类完成
+
+      protected
+
+      # 清理 Firebase Shell Script
+      # 删除 Xcode 项目中的 Firebase Shell Script Build Phase
+      def cleanup_firebase_shell
+        project_fullname = Dir.glob(File.join(@project_path, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+        if !project_fullname.nil? && File.exist?(project_fullname)
+          Pindo::XcodeBuildHelper.delete_libtarget_firebase_shell(@project_path)
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,271 @@
+require 'fileutils'
+require 'json'
+require 'faraday'
+require 'xcodeproj'
+require 'pindo/base/git_handler'
+require 'pindo/config/pindoconfig'
+
+module Pindo
+  # Applovin Xcode 辅助类
+  # 封装 Applovin 相关的操作，包括：
+  # - 获取 SKAdNetwork IDs
+  # - 更新 Info.plist 文件
+  # - 运行 Applovin 安装脚本
+  class ApplovinXcodeHelper
+
+    class << self
+      # 更新 Xcode 工程的 Applovin 配置
+      # @param project_dir [String] 项目目录，默认为当前目录
+      # @param appstore_mode [Boolean] 是否为 AppStore 模式
+      # @param install_script [Boolean] 是否运行安装脚本
+      # @param upload_config [Boolean] 是否保存配置到远程
+      # @return [Boolean] 是否成功
+      def update_applovin_config(project_dir: nil, appstore_mode: false, install_script: false, upload_config: false)
+        project_dir ||= Dir.pwd
+
+        # 1. 获取 SKAdNetwork IDs
+        skadnetwork_ids = fetch_skadnetwork_ids(upload_config: upload_config)
+
+        if skadnetwork_ids.nil? || skadnetwork_ids.empty?
+          puts "⚠ 未能获取 SKAdNetwork IDs"
+          return false
+        end
+
+        puts "✓ 获取到 #{skadnetwork_ids.size} 条 SKAdNetwork IDs"
+
+        # 2. 更新 Info.plist
+        update_info_plist(project_dir: project_dir, skadnetwork_ids: skadnetwork_ids)
+
+        # 3. 运行安装脚本（可选）
+        if install_script
+          run_applovin_install_script(project_dir: project_dir, appstore_mode: appstore_mode)
+        end
+
+        true
+      end
+
+      # 获取 SKAdNetwork IDs
+      # @param upload_config [Boolean] 是否保存配置到远程
+      # @return [Array<String>] SKAdNetwork IDs 数组
+      def fetch_skadnetwork_ids(upload_config: false)
+        skadnetwork_ids = []
+
+        puts "正在请求 Applovin 数据..."
+
+        # 1. 请求 Applovin SKAdNetwork IDs
+        applovin_data = request_applovin_skadnetwork_ids
+        if applovin_data && applovin_data["skadnetwork_ids"]
+          applovin_data["skadnetwork_ids"].each do |network_id|
+            skadnetwork_ids << network_id["skadnetwork_id"]
+          end
+        end
+
+        # 2. 请求 Applovin Mediation SKAdNetwork IDs
+        mediation_data = request_applovin_mediation_skadnetwork_ids
+        if mediation_data && mediation_data["mediationSKAdnetworkIdsSpecs"]
+          mediation_data["mediationSKAdnetworkIdsSpecs"].each do |media_item|
+            skadnetwork_ids += media_item["skAdnetworkIds"]
+          end
+        end
+
+        # 3. 去重
+        skadnetwork_ids = skadnetwork_ids.uniq
+
+        puts "✓ 从网络获取到 #{skadnetwork_ids.size} 条数据"
+
+        # 4. 如果数据太少，从配置文件读取
+        if skadnetwork_ids.size <= 50
+          puts "网络数据太少，从缓存中获取..."
+          cached_ids = load_cached_skadnetwork_ids
+          skadnetwork_ids += cached_ids
+          skadnetwork_ids = skadnetwork_ids.uniq
+          puts "✓ 从缓存获取到 #{skadnetwork_ids.size} 条数据"
+        elsif upload_config
+          # 5. 保存到配置文件
+          save_skadnetwork_ids_to_config(skadnetwork_ids)
+        end
+
+        skadnetwork_ids
+      end
+
+      # 更新 Info.plist 文件
+      # @param project_dir [String] 项目目录
+      # @param skadnetwork_ids [Array<String>] SKAdNetwork IDs
+      def update_info_plist(project_dir:, skadnetwork_ids:)
+        puts "正在更新 Xcode Info.plist..."
+
+        # 1. 查找 Info.plist 文件
+        plist_file = find_info_plist(project_dir: project_dir)
+
+        unless File.exist?(plist_file)
+          puts "⚠ 未找到 Info.plist 文件: #{plist_file}"
+          return false
+        end
+
+        # 2. 读取 Info.plist
+        info_plist_dict = Xcodeproj::Plist.read_from_path(plist_file)
+
+        # 3. 更新配置
+        info_plist_dict["NSAdvertisingAttributionReportEndpoint"] ||= "https://postbacks-app.com"
+
+        if !info_plist_dict.has_key?("NSAppTransportSecurity")
+          info_plist_dict["NSAppTransportSecurity"] = {}
+          info_plist_dict["NSAppTransportSecurity"]["NSAllowsArbitraryLoads"] = true
+        end
+
+        # 4. 更新 SKAdNetworkItems
+        if skadnetwork_ids && skadnetwork_ids.size > 0
+          info_plist_dict["SKAdNetworkItems"] = []
+          skadnetwork_ids.each do |network_id|
+            item = { "SKAdNetworkIdentifier" => network_id }
+            info_plist_dict["SKAdNetworkItems"] << item
+          end
+        end
+
+        # 5. 写回 Info.plist
+        Xcodeproj::Plist.write_to_path(info_plist_dict, plist_file)
+
+        puts "✓ Info.plist 更新完成"
+        true
+      end
+
+      # 运行 Applovin 安装脚本
+      # @param project_dir [String] 项目目录
+      # @param appstore_mode [Boolean] 是否为 AppStore 模式
+      def run_applovin_install_script(project_dir:, appstore_mode: false)
+        xcodeproj_file = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+        return unless xcodeproj_file && File.exist?(xcodeproj_file)
+
+        pindo_common_dir = Pindoconfig.instance.pindo_common_configdir
+
+        # 选择脚本文件
+        script_name = appstore_mode ? "AppLovinQualityServiceSetup-ios.rb" : "AppLovinQualityServiceSetup-ios-dev.rb"
+        source_script = File.join(pindo_common_dir, script_name)
+
+        return unless File.exist?(source_script)
+
+        # 复制脚本到项目目录
+        project_script = File.join(project_dir, "AppLovinQualityServiceSetup-ios.rb")
+        FileUtils.cp_r(source_script, project_script)
+
+        # 运行脚本
+        puts "正在运行 Applovin 安装脚本..."
+        system("ruby #{project_script}")
+        puts "✓ Applovin 安装脚本执行完成"
+      end
+
+      private
+
+      # 请求 Applovin SKAdNetwork IDs
+      # @return [Hash, nil] JSON 数据
+      def request_applovin_skadnetwork_ids
+        begin
+          url = "https://dash.applovin.com/docs/v1/skadnetwork_ids.json"
+          conn = Faraday.new
+          response = conn.get do |req|
+            req.url url
+            req.headers['Content-Type'] = 'application/json'
+          end
+
+          JSON.parse(response.body)
+        rescue => e
+          puts "⚠ 请求 Applovin SKAdNetwork IDs 失败: #{e.message}"
+          nil
+        end
+      end
+
+      # 请求 Applovin Mediation SKAdNetwork IDs
+      # @return [Hash, nil] JSON 数据
+      def request_applovin_mediation_skadnetwork_ids
+        begin
+          url = "https://dash.applovin.com/docs/v1/mediation_sk_adnetwork_ids"
+          conn = Faraday.new
+          response = conn.get do |req|
+            req.url url
+            req.headers['Content-Type'] = 'application/json'
+          end
+
+          JSON.parse(response.body)
+        rescue => e
+          puts "⚠ 请求 Applovin Mediation SKAdNetwork IDs 失败: #{e.message}"
+          nil
+        end
+      end
+
+      # 从配置文件加载缓存的 SKAdNetwork IDs
+      # @return [Array<String>] SKAdNetwork IDs
+      def load_cached_skadnetwork_ids
+        config_file = File.join(Pindoconfig.instance.pindo_common_configdir, "applovin_client_config.json")
+        return [] unless File.exist?(config_file)
+
+        begin
+          config_json = JSON.parse(File.read(config_file))
+          config_json["SKAdNetworkItems"] || []
+        rescue => e
+          puts "⚠ 读取缓存配置失败: #{e.message}"
+          []
+        end
+      end
+
+      # 保存 SKAdNetwork IDs 到配置文件
+      # @param skadnetwork_ids [Array<String>] SKAdNetwork IDs
+      def save_skadnetwork_ids_to_config(skadnetwork_ids)
+        config_dir = Pindoconfig.instance.pindo_common_configdir
+        config_file = File.join(config_dir, "applovin_client_config.json")
+
+        # 读取原有配置
+        origin_json = {}
+        if File.exist?(config_file)
+          origin_json = JSON.parse(File.read(config_file))
+        end
+
+        # 更新配置
+        origin_json["SKAdNetworkItems"] = skadnetwork_ids
+
+        # 写入文件
+        File.write(config_file, JSON.pretty_generate(origin_json))
+
+        # 提交到 Git
+        begin
+          Pindo::GitHandler.git_addpush_repo(
+            path: config_dir,
+            message: "Applovin SKAdNetworkItems",
+            commit_file_params: ["applovin_client_config.json"]
+          )
+          puts "✓ 配置已保存到远程仓库"
+        rescue => e
+          puts "⚠ 提交配置到 Git 失败: #{e.message}"
+        end
+      end
+
+      # 查找 Info.plist 文件路径
+      # @param project_dir [String] 项目目录
+      # @return [String] Info.plist 文件路径
+      def find_info_plist(project_dir:)
+        # 默认路径
+        default_plist = File.join(project_dir, "AppEntry/Info.plist")
+
+        # 查找 .xcodeproj 文件
+        xcodeproj_file = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+        return default_plist unless xcodeproj_file
+
+        # 从 Xcode 工程中查找 Info.plist
+        begin
+          proj_name = File.basename(xcodeproj_file, ".xcodeproj")
+          project_obj = Xcodeproj::Project.open(xcodeproj_file)
+
+          project_obj.targets.each do |target|
+            if target.product_type.to_s == "com.apple.product-type.application"
+              temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+              return File.join(project_dir, temp_info) if temp_info
+            end
+          end
+        rescue => e
+          puts "⚠ 解析 Xcode 工程失败: #{e.message}"
+        end
+
+        default_plist
+      end
+    end
+  end
+end

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

@@ -0,0 +1,153 @@
+require 'cocoapods'
+require 'fileutils'
+require 'pindo/base/git_handler'
+require 'pindo/config/pindoconfig'
+
+module Pindo
+  # CocoaPods 操作辅助类
+  # 封装 CocoaPods 相关的操作，包括：
+  # - 更新私有索引库
+  # - 同步 podspec
+  # - 执行 pod install
+  class CocoaPodsHelper
+
+    class << self
+      # 更新私有 Pod 索引库
+      # @param install [Boolean] 是否执行 pod install
+      # @param project_dir [String] 项目目录，默认为当前目录
+      # @return [Boolean] 是否成功
+      def update_pod_repo(install: false, project_dir: nil)
+        project_dir ||= Dir.pwd
+
+        # 获取私有 Pod 索引地址
+        pod_index_url = get_private_pod_index_url
+        raise "私有Pod索引地址未知！！" if pod_index_url.nil?
+
+        # 更新私有索引库
+        update_private_repo(pod_index_url)
+
+        # 如果需要，执行 pod install
+        if install
+          install_pods(project_dir)
+        end
+
+        true
+      end
+
+      # 执行 pod install
+      # @param project_dir [String] 项目目录
+      # @return [Boolean] 是否成功
+      def install_pods(project_dir)
+        podfile_path = File.join(project_dir, "Podfile")
+        return false unless File.exist?(podfile_path)
+
+        begin
+          puts "正在执行 pod install..."
+          Dir.chdir(project_dir) do
+            Pod::Command::Install.run(['--clean-install'])
+          end
+          true
+        rescue => e
+          puts "Pod install 失败: #{e.message}"
+          false
+        end
+      end
+
+      # 清理并重新安装 CocoaPods
+      # @param project_dir [String] 项目目录
+      def deintegrate_and_install(project_dir)
+        return unless File.exist?(File.join(project_dir, "Podfile"))
+
+        Dir.chdir(project_dir) do
+          begin
+            # 清理现有 Pods
+            FileUtils.rm_rf("Podfile.lock") if File.exist?("Podfile.lock")
+            FileUtils.rm_rf("Pods") if File.exist?("Pods")
+
+            puts "正在执行 pod deintegrate..."
+            system 'pod deintegrate'
+
+            puts "正在执行 pod install..."
+            system 'pod install'
+
+            # 检查 pod install 是否成功
+            unless File.exist?("Podfile.lock")
+              raise "pod install 失败！！先 pod install 完成后再编译！"
+            end
+          rescue => error
+            puts error.to_s
+            raise "pod install 失败！！先 pod install 完成后再编译！"
+          end
+        end
+      end
+
+      # 检查是否使用了特定的 Pod
+      # @param project_dir [String] 项目目录
+      # @param pod_names [Array<String>] Pod 名称列表
+      # @return [Boolean] 是否使用了任一指定的 Pod
+      def using_pods?(project_dir, pod_names)
+        pod_lock_file = File.join(project_dir, "Podfile.lock")
+        return false unless File.exist?(pod_lock_file)
+
+        begin
+          pod_lock_json = Pod::YAMLHelper.load_file(pod_lock_file)
+          pods_array = []
+
+          if !pod_lock_json["SPEC REPOS"].nil?
+            pod_lock_json["SPEC REPOS"].each do |source, pod_items|
+              pods_array += pod_items
+            end
+          end
+
+          pod_names.any? { |name| pods_array.include?(name) }
+        rescue => e
+          puts "检查 Podfile.lock 失败: #{e.message}"
+          false
+        end
+      end
+
+      private
+
+      # 获取私有 Pod 索引地址
+      # @return [String, nil] 索引地址
+      def get_private_pod_index_url
+        config = Pindoconfig.instance
+        pod_array = config.pod_repo_dict
+        return nil if pod_array.nil?
+
+        pod_array['podindex']
+      end
+
+      # 更新私有索引库
+      # @param pod_index_url [String] 索引库地址
+      def update_private_repo(pod_index_url)
+        sources = Pod::Config.instance.sources_manager.all
+        repos_path = File.expand_path("~/.cocoapods/repos")
+
+        puts "私有Pod地址: #{pod_index_url}"
+        puts "私有Pod目录: ~/.cocoapods"
+
+        # 查找已存在的私有源
+        private_source = sources.select { |s| s.git? && s.url.to_s.eql?(pod_index_url) }.first
+
+        if !private_source.nil?
+          # 更新已存在的私有源
+          repo_name = File.basename(private_source.repo)
+          Pindo::GitHandler.getcode_to_dir(
+            reponame: repo_name,
+            remote_url: pod_index_url,
+            path: repos_path
+          )
+        else
+          # 添加新的私有源
+          repository_name = pod_index_url.split("/").last.chomp(".git")
+          Pindo::GitHandler.getcode_to_dir(
+            reponame: repository_name,
+            remote_url: pod_index_url,
+            path: repos_path
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -221,7 +221,7 @@ module Pindo
             require_relative '../../base/funlog'
 
             begin
-                pindo_dir = File.expand_path(Pindo::PindoConfig.pindo_single_config.pindo_dir)
+                pindo_dir = File.expand_path(Pindo::Pindoconfig.instance.pindo_dir)
                 app_config_dir = File.join(pindo_dir, bundle_id)
 
                 # 如果指定了要删除的 tag

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

@@ -150,8 +150,8 @@ module Pindo
 
         # 1. 设置 Swark 环境
         require 'pindo/config/pindoconfig'
-        pindo_dir = Pindo::PindoConfig.pindo_single_config.pindo_dir
-        swark_git_url = Pindo::PindoConfig.pindo_single_config.deploy_swark_giturl
+        pindo_dir = Pindo::Pindoconfig.instance.pindo_dir
+        swark_git_url = Pindo::Pindoconfig.instance.deploy_swark_giturl
         setup_swark_env(pindo_dir: pindo_dir, swark_git_url: swark_git_url)
 
         # 2. 运行 Swark 授权
@@ -225,8 +225,8 @@ module Pindo
 
         # 1. 设置 Quark 环境
         require 'pindo/config/pindoconfig'
-        pindo_dir = Pindo::PindoConfig.pindo_single_config.pindo_dir
-        quark_git_url = Pindo::PindoConfig.pindo_single_config.deploy_quark_giturl
+        pindo_dir = Pindo::Pindoconfig.instance.pindo_dir
+        quark_git_url = Pindo::Pindoconfig.instance.deploy_quark_giturl
         setup_quark_env(pindo_dir: pindo_dir, quark_git_url: quark_git_url)
 
         # 2. 运行 quark host 命令
@@ -290,7 +290,7 @@ module Pindo
       begin
         Funlog.instance.fancyinfo_start("正在执行 Swark 授权...")
 
-        pindo_dir = Pindo::PindoConfig.pindo_single_config.pindo_dir
+        pindo_dir = Pindo::Pindoconfig.instance.pindo_dir
         app_config_dir = File.join(File.expand_path(pindo_dir), bundle_id)
         swark_authorize_file = File.join(app_config_dir, "swark_authorize.json")
 

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.13.2"
+  VERSION = "5.13.3"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.13.2
+  version: 5.13.3
 platform: ruby
 authors:
 - wade
@@ -456,6 +456,8 @@ files:
 - lib/pindo/module/webserver/responsive_preview_handler.rb
 - lib/pindo/module/webserver/webgl_page_handler.rb
 - lib/pindo/module/webserver/webgl_server_helper.rb
+- lib/pindo/module/xcode/applovin_xcode_helper.rb
+- lib/pindo/module/xcode/cocoapods_helper.rb
 - lib/pindo/module/xcode/ipa_resign_helper.rb
 - lib/pindo/module/xcode/res/xcode_res_constant.rb
 - lib/pindo/module/xcode/res/xcode_res_handler.rb