pindo 5.17.4 → 5.18.3

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

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'open-uri'
+require 'json'
 require_relative '../../base/funlog'
 require_relative 'android_project_helper'
 require_relative '../../base/executable'
@@ -431,6 +432,105 @@ module Pindo
             end
         end
 
+        # 从 Android 导出工程路径推断 Unity 工程根目录（GoodPlatform/BaseAndroid 布局）
+        # @param export_project_dir [String] 例如 GoodPlatform/BaseAndroid
+        # @return [String, nil] Unity 根目录绝对路径，无法推断时返回 nil
+        def self.infer_unity_project_root_from_export_dir(export_project_dir)
+            return nil if export_project_dir.nil? || !File.directory?(export_project_dir)
+
+            abs = File.expand_path(export_project_dir)
+            base = File.basename(abs)
+            parent = File.basename(File.dirname(abs))
+            if base == 'BaseAndroid' && parent == 'GoodPlatform'
+                return File.expand_path('../..', abs)
+            end
+
+            dir = abs
+            8.times do
+                if File.directory?(File.join(dir, 'Assets')) &&
+                   File.directory?(File.join(dir, 'ProjectSettings'))
+                    return dir
+                end
+                parent_dir = File.dirname(dir)
+                break if parent_dir == dir
+
+                dir = parent_dir
+            end
+            nil
+        end
+
+        # Unity 工程中 Firebase Android 配置（Editor 与 Gradle 均可能读取）
+        # @param unity_root [String] Unity 工程根目录
+        # @return [String]
+        def self.unity_assets_firebase_google_services_path(unity_root)
+            File.join(unity_root, 'Assets', 'Scripts', 'Firebase', 'google-services.json')
+        end
+
+        # Unity Editor 侧 Firebase 可能读取的桌面配置（与 Assets/Firebase 下 json 宜保持一致）
+        # @param unity_root [String] Unity 工程根目录
+        # @return [String]
+        def self.unity_streaming_assets_google_services_desktop_path(unity_root)
+            File.join(unity_root, 'Assets', 'StreamingAssets', 'google-services-desktop.json')
+        end
+
+        # @param clients [Array]
+        # @param package_name [String]
+        # @return [Boolean]
+        def self.google_services_has_android_package?(clients, package_name)
+            return false unless clients.is_a?(Array)
+
+            clients.any? do |c|
+                next false unless c.is_a?(Hash)
+                ci = c['client_info']
+                next false unless ci.is_a?(Hash)
+                aci = ci['android_client_info']
+                aci.is_a?(Hash) && aci['package_name'] == package_name
+            end
+        end
+
+        # 取首个含 android_client_info.package_name 的 client，作为追加新包名时的模板
+        # @param clients [Array]
+        # @return [Hash, nil]
+        def self.google_services_first_android_client(clients)
+            return nil unless clients.is_a?(Array)
+
+            clients.each do |c|
+                next unless c.is_a?(Hash)
+                ci = c['client_info']
+                next unless ci.is_a?(Hash)
+                aci = ci['android_client_info']
+                if aci.is_a?(Hash) && aci['package_name'].is_a?(String) && !aci['package_name'].empty?
+                    return c
+                end
+            end
+            nil
+        end
+
+        # 不修改已有 client；若尚无目标 package_name，则深拷贝模板 client 并追加
+        # @param json [Hash]
+        # @param package_name [String]
+        # @return [Boolean] 是否追加了新 client
+        def self.google_services_merge_android_package!(json, package_name)
+            return false unless json.is_a?(Hash)
+
+            clients = json['client']
+            return false unless clients.is_a?(Array) && !clients.empty?
+
+            return false if google_services_has_android_package?(clients, package_name)
+
+            template = google_services_first_android_client(clients)
+            unless template
+                return false
+            end
+
+            new_client = JSON.parse(JSON.generate(template))
+            new_client['client_info'] ||= {}
+            new_client['client_info']['android_client_info'] ||= {}
+            new_client['client_info']['android_client_info']['package_name'] = package_name
+            clients << new_client
+            true
+        end
+
         # 从配置仓库拷贝 google-services.json 到项目的 launcher 目录
         # @param config_repo_dir [String] 配置仓库的路径
         # @param project_dir [String] Android项目目录路径
@@ -493,9 +593,94 @@ module Pindo
                 puts "  ⚠ 请确认文件位置是否正确"
             end
 
