pindo 5.12.2 → 5.13.2

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

@@ -97,6 +97,9 @@ module Pindo
         puts "⚠ Keystore 签名配置跳过（使用工程原有配置）"
       end
 
+      # 处理 Play Asset Delivery 配置（如果存在）
+      setup_play_asset_delivery(project_dir)
+
       # 构建 APK
       build_apk(project_dir, debug)
     end
@@ -298,6 +301,113 @@ module Pindo
       end
     end
 
+    # 设置 Play Asset Delivery：直接扫描导出工程中的资源目录，按照 Android 原生方式创建 .androidpack 目录
+    def setup_play_asset_delivery(project_dir)
+      # 获取 unityLibrary 路径
+      unity_library_path = File.join(project_dir, "unityLibrary", "src", "main")
+      unless File.directory?(unity_library_path)
+        puts "警告：Unity Library 目录不存在: #{unity_library_path}"
+        return
+      end
+
+      # 扫描 assets 目录下的资源（Unity 构建时会将 StreamingAssets 复制到这里）
+      assets_path = File.join(unity_library_path, "assets")
+      unless File.directory?(assets_path)
+        puts "未找到 assets 目录，跳过 Play Asset Delivery 设置"
+        return
+      end
+
+      # 扫描 assets 目录下的所有一级子目录
+      # 这些目录对应 StreamingAssets/{DefaultYooFolderName} 下的资源包
+      asset_subdirs = Dir.glob(File.join(assets_path, "*")).select { |path| File.directory?(path) }
+      
+      if asset_subdirs.empty?
+        puts "未找到 assets 下的子目录，跳过 Play Asset Delivery 设置"
+        return
+      end
+
+      puts "检测到 #{asset_subdirs.length} 个 assets 子目录，开始设置 Play Asset Delivery..."
+
+      begin
+        # 收集所有创建的 asset pack 模块名
+        created_pack_modules = []
+
+        # 扫描每个子目录，为每个子目录创建一个 asset pack 模块
+        asset_subdirs.each do |subdir|
+          original_pack_name = File.basename(subdir)
+          if original_pack_name.downcase == 'bin'
+            puts "跳过 bin 目录，保持在 base 模块中"
+            next
+          end
+          sanitized_pack_name = sanitize_pack_name(original_pack_name)
+          module_name = "#{sanitized_pack_name}_pack"
+
+          # 检查目录是否为空
+          if Dir.glob(File.join(subdir, "*")).empty?
+            puts "警告：跳过空的 Asset Pack 目录: #{subdir}"
+            next
+          end
+
+          # 创建模块目录（在项目顶级目录，与 launcher、unityLibrary 同级）
+          android_pack_dir = File.join(project_dir, module_name)
+          FileUtils.rm_rf(android_pack_dir) if File.directory?(android_pack_dir)
+          FileUtils.mkdir_p(android_pack_dir)
+
+          # 在 asset pack 模块中创建 src/main/assets 目录
+          module_assets_dir = File.join(android_pack_dir, "src", "main", "assets")
+          FileUtils.mkdir_p(module_assets_dir)
+
+          # 复制整个子目录到模块的 assets 下，保留原始目录名
+          FileUtils.cp_r(subdir, module_assets_dir)
+
+          # 从 assets 目录中删除资源，避免被打包到 base 模块
+          puts "  从 assets 目录移除资源 #{subdir}，避免重复打包到 base 模块..."
+          FileUtils.rm_rf(subdir)
+
+          # 创建 build.gradle 文件（默认使用 install-time delivery mode）
+          build_gradle_content = <<~GRADLE
+            plugins {
+                id 'com.android.asset-pack'
+            }
+
+            assetPack {
+                packName = "#{module_name}"
+                dynamicDelivery {
+                    deliveryType = "install-time"
+                }
+            }
+          GRADLE
+
+          build_gradle_path = File.join(android_pack_dir, "build.gradle")
+          File.write(build_gradle_path, build_gradle_content)
+
+          # 记录模块名（项目顶级目录下的简单模块名）
+          created_pack_modules << ":#{module_name}"
+
+          puts "✓ 已创建 Asset Pack: #{module_name} -> #{android_pack_dir}"
+        end
+
+        # 更新 settings.gradle 文件，注册 asset pack 模块
+        if created_pack_modules.any?
+          GradleHelper.update_settings_gradle(project_dir, created_pack_modules)
+          # 更新 launcher/build.gradle 文件，添加 assetPacks 配置
+          GradleHelper.update_launcher_build_gradle(project_dir, created_pack_modules)
+          puts "✓ Play Asset Delivery 设置完成，共创建 #{created_pack_modules.length} 个 Asset Pack"
+        else
+          puts "未找到有效的 Asset Pack 目录"
+        end
+      rescue => e
+        puts "警告：设置 Play Asset Delivery 失败: #{e.message}"
+        puts e.backtrace.first(5).join("\n")
+      end
+    end
+
+    def sanitize_pack_name(name)
+      sanitized = name.to_s.gsub(/[^A-Za-z0-9_]/, '_')
+      sanitized = "p_#{sanitized}" unless sanitized.match?(/^[A-Za-z]/)
+      sanitized = sanitized.gsub(/__+/, '_')
+      sanitized.empty? ? "pack" : sanitized
+    end
 
   end
 end

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

