pindo 5.10.4 → 5.10.8

data/lib/pindo/command/unity/upload.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 require 'json'
 require 'jpsclient'
 require 'claide'
-require 'pindo/module/unity/nugethelper'
+require 'pindo/module/unity/nuget_helper'
 
 module Pindo
   class Command

data/lib/pindo/command/unity/web.rb

@@ -3,8 +3,8 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/unityhelper'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/unity/unity_helper'
+require 'pindo/module/build/build_helper'
 
 module Pindo
     class Command

data/lib/pindo/command/utils/device.rb

@@ -19,7 +19,7 @@ module Pindo
 - 支持iOS和Mac设备管理
 - 读取本地CSV文件的设备数据
 - 生成多种格式的设备列表
-- 兼容蒲公英平台的设备格式
+- 兼容JPS平台的设备格式
 - 设备信息统一管理和对比
 
 使用示例：
@@ -29,7 +29,7 @@ module Pindo
 生成文件：
 - new_devices_list.txt - App Store格式的设备列表
 - new_user_devices_list.csv - 用户设备列表
-- new_pgyer_devices_list.csv - 蒲公英格式设备列表
+- new_jps_devices_list.csv - JPS格式设备列表
 DESC
 
                 class DeviceItem
@@ -199,7 +199,7 @@ DESC
 
                 def write_apppgyer_csv(devices:nil)
 
-                    device_file = File.join(Dir.pwd, "new_pgyer_devices_list.csv");
+                    device_file = File.join(Dir.pwd, "new_jps_devices_list.csv");
 
                     devices.each do |key, item|
                         if item.device_type.to_s.eql?("ipad")
@@ -231,7 +231,7 @@ DESC
                     devices = {}
 
 
-                    device_file = File.join(Dir.pwd, "pgyer_devices_list.csv");
+                    device_file = File.join(Dir.pwd, "jps_devices_list.csv");
                     if File.exist?(device_file)
                         line_num=0
                         CSV.foreach(device_file, headers:false) do |row|

data/lib/pindo/command/utils/icon.rb

@@ -3,7 +3,7 @@
 require 'highline/import'
 require 'fileutils'
 require 'json'
-require 'pindo/module/xcode/xcodereshelper'
+require 'pindo/module/xcode/xcode_res_helper'
 
 module Pindo
     class Command

data/lib/pindo/command/utils/renewcert.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'pindo/module/cert/xcodecerthelper'
-require 'pindo/module/cert/certhelper'
+require 'pindo/module/cert/cert_helper'
 
 module Pindo
   class Command
@@ -9,7 +9,6 @@ module Pindo
         
             include Appselect
             include XcodeCertHelper
-            include CertHelper
 
             self.summary = '更新当前账号下所有的Provisioning Profile文件'
     
@@ -51,7 +50,7 @@ DESC
               [
 
                 ['--fast', '快速更新证书，开发用bundle id只更新dev证书，发布bundle id只更新adhoc证书'],
-                ['--upload', '生成上传pgyer的证书'],
+                ['--upload', '生成上传JPS的证书'],
                 ['--fixedid', '重新更新bundle id的功能，检查bundle id的功能是否更新'],
                 ['--renew', '重新生成证书']
               ].concat(super)

data/lib/pindo/command/utils/renewproj.rb

@@ -2,7 +2,7 @@
 require 'xcodeproj'
 require 'find'  
 require 'fileutils'
-require 'pindo/module/xcode/xcodehelper'
+require 'pindo/module/xcode/xcode_project_helper'
 
 module Pindo
     class Command
@@ -11,7 +11,6 @@ module Pindo
 
                 include Command::DeployOptions
 
-                include XcodeHelper
                 
                 self.summary = '重新创建Xcode工程'
         
@@ -87,15 +86,15 @@ DESC
                     old_proj_fullname = File.join(old_proj_path, old_proj_name) + ".xcodeproj"
                     old_proj_obj = Xcodeproj::Project.open(old_proj_fullname)
 
-                    copy_to_newproject(new_proj_path:new_proj_path, new_proj_name:new_proj_name, old_proj_path:old_proj_path, old_proj_name:old_proj_name)
+                    Pindo::XcodeProjectHelper.copy_to_newproject(new_proj_path:new_proj_path, new_proj_name:new_proj_name, old_proj_path:old_proj_path, old_proj_name:old_proj_name)
 