+            # Unity Editor（Firebase.Editor）也会读取 Assets/Scripts/Firebase/google-services.json
+            unity_root = infer_unity_project_root_from_export_dir(project_dir)
+            if unity_root && File.directory?(File.join(unity_root, 'Assets'))
+                assets_firebase_dir = File.join(unity_root, 'Assets', 'Scripts', 'Firebase')
+                FileUtils.mkdir_p(assets_firebase_dir)
+                unity_gs = File.join(assets_firebase_dir, 'google-services.json')
+                FileUtils.cp(source_file, unity_gs)
+                puts "  ✓ google-services.json 已拷贝到: #{unity_gs}"
+            end
+
             return true
         end
 
+        # 与 update_google_services_package_name 相同的候选路径（不一定存在）
+        def self.google_services_json_candidate_paths(project_dir)
+            candidates = [
+                File.join(project_dir, 'unityLibrary', 'launcher', 'google-services.json'),
+                File.join(project_dir, 'unityLibrary', 'google-services.json'),
+                File.join(project_dir, 'launcher', 'google-services.json'),
+                File.join(project_dir, 'app', 'google-services.json'),
+                File.join(project_dir, 'google-services.json')
+            ]
+            unity_root = infer_unity_project_root_from_export_dir(project_dir)
+            if unity_root
+                candidates << unity_assets_firebase_google_services_path(unity_root)
+                candidates << unity_streaming_assets_google_services_desktop_path(unity_root)
+            end
+            candidates.uniq
+        end
+
+        # @param project_dir [String]
+        # @return [Array<String>] 项目内已存在的 google-services.json 绝对路径
+        def self.existing_google_services_json_paths(project_dir)
+            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+            raise ArgumentError, "项目路径无效: #{project_dir}" unless File.directory?(project_dir)
+
+            google_services_json_candidate_paths(project_dir).select { |p| File.exist?(p) }
+        end
+
+        # 在 google-services.json 的 client 数组中确保存在目标 Android package_name：不改写已有 client，
+        # 仅当尚不存在时深拷贝模板 client 并追加，避免切换 bundle id / applicationId 时 Firebase Unity SDK 反复弹窗。
+        # @param project_dir [String] Android项目目录路径
+        # @param package_name [String] 目标 applicationId（例如: com.heroneverdie101.fancyapptest）
+        # @return [Boolean] 是否至少在一个文件中新追加了 client（已存在目标包名则视为无需写入）
+        def self.update_google_services_package_name(project_dir: nil, package_name: nil)
+            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+            raise ArgumentError, "Package Name不能为空" if package_name.nil? || package_name.empty?
+            raise ArgumentError, "项目路径无效: #{project_dir}" unless File.directory?(project_dir)
+
+            target_files = existing_google_services_json_paths(project_dir)
+            if target_files.empty?
+                Funlog.instance.fancyinfo_warning("未找到 google-services.json，无法合并 package_name: #{package_name}")
+                return false
+            end
+
+            updated_any = false
+
+            target_files.each do |target_file|
+                begin
+                    raw = File.read(target_file)
+                    json = JSON.parse(raw)
+
+                    unless json.is_a?(Hash) && json['client'].is_a?(Array) && !json['client'].empty?
+                        Funlog.instance.fancyinfo_warning("google-services.json 缺少有效 client 数组，跳过: #{target_file}")
+                        next
+                    end
+
+                    unless google_services_first_android_client(json['client'])
+                        Funlog.instance.fancyinfo_warning("google-services.json 中无可用 Android client 模板，跳过: #{target_file}")
+                        next
+                    end
+
+                    merged = google_services_merge_android_package!(json, package_name)
+                    if merged
+                        File.write(target_file, JSON.pretty_generate(json) + "\n")
+                        puts "  ✓ 已合并 #{File.basename(target_file)}：新增 client package_name #{package_name}（保留原有条目）"
+                        updated_any = true
+                    end
+                rescue JSON::ParserError
+                    Funlog.instance.fancyinfo_warning("google-services.json 不是合法 JSON，跳过更新: #{target_file}")
+                rescue StandardError => e
+                    Funlog.instance.fancyinfo_warning("更新 google-services.json 失败: #{e.message} (#{target_file})")
+                end
+            end
+
+            updated_any
+        end
+
         # 从配置仓库应用配置（拷贝 config.json）
         # @param config_repo_dir [String] 配置仓库的路径
         # @param project_dir [String] Android项目目录路径
