pindo 5.17.4 → 5.18.3

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

@@ -18,6 +18,16 @@ module Pindo
             'xxxhdpi' => 192
         }.freeze
 
+        # Android Adaptive Icon 前景层尺寸（108dp，按密度换算）
+        # 参考: Android 官方 Adaptive Icon 资源尺寸建议
+        ADAPTIVE_FOREGROUND_DENSITIES = {
+            'mdpi' => 108,
+            'hdpi' => 162,
+            'xhdpi' => 216,
+            'xxhdpi' => 324,
+            'xxxhdpi' => 432
+        }.freeze
+
         # 创建单个密度的Android icon（同时生成方形和圆形命名）
         # @param icon_name [String] 原始icon路径
         # @param new_icon_dir [String] 输出目录
@@ -36,13 +46,16 @@ module Pindo
 
                 result = {}
 
-                # 生成两个文件：ic_launcher.png 和 ic_launcher_round.png
+                # 生成两个 legacy launcher 文件：
+                # ic_launcher.png 和 ic_launcher_round.png
                 # 注意：两个都是方形，不切圆角，只是文件名不同
                 ['ic_launcher.png', 'ic_launcher_round.png'].each do |filename|
                     output_path = File.join(density_dir, filename)
 
                     command = [
                         'sips',
+                        # 强制输出 PNG，避免源图为 JPEG/WebP 时仅缩放仍写出 JPEG 导致扩展名与内容不符（AAPT2 报错）
+                        '-s', 'format', 'png',
                         '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
                         '-z', size.to_s, size.to_s,
                         icon_name,
@@ -59,6 +72,30 @@ module Pindo
                     result[filename] = output_path
                 end
 
+                # 生成 adaptive icon 前景层（用于 mipmap-anydpi-v26/ic_launcher*.xml 引用）
+                adaptive_size = ADAPTIVE_FOREGROUND_DENSITIES[density]
+                if adaptive_size
+                    foreground_filename = 'ic_launcher_foreground.png'
+                    foreground_output_path = File.join(density_dir, foreground_filename)
+                    foreground_command = [
+                        'sips',
+                        '-s', 'format', 'png',
+                        '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
+                        '-z', adaptive_size.to_s, adaptive_size.to_s,
+                        icon_name,
+                        '--out', foreground_output_path
+                    ]
+
+                    Executable.capture_command('sips', foreground_command, capture: :out)
+
+                    unless File.exist?(foreground_output_path)
+                        Funlog.instance.fancyinfo_error("生成icon失败: #{foreground_output_path}")
+                        return nil
+                    end
+
+                    result[foreground_filename] = foreground_output_path
+                end
+
                 return result
             rescue => e
                 Funlog.instance.fancyinfo_error("生成#{density}密度icon时出错: #{e.message}")
@@ -106,45 +143,63 @@ module Pindo
             return success_count > 0 ? all_icons : nil
         end
 
+        # mipmap-anydpi-v* 为 Adaptive Icon 的 layer XML 目录，清理时不可按 basename 删文件，否则会移除 ic_launcher.xml 等
+        def self.adaptive_icon_xml_resource_dir?(dir_path)
+            File.basename(dir_path.to_s).match?(/\Amipmap-anydpi-v\d+\z/i)
+        end
+
         # 清理所有旧的 icon 文件和自定义配置
         # @param res_dir [String] res 目录路径
+        # @param old_icon_refs [Array<Hash>] 旧 icon 引用，格式: [{ type: "mipmap", name: "xxx" }]
         # @return [Boolean] 是否成功清理
-        def self.clean_old_icons(res_dir:nil)
+        def self.clean_old_icons(res_dir:nil, old_icon_refs: [])
             return false unless res_dir && File.directory?(res_dir)
 
             begin
                 cleaned_items = []
 
-                # 1. 删除 adaptive icon XML 目录
-                adaptive_dir = File.join(res_dir, "mipmap-anydpi-v26")
-                if Dir.exist?(adaptive_dir)
-                    xml_files = Dir.glob(File.join(adaptive_dir, "*.xml"))
-                    FileUtils.rm_rf(adaptive_dir)
-                    cleaned_items << "adaptive XML(#{xml_files.size}个)" if xml_files.any?
+                # 1. 删除配置中引用的旧 icon 文件（根据资源类型与名称精确定位）
+                configured_icon_count = 0
+                old_icon_refs.each do |ref|
+                    next unless ref.is_a?(Hash)
+
+                    resource_type = ref[:type].to_s
+                    basename = ref[:name].to_s
+                    next if resource_type.empty? || basename.empty?
+
+                    candidate_dirs = Dir.glob(File.join(res_dir, "#{resource_type}-*"))
+                    candidate_dirs.each do |resource_dir|
+                        next unless File.directory?(resource_dir)
+                        next if adaptive_icon_xml_resource_dir?(resource_dir)
+
+                        configured_icon_count += remove_icon_files_with_same_basename(
+                            mipmap_dir: resource_dir,
+                            basename: basename
+                        )
+                    end
                 end
+                cleaned_items << "配置icon文件(#{configured_icon_count}个)" if configured_icon_count > 0
 
-                # 2. 删除所有 mipmap 目录中的旧 icon 文件
+                # 2. 删除所有 mipmap 目录中的常见旧 icon 文件（兼容历史逻辑）
                 old_png_count = 0
                 mipmap_dirs = Dir.glob(File.join(res_dir, "mipmap-*"))
 
                 mipmap_dirs.each do |mipmap_dir|
                     next unless File.directory?(mipmap_dir)
+                    next if adaptive_icon_xml_resource_dir?(mipmap_dir)
 
-                    old_files = [
-                        'app_icon.png',
-                        'app_icon_round.png',
-                        'ic_launcher_foreground.png',
-                        'ic_launcher_background.png',
-                        'ic_launcher.png',
-                        'ic_launcher_round.png'
+                    old_icon_basenames = [
+                        'app_icon',
+                        'app_icon_round',
+                        'ic_launcher',
+                        'ic_launcher_round'
                     ]
 
-                    old_files.each do |filename|
-                        file_path = File.join(mipmap_dir, filename)
-                        if File.exist?(file_path)
-                            File.delete(file_path)
-                            old_png_count += 1
-                        end
+                    old_icon_basenames.each do |basename|
+                        old_png_count += remove_icon_files_with_same_basename(
+                            mipmap_dir: mipmap_dir,
+                            basename: basename
+                        )
                     end
                 end
 
@@ -161,28 +216,215 @@ module Pindo
             end
         end
 
-        # 更新 AndroidManifest.xml 为标准配置
+        # 确保存在标准 adaptive icon XML（Android 8+）
+        # 若项目已存在 mipmap-anydpi-v26，则保持原文件不覆盖
+        # @param res_dir [String] res 目录路径
+        # @return [Boolean] 是否成功处理
+        def self.ensure_standard_adaptive_icon_xml(res_dir:nil)
+            return false unless res_dir && File.directory?(res_dir)
+
+            begin
+                adaptive_dir = File.join(res_dir, "mipmap-anydpi-v26")
+                if Dir.exist?(adaptive_dir)
+                    puts "  ✓ 检测到现有 adaptive icon 配置，保持不覆盖: mipmap-anydpi-v26"
+                    return true
+                end
+
+                FileUtils.mkdir_p(adaptive_dir)
+
+                # Android 官方建议：
+                # background 使用 @color/ic_launcher_background
+                # foreground 使用 @drawable/ic_launcher_foreground
+                # 若项目缺失上述资源，则回退到可用引用，避免构建失败。
+                background_drawable = color_resource_exists?(res_dir: res_dir, resource_name: "ic_launcher_background") ?
+                    "@color/ic_launcher_background" : "@android:color/white"
+                # 优先级:
+                # 1) drawable/ic_launcher_foreground（兼容已有项目）
+                # 2) mipmap/ic_launcher_foreground（本工具自动生成）
+                # 3) 回退到 legacy icon，避免构建失败
+                foreground_drawable = if drawable_resource_exists?(res_dir: res_dir, resource_name: "ic_launcher_foreground")
+                    "@drawable/ic_launcher_foreground"
+                elsif mipmap_resource_exists?(res_dir: res_dir, resource_name: "ic_launcher_foreground")
+                    "@mipmap/ic_launcher_foreground"
+                else
+                    "@mipmap/ic_launcher"
+                end
+                round_foreground_drawable = if drawable_resource_exists?(res_dir: res_dir, resource_name: "ic_launcher_foreground")
+                    "@drawable/ic_launcher_foreground"
+                elsif mipmap_resource_exists?(res_dir: res_dir, resource_name: "ic_launcher_foreground")
+                    "@mipmap/ic_launcher_foreground"
+                else
+                    "@mipmap/ic_launcher_round"
+                end
+
+                launcher_xml = <<~XML
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+                        <background android:drawable="#{background_drawable}" />
+                        <foreground android:drawable="#{foreground_drawable}" />
+                    </adaptive-icon>
+                XML
+
+                launcher_round_xml = <<~XML
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+                        <background android:drawable="#{background_drawable}" />
+                        <foreground android:drawable="#{round_foreground_drawable}" />
+                    </adaptive-icon>
+                XML
+
+                File.write(File.join(adaptive_dir, "ic_launcher.xml"), launcher_xml)
+                File.write(File.join(adaptive_dir, "ic_launcher_round.xml"), launcher_round_xml)
+
+                puts "  ✓ 缺失时自动创建 adaptive icon XML: mipmap-anydpi-v26"
+                true
+            rescue => e
+                Funlog.instance.fancyinfo_error("处理 adaptive icon XML 失败: #{e.message}")
+                false
+            end
+        end
+
+        # 检查 colors.xml 中是否声明了指定 color 资源（任意 values 变体目录）
+        # @param res_dir [String] res 目录路径
+        # @param resource_name [String] 资源名
+        # @return [Boolean]
+        def self.color_resource_exists?(res_dir:, resource_name:)
+            values_dirs = Dir.glob(File.join(res_dir, "values*")).select { |d| File.directory?(d) }
+            return false if values_dirs.empty?
+
+            values_dirs.any? do |dir|
+                colors_file = File.join(dir, "colors.xml")
+                next false unless File.file?(colors_file)
+
+                content = File.read(colors_file)
+                content.match?(/<color\s+name=["']#{Regexp.escape(resource_name)}["']/)
+            end
+        rescue
+            false
+        end
+
+        # 检查 drawable 资源是否存在（任意 drawable 变体目录、任意常见后缀）
+        # @param res_dir [String] res 目录路径
+        # @param resource_name [String] 资源名
+        # @return [Boolean]
+        def self.drawable_resource_exists?(res_dir:, resource_name:)
+            drawable_dirs = Dir.glob(File.join(res_dir, "drawable*")).select { |d| File.directory?(d) }
+            return false if drawable_dirs.empty?
+
+            drawable_dirs.any? do |dir|
+                Dir.glob(File.join(dir, "#{resource_name}.*")).any? { |f| File.file?(f) }
+            end
+        rescue
+            false
+        end
+
+        # 检查 mipmap 资源是否存在（任意 mipmap 变体目录、任意常见后缀）
+        # @param res_dir [String] res 目录路径
+        # @param resource_name [String] 资源名
+        # @return [Boolean]
+        def self.mipmap_resource_exists?(res_dir:, resource_name:)
+            mipmap_dirs = Dir.glob(File.join(res_dir, "mipmap*")).select { |d| File.directory?(d) }
+            return false if mipmap_dirs.empty?
+
+            mipmap_dirs.any? do |dir|
+                Dir.glob(File.join(dir, "#{resource_name}.*")).any? { |f| File.file?(f) }
+            end
+        rescue
+            false
+        end
+
+        # 从 AndroidManifest.xml 中提取 application 的 icon 资源引用
         # @param manifest_path [String] AndroidManifest.xml 文件路径
-        # @return [Boolean] 是否成功更新
-        def self.update_manifest_to_standard(manifest_path:nil)
-            return false unless manifest_path && File.exist?(manifest_path)
+        # @return [Array<Hash>] 资源引用数组，格式: [{ type: "mipmap", name: "ic_launcher", kind: "icon" }]
+        def self.extract_icon_resource_refs_from_manifest(manifest_path:nil)
+            return [] unless manifest_path && File.exist?(manifest_path)
 
             begin
                 require 'nokogiri'
 
                 content = File.read(manifest_path)
                 doc = Nokogiri::XML(content)
-
-                # 查找 <application> 标签
                 app_node = doc.at_xpath('//application')
-                return false unless app_node
+                return [] unless app_node
+
+                refs = []
+                {
+                    'android:icon' => 'icon',
+                    'android:roundIcon' => 'roundIcon'
+                }.each do |attr_name, kind|
+                    attr_value = app_node[attr_name]
+                    next unless attr_value.is_a?(String)
+
+                    if (matched = attr_value.match(/^@([a-zA-Z0-9_]+)\/([a-zA-Z0-9_]+)$/))
+                        refs << { type: matched[1], name: matched[2], kind: kind }
+                    end
+                end
+
+                refs.uniq { |ref| [ref[:type], ref[:name], ref[:kind]] }
+            rescue => e
+                Funlog.instance.fancyinfo_error("解析 AndroidManifest icon 配置失败: #{e.message}")
+                []
+            end
+        end
+
+        # 在目录内查找最匹配的 icon 文件
+        # @param source_dir [String] 目录路径
+        # @param round [Boolean] 是否查找 round icon
+        # @return [String, nil] 文件绝对路径
+        def self.find_best_icon_source_file(source_dir:, round: false)
+            return nil unless source_dir && File.directory?(source_dir)
+
+            exact_names = round ? %w[ic_launcher_round app_icon_round] : %w[ic_launcher app_icon]
+            ext_order = %w[png webp]
+
+            exact_names.each do |basename|
+                ext_order.each do |ext|
+                    candidate = File.join(source_dir, "#{basename}.#{ext}")
+                    return candidate if File.file?(candidate)
+                end
+            end
 
-                # 设置标准 icon 配置
-                app_node['android:icon'] = '@mipmap/ic_launcher'
-                app_node['android:roundIcon'] = '@mipmap/ic_launcher_round'
+            image_files = Dir.glob(File.join(source_dir, "*.{png,webp}")).select { |f| File.file?(f) }
+            return nil if image_files.empty?
 
-                # 保存文件
-                File.write(manifest_path, doc.to_xml)
+            round_match = /(?:^|[_-])(round|launcher_round|ic_round)(?:[_-]|$)/i
+            non_round_files = image_files.reject { |f| File.basename(f, File.extname(f)).match?(round_match) }
+            round_files = image_files.select { |f| File.basename(f, File.extname(f)).match?(round_match) }
+
+            selected = round ? round_files.first : non_round_files.first
+            selected || image_files.first
+        end
+
+        # 删除目录下同名不同后缀图标（例如 ic_launcher.png / ic_launcher.webp）
+        # @param mipmap_dir [String] mipmap 目录路径
+        # @param basename [String] 图标基础名称（不带后缀）
+        # @return [Integer] 删除的文件数量
+        def self.remove_icon_files_with_same_basename(mipmap_dir:, basename:)
+            return 0 unless File.directory?(mipmap_dir)
+            return 0 if basename.nil? || basename.empty?
+
+            removed = 0
+            Dir.glob(File.join(mipmap_dir, "#{basename}.*")).each do |file_path|
+                next unless File.file?(file_path)
+
+                File.delete(file_path)
+                removed += 1
+            end
+            removed
+        end
+
+        # 更新 AndroidManifest.xml 为标准配置
+        # @param manifest_path [String] AndroidManifest.xml 文件路径
+        # @return [Boolean] 是否成功更新
+        def self.update_manifest_to_standard(manifest_path:nil)
+            return false unless manifest_path && File.exist?(manifest_path)
+
+            begin
+                content = File.read(manifest_path)
+                updated = update_manifest_icon_attributes_in_place(content)
+                return false unless updated
+
+                File.write(manifest_path, updated)
 
                 puts "  ✓ AndroidManifest.xml 已更新为标准 icon 配置"
 
@@ -193,6 +435,30 @@ module Pindo
             end
         end
 
+        def self.update_manifest_icon_attributes_in_place(xml_content)
+            icon_value = "@mipmap/ic_launcher"
+            round_value = "@mipmap/ic_launcher_round"
+
+            # 仅修改 <application ...> 开始标签内的 android:icon/android:roundIcon，避免整体格式化。
+            xml_content.sub(/<application\b[^>]*>/m) do |app_tag|
+                updated_tag = app_tag.dup
+
+                if updated_tag.match?(/\bandroid:icon\s*=\s*["'][^"']*["']/)
+                    updated_tag.gsub!(/\bandroid:icon\s*=\s*(["'])[^"']*\1/, %(android:icon="#{icon_value}"))
+                else
+                    updated_tag.sub!(/<application\b/, %(<application android:icon="#{icon_value}"))
+                end
+
+                if updated_tag.match?(/\bandroid:roundIcon\s*=\s*["'][^"']*["']/)
+                    updated_tag.gsub!(/\bandroid:roundIcon\s*=\s*(["'])[^"']*\1/, %(android:roundIcon="#{round_value}"))
+                else
+                    updated_tag.sub!(/<application\b/, %(<application android:roundIcon="#{round_value}"))
+                end
+
+                updated_tag
+            end
+        end
+
         # 安装Android icon到项目中（完全标准化方案）
         # @param proj_dir [String] Android项目目录
         # @param new_icon_dir [String] icon文件目录（包含各密度文件夹）
@@ -224,10 +490,7 @@ module Pindo
                     FileUtils.mkdir_p(res_dir)
                 end
 
-                # 2. 清理所有旧的 icon 资源
-                clean_old_icons(res_dir: res_dir)
-
-                # 3. 查找并更新 AndroidManifest.xml
+                # 2. 查找 AndroidManifest.xml 并提取旧 icon 引用
                 manifest_paths = [
                     File.join(proj_dir, "launcher/src/main/AndroidManifest.xml"),
                     File.join(proj_dir, "app/src/main/AndroidManifest.xml"),
@@ -235,15 +498,21 @@ module Pindo
                 ]
 
                 manifest_path = manifest_paths.find { |path| File.exist?(path) }
+                old_icon_refs = extract_icon_resource_refs_from_manifest(manifest_path: manifest_path)
+
+                # 3. 清理所有旧的 icon 资源
+                clean_old_icons(res_dir: res_dir, old_icon_refs: old_icon_refs)
+
+                # 4. 更新 AndroidManifest.xml 为标准 icon 配置
 
                 if manifest_path
                     update_manifest_to_standard(manifest_path: manifest_path)
                 end
 
-                # 3.5 更新所有 XML 文件中的图标引用
-                update_all_xml_icon_references(proj_dir: proj_dir)
+                # 4.5 更新所有 XML 文件中的图标引用
+                update_all_xml_icon_references(proj_dir: proj_dir, old_icon_refs: old_icon_refs)
 
-                # 4. 安装标准 icon 文件
+                # 5. 安装标准 icon 文件
                 success_count = 0
                 densities_installed = []
 
@@ -256,23 +525,35 @@ module Pindo
                     # 创建目标目录
                     FileUtils.mkdir_p(target_dir) unless File.directory?(target_dir)
 
-                    # 标准配置：只复制 ic_launcher.png 和 ic_launcher_round.png
+                    # 先清理同名不同后缀，避免 aapt2 Duplicate resources (png/webp 并存)
+                    remove_icon_files_with_same_basename(mipmap_dir: target_dir, basename: "ic_launcher")
+                    remove_icon_files_with_same_basename(mipmap_dir: target_dir, basename: "ic_launcher_round")
+                    remove_icon_files_with_same_basename(mipmap_dir: target_dir, basename: "ic_launcher_foreground")
+
+                    icon_source = find_best_icon_source_file(source_dir: source_dir, round: false)
+                    round_source = find_best_icon_source_file(source_dir: source_dir, round: true)
+                    foreground_source = find_best_icon_source_file(source_dir: source_dir, round: false)
+                    explicit_foreground_png = File.join(source_dir, "ic_launcher_foreground.png")
+                    explicit_foreground_webp = File.join(source_dir, "ic_launcher_foreground.webp")
+                    foreground_source = explicit_foreground_png if File.file?(explicit_foreground_png)
+                    foreground_source = explicit_foreground_webp if File.file?(explicit_foreground_webp)
                     files_to_copy = [
-                        { source: 'ic_launcher.png', target: 'ic_launcher.png' },
-                        { source: 'ic_launcher_round.png', target: 'ic_launcher_round.png' }
+                        { source_file: icon_source, target: 'ic_launcher.png' },
+                        { source_file: round_source, target: 'ic_launcher_round.png' },
+                        { source_file: foreground_source, target: 'ic_launcher_foreground.png' }
                     ]
 
                     density_success = 0
                     files_to_copy.each do |file_map|
-                        source_file = File.join(source_dir, file_map[:source])
+                        source_file = file_map[:source_file]
                         target_file = File.join(target_dir, file_map[:target])
 
-                        if File.exist?(source_file)
+                        if source_file && File.exist?(source_file)
                             FileUtils.cp(source_file, target_file)
                             success_count += 1
                             density_success += 1
                         else
-                            Funlog.instance.fancyinfo_error("源文件不存在: #{file_map[:source]}")
+                            Funlog.instance.fancyinfo_error("源文件不存在: #{file_map[:target]}")
                         end
                     end
 
@@ -283,6 +564,9 @@ module Pindo
                     puts "  ✓ 已安装标准 icon: #{densities_installed.join(', ')} (共#{success_count}个文件)"
                 end
 
+                # 6. 确保 adaptive icon XML 存在（已有配置不覆盖，缺失时补齐）
+                ensure_standard_adaptive_icon_xml(res_dir: res_dir)
+
                 return success_count > 0
 
             rescue => e
@@ -294,8 +578,9 @@ module Pindo
 
         # 更新所有 XML 文件中的图标引用（从旧名称更新为标准名称）
         # @param proj_dir [String] Android项目目录
+        # @param old_icon_refs [Array<Hash>] 旧 icon 引用
         # @return [Boolean] 是否成功更新
-        def self.update_all_xml_icon_references(proj_dir: nil)
+        def self.update_all_xml_icon_references(proj_dir: nil, old_icon_refs: [])
             return false unless proj_dir && File.directory?(proj_dir)
 
             begin
@@ -309,15 +594,28 @@ module Pindo
                     content = File.read(xml_file)
                     original_content = content.dup
 
-                    # 替换所有旧的图标引用为标准名称
+                    # 替换 manifest 中已解析到的旧图标引用
+                    old_icon_refs.each do |ref|
+                        next unless ref.is_a?(Hash)
+
+                        old_name = ref[:name].to_s
+                        kind = ref[:kind].to_s
+                        next if old_name.empty?
+
+                        new_name = kind == "roundIcon" ? "ic_launcher_round" : "ic_launcher"
+                        content.gsub!(/@mipmap\/#{Regexp.escape(old_name)}(?=["'\s>])/, "@mipmap/#{new_name}")
+                        content.gsub!(/@drawable\/#{Regexp.escape(old_name)}(?=["'\s>])/, "@mipmap/#{new_name}")
+                    end
+
+                    # 替换常见旧图标引用为标准名称
                     # app_icon -> ic_launcher
                     # app_icon_round -> ic_launcher_round
                     # 使用正则表达式精确匹配，避免替换 app_icon_topleft 等变体
                     # (?=["'\s>]) 表示后面必须是引号、空格或尖括号（但不包含在替换结果中）
                     content.gsub!(/@mipmap\/app_icon_round(?=["'\s>])/, '@mipmap/ic_launcher_round')
                     content.gsub!(/@mipmap\/app_icon(?=["'\s>])/, '@mipmap/ic_launcher')
-                    content.gsub!(/@drawable\/app_icon_round(?=["'\s>])/, '@drawable/ic_launcher_round')
-                    content.gsub!(/@drawable\/app_icon(?=["'\s>])/, '@drawable/ic_launcher')
+                    content.gsub!(/@drawable\/app_icon_round(?=["'\s>])/, '@mipmap/ic_launcher_round')
+                    content.gsub!(/@drawable\/app_icon(?=["'\s>])/, '@mipmap/ic_launcher')
 
                     # 如果内容有变化，保存文件
                     if content != original_content