-                    create_project_target(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
-                    
-                    add_file_to_target(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
-                    
-                    config_project_target(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
-                    
-                    setting_new_project(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
+                    Pindo::XcodeProjectHelper.create_project_target(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
+
+                    Pindo::XcodeProjectHelper.add_file_to_target(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
+
+                    Pindo::XcodeProjectHelper.config_project_target(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
+
+                    Pindo::XcodeProjectHelper.setting_new_project(new_proj_name:new_proj_name, new_proj_path:new_proj_path, new_proj_obj:new_proj_obj,  old_proj_name:old_proj_name, old_proj_path:old_proj_path, old_proj_obj:old_proj_obj)
                     
                 end
                 

data/lib/pindo/command/web/autobuild.rb

@@ -3,8 +3,8 @@ require 'xcodeproj'
 require 'find'  
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/unityhelper'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/unity/unity_helper'
+require 'pindo/module/build/build_helper'
 
 module Pindo
     class Command
@@ -53,7 +53,7 @@ module Pindo
                 def self.options
                     [
                         ['--bundleid', '指定打包的bundleID'],
-                        # 指定上传到蒲公英的项目
+                        # 指定上传到JPS的项目
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         # 上传编译包
                         ['--upload', '上传编译后的ipa到测试平台'],

data/lib/pindo/command/web/run.rb

@@ -3,7 +3,7 @@ require 'xcodeproj'
 require 'find'  
 require 'fileutils'
 require 'pindo/base/executable'
-require 'pindo/module/build/buildhelper'
+require 'pindo/module/build/build_helper'
 require 'pindo/module/webserver/brotli_file_handler'
 require 'pindo/module/webserver/webgl_page_handler'
 require 'pindo/module/webserver/responsive_preview_handler'

data/lib/pindo/command.rb

@@ -30,7 +30,7 @@ module Pindo
         require "match"
         require 'pindo/options/deployoptions'
         require 'pindo/module/appselect'
-        require 'pindo/module/build/commonconfuseproj'
+        require 'pindo/module/build/confuse_xcodeproj'
         require 'pindo/module/cert/xcodecerthelper'
         
         require 'pindo/module/appstore/appstore_in_app_purchase'
@@ -47,6 +47,7 @@ module Pindo
         require 'pindo/command/repo'
         require 'pindo/command/ipa'
         require 'pindo/command/appstore'
+        require 'pindo/command/gplay'
         require 'pindo/command/unity'
         require 'pindo/command/ios'
         require 'pindo/command/android'

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

@@ -1,41 +1,40 @@
 require 'fileutils'
 require 'open-uri'
 require_relative '../../base/funlog'
-require_relative 'base_helper'
+require_relative 'android_project_helper'
 require_relative '../../base/executable'
-require_relative 'androidreshelper'
+require_relative 'android_res_helper'
 
 module Pindo
 
     class AndroidBuildConfigHelper
-        include BaseAndroidHelper
 
-        # 使用package_name一次性更新App Name、Application ID和URL Schemes
+        # 使用工作流配置一次性更新App Name、Application ID和URL Schemes
         # 优化版本：提高性能，减少代码重复
         # @param project_dir [String] Android项目目录路径
-        # @param package_name [String] 工作流的package_name（如："Test Demo"）
+        # @param workflow_packname [String] 工作流的名称（如："Test Demo"）
         # @return [Boolean] 是否成功更新
-        def self.update_project_with_packagename(project_dir: nil, package_name: nil)
+        def self.update_project_with_workflow(project_dir: nil, workflow_packname: nil)
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
-            raise ArgumentError, "Package Name不能为空" if package_name.nil?
+            raise ArgumentError, "Workflow Package Name不能为空" if workflow_packname.nil?
 
             # 生成各种值
-            app_name = package_name.gsub(/[^a-zA-Z0-9\s]/, '').gsub(/\s+/, '')
-            app_id_suffix = package_name.gsub(/[^a-zA-Z0-9]/, '').downcase
+            app_name = workflow_packname.gsub(/[^a-zA-Z0-9\s]/, '').gsub(/\s+/, '')
+            app_id_suffix = workflow_packname.gsub(/[^a-zA-Z0-9]/, '').downcase
             application_id = "com.heroneverdie101.#{app_id_suffix}"
-            package_scheme = package_name.gsub(/[^a-zA-Z0-9]/, '').downcase
+            package_scheme = workflow_packname.gsub(/[^a-zA-Z0-9]/, '').downcase
             bundle_scheme = application_id.gsub(/[^a-zA-Z0-9]/, '').downcase
 
             # 1. 更新 App Name
             success_app_name = update_app_name_with_packagename(
                 project_dir: project_dir,
-                package_name: package_name
+                package_name: workflow_packname
             )
 
             # 2. 更新 Application ID
-            success_app_id = update_applicationid_with_packagename(
+            success_app_id = update_applicationid_with_workflowname(
                 project_dir: project_dir,
-                package_name: package_name
+                package_name: workflow_packname
             )
 
             # 3. 添加基于 package_name 的 Scheme
@@ -78,11 +77,8 @@ module Pindo
             Funlog.instance.fancyinfo_start("正在更新Android工程版本信息...")
 
             begin
-                # 创建helper实例以使用基类方法
-                helper = self.new
-
                 # 获取主模块路径
-                main_module = helper.get_main_module(project_dir)
+                main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
 
                 if main_module.nil?
                     # 如果无法获取主模块，尝试常见的模块名（优先 launcher，支持 Unity 项目）
@@ -118,11 +114,23 @@ module Pindo
                 content = File.read(gradle_file)
 
                 # 第一步：清理所有现有的版本信息（无论在什么位置）
+                # 直接赋值格式
                 content.gsub!(/^\s*versionCode\s+\d+\s*$/, '')
                 content.gsub!(/^\s*versionCode\s*=\s*\d+\s*$/, '')
                 content.gsub!(/^\s*versionName\s+["'][^"']*["']\s*$/, '')
                 content.gsub!(/^\s*versionName\s*=\s*["'][^"']*["']\s*$/, '')
 
+                # 外部变量引用格式
+                content.gsub!(/^\s*versionCode\s+rootProject\.ext\.\w+\s*$/, '')
+                content.gsub!(/^\s*versionCode\s+project\.ext\.\w+\s*$/, '')
+                content.gsub!(/^\s*versionCode\s+ext\.\w+\s*$/, '')
+                content.gsub!(/^\s*versionName\s+["']?\$\{rootProject\.ext\.\w+\}["']?\s*$/, '')
+                content.gsub!(/^\s*versionName\s+["']?\$\{project\.ext\.\w+\}["']?\s*$/, '')
+                content.gsub!(/^\s*versionName\s+["']?\$\{ext\.\w+\}["']?\s*$/, '')
+                content.gsub!(/^\s*versionName\s+rootProject\.ext\.\w+\s*$/, '')
+                content.gsub!(/^\s*versionName\s+project\.ext\.\w+\s*$/, '')
+                content.gsub!(/^\s*versionName\s+ext\.\w+\s*$/, '')
+
                 # 清理多余的空行
                 content.gsub!(/\n\n+/, "\n\n")
 
@@ -195,9 +203,7 @@ module Pindo
             app_name = package_name.gsub(/[^a-zA-Z0-9\s]/, '').gsub(/\s+/, '')
 
             begin
-                # 创建helper实例以使用基类方法
-                helper = self.new
-                main_module = helper.get_main_module(project_dir)
+                main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
 
                 if main_module.nil?
                     # 尝试常见的模块名（优先 launcher，支持 Unity 项目）
@@ -212,6 +218,35 @@ module Pindo
 
                 return false if main_module.nil?
 
+                # 1. 先删除 build.gradle 中的 resValue("string", "app_name", ...)
+                build_gradle_path = File.join(main_module, "build.gradle")
+                build_gradle_kts_path = File.join(main_module, "build.gradle.kts")
+
+                gradle_file = nil
+                if File.exist?(build_gradle_kts_path)
+                    gradle_file = build_gradle_kts_path
+                elsif File.exist?(build_gradle_path)
+                    gradle_file = build_gradle_path
+                end
+
+                if gradle_file
+                    gradle_content = File.read(gradle_file)
+                    original_content = gradle_content.dup
+
+                    # 删除 resValue("string", "app_name", ...) 这一行
+                    # 支持多种格式：
+                    # resValue("string", "app_name", "xxx")
+                    # resValue("string", "app_name", "${rootProject.ext.app_name}")
+                    # resValue "string", "app_name", "xxx"
+                    gradle_content.gsub!(/^\s*resValue\s*\(?\s*["']string["']\s*,\s*["']app_name["'].*?\)?\s*$\n?/, '')
+
+                    if gradle_content != original_content
+                        File.write(gradle_file, gradle_content)
+                        puts "  ✓ 已删除 build.gradle 中的 resValue(\"string\", \"app_name\", ...)"
+                    end
+                end
+
+                # 2. 更新 strings.xml
                 # 查找strings.xml文件
                 strings_xml_path = File.join(main_module, "src", "main", "res", "values", "strings.xml")
 
@@ -223,15 +258,26 @@ module Pindo
                 # 读取并更新strings.xml
                 content = File.read(strings_xml_path)
 
-                # 更新app_name
+                # 检查是否存在 app_name
                 if content =~ /<string\s+name="app_name">.*?<\/string>/
+                    # 存在，直接更新
                     content.gsub!(/<string\s+name="app_name">.*?<\/string>/, "<string name=\"app_name\">#{app_name}</string>")
                     File.write(strings_xml_path, content)
                     puts "  ✓ App Name 已更新为: #{app_name} (来自: #{package_name})"
                     return true
                 else
-                    Funlog.instance.fancyinfo_error("strings.xml中未找到app_name字段")
-                    return false
+                    # 不存在，自动添加
+                    if content =~ /<resources>(.*?)<\/resources>/m
+                        # 在 <resources> 标签内添加 app_name
+                        new_string_entry = "\n  <string name=\"app_name\">#{app_name}</string>"
+                        content.sub!(/<resources>/, "<resources>#{new_string_entry}")
+                        File.write(strings_xml_path, content)
+                        puts "  ✓ App Name 已添加: #{app_name} (来自: #{package_name})"
+                        return true
+                    else
+                        Funlog.instance.fancyinfo_error("strings.xml格式异常，无法添加app_name")
+                        return false
+                    end
                 end
 
             rescue StandardError => e
@@ -240,11 +286,11 @@ module Pindo
             end
         end
 
-        # 使用package_name更新Android Application ID（build.gradle中的applicationId）
+        # 使用工作流名称生成并更新Android Application ID（build.gradle中的applicationId）
         # @param project_dir [String] Android项目目录路径
-        # @param package_name [String] 工作流的package_name（如："Test Demo"）
+        # @param package_name [String] 工作流的名称（如："Test Demo"），将被转换为application ID格式
         # @return [Boolean] 是否成功更新
-        def self.update_applicationid_with_packagename(project_dir: nil, package_name: nil)
+        def self.update_applicationid_with_workflowname(project_dir: nil, package_name: nil)
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
             raise ArgumentError, "Package Name不能为空" if package_name.nil?
 
@@ -253,9 +299,7 @@ module Pindo
             application_id = "com.heroneverdie101.#{app_id_suffix}"
 
             begin
-                # 创建helper实例以使用基类方法
-                helper = self.new
-                main_module = helper.get_main_module(project_dir)
+                main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
 
                 if main_module.nil?
                     # 尝试常见的模块名（优先 launcher，支持 Unity 项目）
@@ -284,12 +328,32 @@ module Pindo
                 # 读取并更新gradle文件
                 content = File.read(gradle_file)
 
-                # 更新applicationId
+                # 更新applicationId（支持多种格式）
+                updated = false
+
+                # 格式1: applicationId "com.example.app"
                 if content =~ /applicationId\s+["'][^"']*["']/
                     content.gsub!(/applicationId\s+["'][^"']*["']/, "applicationId \"#{application_id}\"")
+                    updated = true
+                # 格式2: applicationId = "com.example.app"
                 elsif content =~ /applicationId\s*=\s*["'][^"']*["']/
                     content.gsub!(/applicationId\s*=\s*["'][^"']*["']/, "applicationId = \"#{application_id}\"")
-                else
+                    updated = true
+                # 格式3: applicationId rootProject.ext.application_id (外部变量引用)
+                elsif content =~ /applicationId\s+rootProject\.ext\.\w+/
+                    content.gsub!(/applicationId\s+rootProject\.ext\.\w+/, "applicationId \"#{application_id}\"")
+                    updated = true
+                # 格式4: applicationId project.ext.application_id
+                elsif content =~ /applicationId\s+project\.ext\.\w+/
+                    content.gsub!(/applicationId\s+project\.ext\.\w+/, "applicationId \"#{application_id}\"")
+                    updated = true
+                # 格式5: applicationId ext.application_id
+                elsif content =~ /applicationId\s+ext\.\w+/
+                    content.gsub!(/applicationId\s+ext\.\w+/, "applicationId \"#{application_id}\"")
+                    updated = true
+                end
+
+                unless updated
                     Funlog.instance.fancyinfo_error("gradle文件中未找到applicationId字段")
                     return false
                 end
@@ -304,6 +368,177 @@ module Pindo
             end
         end
 
+        # 直接更新Application ID（不依赖package_name生成）
+        # @param project_dir [String] Android项目目录路径
+        # @param application_id [String] 要设置的Application ID（如 com.example.app）
+        # @return [Boolean] 是否成功更新
+        def self.update_application_id(project_dir: nil, application_id: nil)
+            # 参数验证
+            if application_id.nil? || application_id.empty?
+                Funlog.instance.fancyinfo_error("Application ID不能为空")
+                return false
+            end
+
+            if project_dir.nil? || !File.directory?(project_dir)
+                Funlog.instance.fancyinfo_error("项目路径无效: #{project_dir}")
+                return false
+            end
+
+            begin
+                puts "正在设置 Application ID: #{application_id}"
+
+                # 获取主模块
+                main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
+
+                # 支持多种项目结构
+                module_paths = []
+                module_paths << File.join(project_dir, main_module) if main_module
+                module_paths << File.join(project_dir, "app")
+                module_paths << File.join(project_dir, "unityLibrary/launcher")
+                module_paths << File.join(project_dir, "launcher")
+
+                gradle_file = nil
+                module_paths.each do |module_path|
+                    next unless File.exist?(module_path)
+
+                    if File.exist?(File.join(module_path, "build.gradle"))
+                        gradle_file = File.join(module_path, "build.gradle")
+                        break
+                    elsif File.exist?(File.join(module_path, "build.gradle.kts"))
+                        gradle_file = File.join(module_path, "build.gradle.kts")
+                        break
+                    end
+                end
+
+                if gradle_file.nil?
+                    Funlog.instance.fancyinfo_error("未找到build.gradle文件")
+                    return false
+                end
+
+                # 读取并更新gradle文件
+                content = File.read(gradle_file)
+                updated = false
+
+                # 更新applicationId（支持多种格式）
+                # 格式1: applicationId "com.example.app"
+                if content =~ /applicationId\s+["'][^"']*["']/
+                    content.gsub!(/applicationId\s+["'][^"']*["']/, "applicationId \"#{application_id}\"")
+                    updated = true
+                # 格式2: applicationId = "com.example.app"
+                elsif content =~ /applicationId\s*=\s*["'][^"']*["']/
+                    content.gsub!(/applicationId\s*=\s*["'][^"']*["']/, "applicationId = \"#{application_id}\"")
+                    updated = true
+                end
+
+                unless updated
+                    Funlog.instance.fancyinfo_error("gradle文件中未找到applicationId配置")
+                    return false
+                end
+
+                File.write(gradle_file, content)
+                puts "  ✓ 更新 #{File.basename(gradle_file)} 中的 applicationId"
+                return true
+
+            rescue StandardError => e
+                Funlog.instance.fancyinfo_error("更新Application ID失败: #{e.message}")
+                return false
+            end
+        end
+
+        # 从配置仓库拷贝 google-services.json 到项目的 launcher 目录
+        # @param config_repo_dir [String] 配置仓库的路径
+        # @param project_dir [String] Android项目目录路径
+        # @return [Boolean] 是否成功拷贝
+        def self.copy_google_services_from_config_repo(config_repo_dir: nil, project_dir: nil)
+            # 参数验证
+            if config_repo_dir.nil? || !File.directory?(config_repo_dir)
+                Funlog.instance.fancyinfo_error("配置仓库路径无效: #{config_repo_dir}")
+                return false
+            end
+
+            if project_dir.nil? || !File.directory?(project_dir)
+                Funlog.instance.fancyinfo_error("项目路径无效: #{project_dir}")
+                return false
+            end
+
+            # 查找配置仓库中的 google-services.json
+            source_file = File.join(config_repo_dir, 'google-services.json')
+            unless File.exist?(source_file)
+                Funlog.instance.fancyinfo_warning("配置仓库中未找到 google-services.json")
+                return false
+            end
+
+            puts "正在拷贝 google-services.json..."
+
+            # 优先拷贝到 launcher 目录
+            launcher_dirs = [
+                File.join(project_dir, 'unityLibrary', 'launcher'),  # Unity 项目的 launcher
+                File.join(project_dir, 'launcher'),                  # 独立的 launcher
+                File.join(project_dir, 'app')                        # 原生 Android 项目
+            ]
+
+            copied = false
+            launcher_dirs.each do |launcher_dir|
+                if File.exist?(launcher_dir) && File.directory?(launcher_dir)
+                    target_file = File.join(launcher_dir, 'google-services.json')
+                    FileUtils.cp(source_file, target_file)
+                    puts "  ✓ google-services.json 已拷贝到: #{launcher_dir}"
+                    copied = true
+
+                    # Unity 项目也拷贝到 unityLibrary 根目录
+                    if launcher_dir.include?('unityLibrary/launcher')
+                        unity_root = File.join(project_dir, 'unityLibrary')
+                        if File.exist?(unity_root) && File.directory?(unity_root)
+                            unity_target = File.join(unity_root, 'google-services.json')
+                            FileUtils.cp(source_file, unity_target)
+                            puts "  ✓ google-services.json 也已拷贝到: unityLibrary/"
+                        end
+                    end
+
+                    break # 找到第一个有效目录后停止
+                end
+            end
+
+            unless copied
+                # 如果没找到合适的目录，至少拷贝到项目根目录
+                target_file = File.join(project_dir, 'google-services.json')
+                FileUtils.cp(source_file, target_file)
+                puts "  ✓ google-services.json 已拷贝到项目根目录"
+                puts "  ⚠ 请确认文件位置是否正确"
+            end
+
+            return true
+        end
+
+        # 从配置仓库应用配置（拷贝 config.json）
+        # @param config_repo_dir [String] 配置仓库的路径
+        # @param project_dir [String] Android项目目录路径
+        # @return [Boolean] 是否成功应用
+        def self.apply_config_from_repo(config_repo_dir: nil, project_dir: nil)
+            # 参数验证
+            if config_repo_dir.nil? || !File.directory?(config_repo_dir)
+                Funlog.instance.fancyinfo_error("配置仓库路径无效: #{config_repo_dir}")
+                return false
+            end
+
+            if project_dir.nil? || !File.directory?(project_dir)
+                Funlog.instance.fancyinfo_error("项目路径无效: #{project_dir}")
+                return false
+            end
+
+            # 拷贝 config.json 到项目目录
+            config_source = File.join(config_repo_dir, 'config.json')
+            if File.exist?(config_source)
+                config_target = File.join(project_dir, 'config.json')
+                FileUtils.cp(config_source, config_target)
+                puts "  ✓ config.json 已拷贝到项目目录"
+                return true
+            else
+                puts "  ⚠ 配置仓库中未找到 config.json"
+                return false
+            end
+        end
+
         # 添加测试scheme到Android工程
         # @param project_dir [String] Android项目目录路径
         # @param scheme_name [String] 要添加的scheme名称
@@ -322,11 +557,8 @@ module Pindo
 
             scheme_name = scheme_name.to_s.gsub(/[^a-zA-Z0-9]/, '').downcase
 
-            # 创建helper实例以使用基类方法
-            helper = self.new
-
             # 查找所有可能的模块（添加 launcher 支持 Unity 项目）
-            main_module = helper.get_main_module(project_dir)
+            main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
             search_modules = ["launcher", "app", "unityLibrary"]
             search_modules << main_module if main_module
             search_modules = search_modules.compact.uniq