@@ -661,13 +846,9 @@ module Pindo
                 return true
             end
 
-            # 尝试使用DOM添加
-            success = add_scheme_with_dom(manifest_path, main_activity, android_prefix, scheme_name)
-
-            unless success
-                # DOM方法失败，尝试文本替换
-                success = add_scheme_with_text_replace(manifest_path, scheme_name)
-            end
+            # 为了避免 Nokogiri 重新序列化导致整体格式变化，优先使用文本方式局部插入。
+            activity_name = main_activity["name"] || main_activity["android:name"] || main_activity["#{android_prefix}:name"]
+            success = add_scheme_with_text_replace(manifest_path, scheme_name, activity_name: activity_name)
 
             unless success
                 Funlog.instance.fancyinfo_error("无法添加scheme: #{scheme_name}")
@@ -772,33 +953,17 @@ module Pindo
             [scheme_exists, existing_scheme]
         end
 
-        # 使用DOM操作添加scheme
-        def self.add_scheme_with_dom(manifest_path, activity, android_prefix, scheme_name)
+        # 使用文本替换添加scheme
+        def self.add_scheme_with_text_replace(manifest_path, scheme_name, activity_name: nil)
             begin
-                doc = Nokogiri::XML(File.read(manifest_path))
-
-                # 创建intent-filter
-                intent_filter = doc.create_element('intent-filter')
-
-                # 添加子元素
-                intent_filter.add_child(create_element(doc, 'action', "#{android_prefix}:name", 'android.intent.action.VIEW'))
-                intent_filter.add_child(create_element(doc, 'category', "#{android_prefix}:name", 'android.intent.category.DEFAULT'))
-                intent_filter.add_child(create_element(doc, 'category', "#{android_prefix}:name", 'android.intent.category.BROWSABLE'))
-                intent_filter.add_child(create_element(doc, 'data', "#{android_prefix}:scheme", scheme_name))
-
-                # 添加空白和缩进
-                activity.add_child(doc.create_text_node("\n      "))
-                activity.add_child(intent_filter)
-                activity.add_child(doc.create_text_node("\n    "))
+                # 读取原始内容
+                xml_content = File.read(manifest_path)
 
-                # 保存修改
-                xml_content = doc.to_xml(indent: 2, encoding: 'UTF-8')
+                modified_xml = insert_scheme_intent_filter_before_activity_close(xml_content, scheme_name, activity_name: activity_name)
+                return false unless modified_xml
 
-                # 验证修改是否成功
-                if xml_content.include?("android:scheme=\"#{scheme_name}\"")
-                    File.write(manifest_path, xml_content)
-                    return true
-                end
+                File.write(manifest_path, modified_xml)
+                return true
 
                 return false
             rescue => e
@@ -806,75 +971,127 @@ module Pindo
             end
         end
 
-        # 创建XML元素并设置属性
-        def self.create_element(doc, name, attr_name, attr_value)
-            element = doc.create_element(name)
-            element[attr_name] = attr_value
-            element
-        end
-
-        # 使用文本替换添加scheme
-        def self.add_scheme_with_text_replace(manifest_path, scheme_name)
+        def self.update_existing_scheme(manifest_path, activity, android_prefix, existing_scheme, scheme_name)
             begin
-                # 读取原始内容
                 xml_content = File.read(manifest_path)
+                modified = update_scheme_value_in_place(xml_content, existing_scheme, scheme_name)
+                return false unless modified
 
-                # 定义要添加的intent-filter
-                scheme_intent_filter = %Q{
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="#{scheme_name}"/>
-      </intent-filter>}
-
-                # 在</activity>前添加intent-filter
-                if xml_content.match(/<\/activity>/)
-                    modified_xml = xml_content.gsub(/<\/activity>/) do |match|
-                        "#{scheme_intent_filter}\n    #{match}"
-                    end
-
-                    # 保存修改
-                    File.write(manifest_path, modified_xml)
-                    return true
-                end
-
-                return false
+                File.write(manifest_path, modified)
+                true
             rescue => e
                 return false
             end
         end
 