@@ -924,13 +924,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_android_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, "android_downloaded_icon.png")
 
                 # 使用带重试机制的下载
                 unless IconDownloader.download_icon_with_retry(icon_url: icon_url, save_path: icon_download_path, max_retries: 3)
@@ -938,8 +940,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, "android_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("正在创建 Android icon...")

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

@@ -559,7 +559,95 @@ module Pindo
         end
       rescue => e
         false
+      end
+
+    end
+
+    # =================== Play Asset Delivery 相关方法 ===================
+
+    # 更新 settings.gradle 文件，注册 asset pack 模块
+    def self.update_settings_gradle(project_dir, pack_modules)
+      settings_gradle_path = File.join(project_dir, "settings.gradle")
+      settings_gradle_kts_path = File.join(project_dir, "settings.gradle.kts")
+
+      # 优先使用 settings.gradle.kts，否则使用 settings.gradle
+      settings_file = File.exist?(settings_gradle_kts_path) ? settings_gradle_kts_path : settings_gradle_path
+
+      unless File.exist?(settings_file)
+        puts "警告：未找到 settings.gradle 或 settings.gradle.kts 文件"
+        return
+      end
+
+      content = File.read(settings_file)
+      original_content = content.dup
+
+      # 模块名已经是正确的格式（如 :FGUI.androidpack）
+      pack_module_names = pack_modules
+
+      # 移除已存在的 asset pack 模块引用（避免重复）
+      pack_module_names.each do |module_name|
+        # 移除可能存在的旧引用
+        content.gsub!(/^\s*include\s+['"]#{Regexp.escape(module_name)}['"]\s*$/, '')
+        content.gsub!(/,\s*['"]#{Regexp.escape(module_name)}['"]/, '')
+      end
+
+      # 查找 include 语句的位置
+      include_pattern = /include\s+(['"]:launcher['"],\s*['"]:unityLibrary['"])/
+      if content.match(include_pattern)
+        # 在现有的 include 语句中添加 asset pack 模块
+        pack_includes = pack_module_names.map { |m| "'#{m}'" }.join(', ')
+        content.gsub!(include_pattern, "include \\1, #{pack_includes}")
+      else
+        # 如果没有找到标准格式，尝试在文件末尾添加
+        pack_includes = pack_module_names.map { |m| "'#{m}'" }.join(', ')
+        content += "\ninclude #{pack_includes}\n" unless content.include?(pack_includes)
+      end
+
+      # 只有当内容发生变化时才写入
+      if content != original_content
+        File.write(settings_file, content)
+        puts "✓ 已更新 #{File.basename(settings_file)}，注册 #{pack_modules.length} 个 Asset Pack 模块"
+        puts "  模块: #{pack_module_names.join(', ')}"
+      else
+        puts "✓ #{File.basename(settings_file)} 已包含 Asset Pack 模块引用"
+      end
+    end
+
+    # 更新 launcher/build.gradle 文件，添加 assetPacks 配置
+    def self.update_launcher_build_gradle(project_dir, pack_modules)
+      launcher_build_gradle_path = File.join(project_dir, "launcher", "build.gradle")
+      unless File.exist?(launcher_build_gradle_path)
+        puts "警告：未找到 launcher/build.gradle 文件"
+        return
+      end
+
+      content = File.read(launcher_build_gradle_path)
+      original_content = content.dup
+
+      # 检查是否已有 assetPacks 配置
+      if content.match(/assetPacks\s*=\s*\[/)
+        # 更新现有的 assetPacks 配置
+        content.gsub!(/assetPacks\s*=\s*\[[^\]]*\]/, "assetPacks = #{pack_modules.inspect}")
+      else
+        # 在 android 块中添加 assetPacks 配置
+        android_block_pattern = /(android\s*\{)/
+        if content.match(android_block_pattern)
+          # 在 android { 后添加 assetPacks 配置
+          content.gsub!(android_block_pattern, "\\1\n    assetPacks = #{pack_modules.inspect}")
+        else
+          puts "警告：未找到 android 块，无法添加 assetPacks 配置"
+          return
         end
       end
+
+      # 只有当内容发生变化时才写入
+      if content != original_content
+        File.write(launcher_build_gradle_path, content)
+        puts "✓ 已更新 launcher/build.gradle，添加 assetPacks 配置"
+      else
+        puts "✓ launcher/build.gradle 已包含 assetPacks 配置"
+      end
+    end
+
   end
 end

data/lib/pindo/module/appstore/bundleid_helper.rb

@@ -0,0 +1,349 @@
+require 'spaceship'
+require 'json'
+
+module Pindo
+  # Bundle ID 管理辅助类
+  # 负责在 Apple 开发者中心创建和配置 Bundle ID
+  class BundleIdHelper
+
+    # 从配置文件中提取所有必要的信息
+    # @param config_json [Hash] 配置 JSON 对象
+    # @return [Hash] 提取的配置信息
+    def self.extract_config_info(config_json)
+      config_info = {}
+
+      # 提取 Apple ID
+      if config_json['account_info'] && config_json['account_info']['apple_acount_id']
+        config_info[:apple_id] = config_json['account_info']['apple_acount_id']
+      end
+
+      # 提取 Bundle ID 信息
+      if config_json['app_info']
+        app_info = config_json['app_info']
+        config_info[:bundle_id] = app_info['app_identifier']
+        config_info[:bundle_id_pushcontent] = app_info['app_identifier_pushcontent']
+        config_info[:bundle_id_pushservice] = app_info['app_identifier_pushservice']
+        config_info[:bundle_id_keyboard] = app_info['app_identifier_keyboard']
+        config_info[:bundle_id_imessage] = app_info['app_identifier_imessage']
+        config_info[:bundle_id_extension] = app_info['app_identifier_extension']
+        config_info[:bundle_id_siri] = app_info['app_identifier_siri']
+        config_info[:bundle_id_siriui] = app_info['app_identifier_siriui']
+        config_info[:bundle_id_widget] = app_info['app_identifier_widget']
+        config_info[:bundle_id_extensionad] = app_info['app_identifier_extensionad']
+        config_info[:bundle_id_watchapp] = app_info['app_identifier_watchapp']
+        config_info[:bundle_id_watchapp_extension] = app_info['app_identifier_watchapp_extension']
+      end
+
+      # 提取 App Group 和 iCloud ID
+      if config_json['app_setting']
+        app_setting = config_json['app_setting']
+        config_info[:group_id] = app_setting['app_group_id']
+        config_info[:icloud_id] = app_setting['app_icloud_id']
+      end
+
+      config_info
+    end
+
+    # 执行 Bundle ID 创建流程
+    # @param config_json [Hash] 配置 JSON 对象
+    # @param sign_flag [Boolean] 签名标志
+    def self.execute_bundleid_creation(config_json:, sign_flag: false)
+      # 提取配置信息
+      config_info = extract_config_info(config_json)
+
+      # 验证必需字段
+      raise "配置文件中缺少 Apple ID" if config_info[:apple_id].nil? || config_info[:apple_id].empty?
+      raise "配置文件中缺少 Bundle ID" if config_info[:bundle_id].nil? || config_info[:bundle_id].empty?
+
+      # 登录 Apple 开发者中心
+      puts config_info[:apple_id]
+      puts "Login #{config_info[:apple_id]}..."
+      Spaceship.login(config_info[:apple_id].to_s)
+      Spaceship.select_team
+
+      # 创建 App Group
+      app_group = nil
+      if !config_info[:group_id].nil?
+        app_group = create_group_id(group_id: config_info[:group_id])
+      end
+
+      # 配置参数
+      parms = ["push_notification", "app_group"]
+
+      # 创建 iCloud ID
+      app_icloud = nil
+      if !config_info[:icloud_id].nil?
+        app_icloud = create_icloud_id(icloud_id: config_info[:icloud_id])
+        parms << "iclound"
+      end
+
+      # 创建主应用 Bundle ID
+      app = create_bundleid(
+        bundle_id: config_info[:bundle_id],
+        app_group: app_group,
+        app_icloud: app_icloud,
+        setting_array: parms
+      )
+
+      # 创建各种扩展的 Bundle ID
+      create_extension_bundleids(app, app_group, app_icloud, config_info)
+    end
+
+    # 创建 Bundle ID
+    # @param bundle_id [String] Bundle ID
+    # @param app_group [Object] App Group 对象
+    # @param app_icloud [Object] iCloud Container 对象
+    # @param setting_array [Array] 配置数组
+    # @return [Object] 创建的 App 对象
+    def self.create_bundleid(bundle_id:, app_group: nil, app_icloud: nil, setting_array: [])
+      return nil if bundle_id.nil?
+
+      # 查找或创建 Bundle ID
+      app = Spaceship::Portal.app.find(bundle_id)
+      puts
+
+      if app.nil?
+        puts "Create bundle id #{bundle_id} in apple developer center..."
+        app = Spaceship::Portal.app.create!(bundle_id: bundle_id, name: bundle_id.gsub('.', ''))
+      else
+        puts "Find bundle id #{bundle_id} in apple developer center..."
+      end
+
+      bundle_id_obj = Spaceship::ConnectAPI::BundleId.find(bundle_id)
+
+      # 配置 Game Center
+      if !bundle_id_obj.nil?
+        if !setting_array.nil? && setting_array.to_s.include?("game_center")
+          puts "Enable #{bundle_id} game_center on"
+          bundle_id_obj.update_capability("GAME_CENTER", enabled: true)
+        else
+          puts "Enable #{bundle_id} game_center off"
+          bundle_id_obj.update_capability("GAME_CENTER", enabled: false)
+        end
+      end
+
+      return nil if setting_array.nil? || setting_array.length == 0
+
+      # 配置 Push Notification
+      if !app.nil? && setting_array.to_s.include?("push_notification")
+        puts "Enable #{bundle_id} push on"
+        app.update_service(Spaceship::Portal.app_service.push_notification.on)
+      else
+        app.update_service(Spaceship::Portal.app_service.push_notification.off)
+        puts "Enable #{bundle_id} push off"
+      end
+
+      # 配置 Siri
+      if !app.nil? && setting_array.to_s.include?("siri")
+        puts "Enable #{bundle_id} siri on"
+        app.update_service(Spaceship::Portal.app_service.siri_kit.on)
+      else
+        app.update_service(Spaceship::Portal.app_service.siri_kit.off)
+        puts "Enable #{bundle_id} siri off"
+      end
+
+      # 配置 Sign with Apple
+      if !bundle_id_obj.nil? && setting_array.to_s.include?("apple_signin")
+        puts "Enable #{bundle_id} Sign with Apple on"
+        settings = build_settings_for(settings_key: "APPLE_ID_AUTH_APP_CONSENT", options_key: "PRIMARY_APP_CONSENT")
+        bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: true, settings: settings)
+      else
+        puts "Enable #{bundle_id} Sign with Apple off"
+        bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: false)
+      end
+
+      # 配置 App Group
+      if !app_group.nil? && setting_array.to_s.include?("app_group")
+        puts "Enable #{bundle_id} group on"
+        app.update_service(Spaceship::Portal.app_service.app_group.on)
+        app.associate_groups([app_group])
+      else
+        puts "Enable #{bundle_id} group off"
+        app.update_service(Spaceship::Portal.app_service.app_group.off)
+      end
+
+      # 配置 iCloud
+      if !app_icloud.nil? && setting_array.to_s.include?("iclound")
+        puts "Enable #{bundle_id} icloud on"
+        app.update_service(Spaceship::Portal.app_service.cloud.on)
+        app.update_service(Spaceship::Portal.app_service.cloud_kit.cloud_kit)
+        app.associate_cloud_containers([app_icloud])
+      else
+        puts "Enable #{bundle_id} icloud off"
+        app.update_service(Spaceship::Portal.app_service.cloud.off)
+      end
+
+      app
+    end
+
+    # 创建 App Group
+    # @param group_id [String] Group ID
+    # @return [Object] App Group 对象
+    def self.create_group_id(group_id:)
+      return nil if group_id.nil?
+
+      app_group = Spaceship::Portal.app_group.find(group_id)
+
+      if app_group.nil?
+        puts "Create group_id #{group_id} in apple developer center..."
+        app_group = Spaceship::Portal.app_group.create!(group_id: group_id, name: group_id.gsub('.', ''))
+      else
+        puts "Group_id #{group_id} is existed in apple developer center !!!"
+      end
+
+      app_group
+    end
+
+    # 创建 iCloud Container
+    # @param icloud_id [String] iCloud ID
+    # @return [Object] iCloud Container 对象
+    def self.create_icloud_id(icloud_id:)
+      return nil if icloud_id.nil?
+
+      puts "icloud_id +++++ #{icloud_id}"
+      app_icloud = Spaceship::Portal.cloud_container.find(icloud_id)
+
+      if app_icloud.nil?
+        puts "Create icloud_id #{icloud_id} in apple developer center..."
+        app_icloud = Spaceship::Portal.cloud_container.create!(identifier: icloud_id, name: icloud_id.gsub('.', ''))
+      else
+        puts "icloud_id #{icloud_id} is existed in apple developer center !!!"
+      end
+
+      app_icloud
+    end
+
+    # 构建设置
+    # @param settings_key [String] 设置键
+    # @param options_key [String] 选项键
+    # @return [Array] 设置数组
+    def self.build_settings_for(settings_key:, options_key:)
+      [{
+        key: settings_key,
+        options: [{
+          key: options_key
+        }]
+      }]
+    end
+
+    # 创建扩展的 Bundle ID
+    # @param app [Object] 主应用对象
+    # @param app_group [Object] App Group 对象
+    # @param app_icloud [Object] iCloud Container 对象
+    # @param config_info [Hash] 配置信息
+    def self.create_extension_bundleids(app, app_group, app_icloud, config_info)
+      return if app.nil?
+
+      # Push Content Extension
+      if !config_info[:bundle_id_pushcontent].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_pushcontent],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+
+      # Push Service Extension
+      if !config_info[:bundle_id_pushservice].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_pushservice],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+
+      # Keyboard Extension
+      if !config_info[:bundle_id_keyboard].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_keyboard],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # iMessage Extension
+      if !config_info[:bundle_id_imessage].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_imessage],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # Siri Extension
+      if !config_info[:bundle_id_siri].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_siri],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group", "siri"]
+        )
+      end
+
+      # Siri UI Extension
+      if !config_info[:bundle_id_siriui].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_siriui],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group", "siri"]
+        )
+      end
+
+      # Widget Extension
+      if !config_info[:bundle_id_widget].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_widget],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # General Extension
+      if !config_info[:bundle_id_extension].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_extension],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # Ad Extension
+      if !config_info[:bundle_id_extensionad].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_extensionad],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # Watch App
+      if !config_info[:bundle_id_watchapp].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_watchapp],
+          app_group: nil,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+
+      # Watch App Extension
+      if !config_info[:bundle_id_watchapp_extension].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_watchapp_extension],
+          app_group: nil,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+    end
+
+  end
+end