-        def self.update_existing_scheme(manifest_path, activity, android_prefix, existing_scheme, scheme_name)
-            begin
-                doc = Nokogiri::XML(File.read(manifest_path))
-
-                # 查找所有intent-filter
-                intent_filters = doc.xpath("//intent-filter")
-
-                intent_filters.each do |intent_filter|
-                    # 检查intent-filter中的scheme
-                    intent_filter.xpath("data[@#{android_prefix}:scheme]").each do |data|
-                        current_scheme = data["#{android_prefix}:scheme"]
-                        if current_scheme == existing_scheme
-                            # 找到intent-filter，更新scheme
-                            data["#{android_prefix}:scheme"] = scheme_name
-                        end
-                    end
-                end
+        def self.update_scheme_value_in_place(xml_content, existing_scheme, scheme_name)
+            return nil if xml_content.to_s.empty?
+            return nil if existing_scheme.to_s.empty? || scheme_name.to_s.empty?
 
-                # 保存修改
-                xml_content = doc.to_xml(indent: 2, encoding: 'UTF-8')
+            # 尽量局部替换 data 的 android:scheme / scheme 属性值，避免重排整个 XML。
+            patterns = [
+                /(?<attr>\bandroid:scheme)\s*=\s*(?<q>["'])#{Regexp.escape(existing_scheme)}\k<q>/,
+                /(?<attr>\bscheme)\s*=\s*(?<q>["'])#{Regexp.escape(existing_scheme)}\k<q>/
+            ]
 
-                # 验证修改是否成功
-                if xml_content.include?("android:scheme=\"#{scheme_name}\"")
-                    File.write(manifest_path, xml_content)
-                    return true
+            patterns.each do |pat|
+                next unless xml_content.match?(pat)
+                return xml_content.gsub(pat) { |m| %(#{$~[:attr]}="#{scheme_name}") }
+            end
+
+            nil
+        end
+
+        def self.insert_scheme_intent_filter_before_activity_close(xml_content, scheme_name, activity_name: nil)
+            return nil if xml_content.to_s.empty?
+
+            newline = xml_content.include?("\r\n") ? "\r\n" : "\n"
+
+            activity_block = nil
+            if activity_name && !activity_name.to_s.empty?
+                name = Regexp.escape(activity_name.to_s)
+                # 锁定到目标 activity（兼容 android:name / name）
+                activity_block = xml_content.match(
+                    /(?<open><activity\b[^>]*(?:\bandroid:name|\bname)\s*=\s*["']#{name}["'][^>]*>)(?<inner>.*?)(?<close><\/activity>)/m
+                )
+            end
+
+            # 找不到目标 activity 时，再退化为第一个 </activity>（保持向后兼容）
+            if activity_block
+                open_tag = activity_block[:open]
+                inner = activity_block[:inner]
+                # close 缩进必须与原文件一致（避免 </activity> 顶格）
+                close_line_indent =
+                    activity_block[0].match(/^(?<indent>[ \t]*)<\/activity>\s*$/m)&.[](:indent) ||
+                    activity_block[0].match(/^(?<indent>[ \t]*)<activity\b/m)&.[](:indent) ||
+                    ""
+                close_line = "#{close_line_indent}</activity>"
+
+                # 复用该 activity 内已存在 intent-filter 的缩进（取最短的，避免被历史插歪的块污染）
+                intent_filter_indents = inner.scan(/^(?<indent>[ \t]*)<intent-filter\b/m).flatten
+                child_indent = intent_filter_indents.reject(&:empty?).min_by(&:length)
+
+                # 如果没有 intent-filter，则尝试复用其它子元素缩进
+                child_indent ||= inner.scan(/^(?<indent>[ \t]*)<(?:action|category|data)\b/m).flatten.reject(&:empty?).min_by(&:length)
+
+                # 如果 activity 内部完全没有子元素，则用 close_tag 行缩进推导
+                unless child_indent
+                    # 默认与现有 AndroidManifest 常见风格对齐：activity 内缩进步长通常为 4
+                    child_indent = close_line_indent + "    "
                 end
 
-                return false
-            rescue => e
-                return false
+                # 推导 intent-filter 内部子元素的缩进步长（2/4/tab 都兼容）
+                existing_grandchild = inner.match(/^(?<indent>[ \t]*)<(?:action|category|data)\b/m)&.[](:indent)
+                indent_step = nil
+                if existing_grandchild && existing_grandchild.start_with?(child_indent)
+                    step = existing_grandchild.delete_prefix(child_indent)
+                    indent_step = step unless step.empty?
+                end
+                indent_step ||= "    "
+                grandchild_indent = child_indent + indent_step
+
+                block = [
+                    "#{child_indent}<intent-filter>",
+                    "#{grandchild_indent}<action android:name=\"android.intent.action.VIEW\" />",
+                    "#{grandchild_indent}<category android:name=\"android.intent.category.DEFAULT\" />",
+                    "#{grandchild_indent}<category android:name=\"android.intent.category.BROWSABLE\" />",
+                    "#{grandchild_indent}<data android:scheme=\"#{scheme_name}\" />",
+                    "#{child_indent}</intent-filter>",
+                ].join(newline)
+
+                # 规范化：块与块之间留 1 个空行；保持 </activity> 缩进对齐
+                normalized_inner = inner.sub(/(?:#{Regexp.escape(newline)}[ \t]*)*\z/, "")
+                replaced = [
+                    open_tag,
+                    normalized_inner,
+                    newline,
+                    newline,
+                    block,
+                    newline,
+                    close_line
+                ].join
+                return xml_content.sub(activity_block[0], replaced)
+            end
+
+            m = xml_content.match(/^(?<indent>[ \t]*)<\/activity>\s*$/m)
+            return nil unless m
+
+            close_indent = m[:indent] || ""
+            # 默认与现有 AndroidManifest 常见风格对齐：activity 内缩进步长通常为 4
+            child_indent = close_indent + "    "
+            grandchild_indent = child_indent + "    "
+
+            block = [
+                "#{child_indent}<intent-filter>",
+                "#{grandchild_indent}<action android:name=\"android.intent.action.VIEW\" />",
+                "#{grandchild_indent}<category android:name=\"android.intent.category.DEFAULT\" />",
+                "#{grandchild_indent}<category android:name=\"android.intent.category.BROWSABLE\" />",
+                "#{grandchild_indent}<data android:scheme=\"#{scheme_name}\" />",
+                "#{child_indent}</intent-filter>",
+            ].join(newline)
+
+            xml_content.sub(/^(?<indent>[ \t]*)<\/activity>\s*$/m) do |match|
+                "#{newline}#{block}#{newline}#{newline}#{match}"
             end
         end
 

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

@@ -228,30 +228,49 @@ module Pindo
         end
 
         content = File.read(settings_gradle_path)
-        # 兼容 include ':app' 和 include(":app")
-        modules = content.scan(/include\s*\(?\s*['\"]?([:\w\-]+)['\"]?\s*\)?/).flatten
+        modules = extract_modules_from_settings(content)
+        project_dir_map = extract_module_project_dirs(content)
 
         main_module = modules.find do |m|
           module_name = m.split(':').last
-          gradle_path = File.join(project_path, module_name, "build.gradle")
-          gradle_kts_path = File.join(project_path, module_name, "build.gradle.kts")
-
-          # 优先使用 build.gradle.kts，如果不存在则使用 build.gradle
-          if File.exist?(gradle_kts_path)
-            gradle_path = gradle_kts_path
+          module_rel_path = project_dir_map[m] || module_name
+          module_dir = File.join(project_path, module_rel_path)
+          gradle_path = File.join(module_dir, "build.gradle")
+          gradle_kts_path = File.join(module_dir, "build.gradle.kts")
+
+          gradle_file = if File.exist?(gradle_kts_path)
+            gradle_kts_path
+          elsif File.exist?(gradle_path)
+            gradle_path
           end
 
-          if File.exist?(gradle_path)
-            gradle_content = File.read(gradle_path)
-            gradle_content.include?("apply plugin: 'com.android.application") ||
-              gradle_content.include?("id 'com.android.application") ||
-              (gradle_content.include?("plugins {") && gradle_content.include?("com.android.application"))
+          next false unless gradle_file
+
+          gradle_content = File.read(gradle_file)
+          android_application_module?(gradle_content)
+        end
+
+        # 兜底：一些工程未声明标准 application 插件，优先尝试常见主模块名
+        if main_module.nil?
+          %w[app launcher application].each do |candidate|
+            candidate_module = modules.find { |m| m.split(':').last == candidate }
+            next unless candidate_module
+
+            module_rel_path = project_dir_map[candidate_module] || candidate
+            module_dir = File.join(project_path, module_rel_path)
+            has_gradle = File.exist?(File.join(module_dir, "build.gradle")) || File.exist?(File.join(module_dir, "build.gradle.kts"))
+            has_manifest = File.exist?(File.join(module_dir, "src/main/AndroidManifest.xml"))
+            if has_gradle && has_manifest
+              main_module = candidate_module
+              break
+            end
           end
         end
         return nil unless main_module
 
         module_name = main_module.split(':').last
-        File.join(project_path, module_name)
+        module_rel_path = project_dir_map[main_module] || module_name
+        File.join(project_path, module_rel_path)
       end
 
 
@@ -273,7 +292,98 @@ module Pindo
         android_dir
       end
 
+      # 在 Unity 作为 lib 的工程中，将 Unity 根目录下 gradle.properties
+      # 中的关键配置同步到主工程的 gradle.properties 中
+      # 当前仅同步以下键：
+      # - android.aapt2FromMavenOverride
+      # - org.gradle.java.home
+      def sync_gradle_properties_from_unity_to_main(project_path)
+        return unless unity_as_lib_android_project?(project_path)
+
+        unity_gradle_properties = File.join(project_path, "Unity", "gradle.properties")
+        return unless File.exist?(unity_gradle_properties)
+
+        keys_to_sync = [
+          "android.aapt2FromMavenOverride",
+          "org.gradle.java.home",
+        ]
+
+        unity_values = {}
+        File.read(unity_gradle_properties).each_line do |line|
+          stripped = line.strip
+          next if stripped.empty? || stripped.start_with?("#", "!")
+
+          keys_to_sync.each do |key|
+            # 兼容前后有空格的 "key = value" 写法
+            if stripped =~ /^#{Regexp.escape(key)}\s*=\s*(.+)$/
+              unity_values[key] = Regexp.last_match(1).strip
+            end
+          end
+        end
+
+        return if unity_values.empty?
+
+        main_gradle_properties = File.join(project_path, "gradle.properties")
+        main_content = File.exist?(main_gradle_properties) ? File.read(main_gradle_properties) : ""
+        original_content = main_content.dup
+
+        keys_to_sync.each do |key|
+          value = unity_values[key]
+          next unless value
+
+          key_regex = /^#{Regexp.escape(key)}\s*=.*$/
+          if main_content =~ key_regex
+            # 替换已存在的配置行
+            main_content = main_content.gsub(key_regex, "#{key}=#{value}")
+          else
+            # 追加新的配置行
+            main_content << "\n" unless main_content.empty? || main_content.end_with?("\n")
+            main_content << "#{key}=#{value}\n"
+          end
+        end
+
+        return if main_content == original_content
+
+        File.write(main_gradle_properties, main_content)
+      end
+
       private
+
+      def extract_modules_from_settings(content)
+        modules = []
+        # 兼容 include ':app' / include(":app", ":lib")
+        content.scan(/^\s*include(?:\s*\(|\s+)(.+)$/).each do |match|
+          include_args = match[0]
+          include_args.scan(/['"](:[^'"]+)['"]/).each do |module_match|
+            modules << module_match[0]
+          end
+        end
+        modules.uniq
+      end
+
+      def extract_module_project_dirs(content)
+        module_dirs = {}
+
+        # Groovy: project(':app').projectDir = new File('android/app')
+        content.scan(/project\(\s*['"](:[^'"]+)['"]\s*\)\.projectDir\s*=\s*new\s+File\(\s*['"]([^'"]+)['"]\s*\)/).each do |module_name, rel_path|
+          module_dirs[module_name] = rel_path
+        end
+
+        # Kotlin DSL: project(":app").projectDir = file("android/app")
+        content.scan(/project\(\s*['"](:[^'"]+)['"]\s*\)\.projectDir\s*=\s*file\(\s*['"]([^'"]+)['"]\s*\)/).each do |module_name, rel_path|
+          module_dirs[module_name] = rel_path
+        end
+
+        module_dirs
+      end
+
+      def android_application_module?(gradle_content)
+        # 标准声明方式
+        return true if gradle_content.include?("com.android.application")
+
+        # Version Catalog alias 声明（如 alias(libs.plugins.android.application)）
+        gradle_content.match?(/alias\s*\(\s*libs\.plugins\.[A-Za-z0-9_.-]*android[A-Za-z0-9_.-]*application[A-Za-z0-9_.-]*\s*\)/)
+      end
     end
   end
 end