pindo 5.7.1 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4b964e18c3af71f1705355cf695575e282d71366ee055223d17c1c6cb23c5ca
-  data.tar.gz: 833b6f3986ecba29006bb12e8b2f8fd831c904d877f0eb774699b89b0bf9a7b0
+  metadata.gz: 981c02bf9dc73206866a586598642619054b8a82929a8ed54607ab2edf15604e
+  data.tar.gz: fedcbff7e32b5db93492161228b293ec5d7f3558767fb5fb474c788959e527a3
 SHA512:
-  metadata.gz: 8a73e0cb705390f6e967e397c20531282e1115ba23950092d43912b1ce27becaa323fb4fcb789fd076021964f044a5e822a7a6520a1c0805f2c764a70e96cd26
-  data.tar.gz: d7f02cf4fe210cecdd19a7e36221ff0747047d572103a8e21d6cc230135878229b3151de0f16c1af8988f5ed3eb6e025c0d3e7f24df9582b28dbc8c383ebd962
+  metadata.gz: 991ecbda504689b9f31c01a8a8a65991ca6193126c14525afc2fee081f039c39f5814076ea4047946e4846421d10964f0d4f3899774196e13f27f2a33fef5f57
+  data.tar.gz: 578a35ce8f1840e366d3f2b7c4646c5d6c92a6729993acff3b6770f4603e5c22351e67640e4ae2fe17cea3f7dc291b3ec80bc72db99cb48919a1f478cd0dd724

data/lib/pindo/base/funlog.rb

@@ -49,6 +49,20 @@ module Pindo
          @spinner_log =nil
       end
 
+      # 输出静态成功信息（不使用spinner，对应 fancyinfo_success）
+      # @param args [Array] 要输出的消息
+      def info(*args)
+         message = args.join(" ")
+         puts "  ✓ #{message}"
+      end
+
+      # 输出静态警告信息（不使用spinner，对应 fancyinfo_error）
+      # @param args [Array] 要输出的消息
+      def warning(*args)
+         message = args.join(" ")
+         puts "\e[33m  ⚠ #{message}\e[0m"
+      end
+
     #-------------------------------------------------------------------------#
     #-------------------------------------------------------------------------#
     # @!group Singleton
@@ -72,6 +86,33 @@ module Pindo
     #
     class << self
       attr_writer :instance
+
+      # 类方法委托，简化调用方式
+      # 使用 Funlog.info("消息") 代替 Funlog.instance.info("消息")
+
+      def fancyinfo_start(*args)
+        instance.fancyinfo_start(*args)
+      end
+
+      def fancyinfo_update(*args)
+        instance.fancyinfo_update(*args)
+      end
+
+      def fancyinfo_success(*args)
+        instance.fancyinfo_success(*args)
+      end
+
+      def fancyinfo_error(*args)
+        instance.fancyinfo_error(*args)
+      end
+
+      def info(*args)
+        instance.info(*args)
+      end
+
+      def warning(*args)
+        instance.warning(*args)
+      end
     end
 
     # Provides support for accessing the configuration instance in other

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

@@ -111,27 +111,15 @@ module Pindo
             package_type: 'apk'
           )
 
-          # ===== 使用 workflow 配置修改 Android 配置 =====
+          # ===== 使用 workflow 配置更新 Android 项目 =====
           if workflow_info && workflow_info[:package_name]
             package_name = workflow_info[:package_name]
 
-            puts "\n使用工作流配置更新 Android 配置:"
+            puts "\n使用工作流配置更新 Android 项目:"
             puts "  Package Name: #{package_name}"
 
-            # 修改 App Name
-            Pindo::AndroidBuildConfigHelper.update_app_name_with_packagename(
-              project_dir: pindo_project_dir,
-              package_name: package_name
-            )
-
-            # 修改 Application ID
-            Pindo::AndroidBuildConfigHelper.update_applicationid_with_packagename(
-              project_dir: pindo_project_dir,
-              package_name: package_name
-            )
-
-            # 添加基于 package_name 的 Scheme
-            Pindo::AndroidBuildConfigHelper.add_scheme_packagename(
+            # 一次性更新 App Name、Application ID 和 URL Schemes
+            Pindo::AndroidBuildConfigHelper.update_project_with_packagename(
               project_dir: pindo_project_dir,
               package_name: package_name
             )
@@ -139,31 +127,17 @@ module Pindo
             raise Informative, "未获取到工作流信息"
           end
 
-          build_helper = Pindo::BuildHelper.share_instance
-          if @args_upload_flag
-            is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
-            if is_need_add_tag
-                Pindo::Command::Dev::Tag::run(tag_action_parms)
-            end
-          end
-          
-          scheme_name = @args_proj_name if @args_proj_name
-          if !app_info_obj.nil? && !app_info_obj["scheme"].nil? && !app_info_obj["scheme"].empty?
-              scheme_name = app_info_obj["scheme"]
-          end
-          if scheme_name.nil? || scheme_name.empty? && is_git_directory?(local_repo_dir:pindo_project_dir)
-              current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
-              if current_git_root_path && !current_git_root_path.empty?
-                git_repo_name = File.basename(current_git_root_path)
-                if !git_repo_name.nil? && !git_repo_name.empty?
-                  scheme_name = git_repo_name
-                end
-              end
+          # ===== 从 JPS 下载并替换项目 Icon =====
+          if app_info_obj && app_info_obj["projectIcon"] && !app_info_obj["projectIcon"].empty?
+            Pindo::AndroidBuildConfigHelper.download_and_replace_icon_from_url(
+              project_dir: pindo_project_dir,
+              icon_url: app_info_obj["projectIcon"]
+            )
+          else
+            Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
           end
 
-          android_build_helper = Pindo::AndroidBuildHelper.share_instance
-
-          # 更新版本号和Build号（仅在Git仓库中）
+          # ===== 更新版本号和Build号（仅在Git仓库中）=====
           version_helper = Pindo::VersionHelper.share_instance
           version_info = version_helper.get_version_info(project_dir: pindo_project_dir)
 
@@ -175,22 +149,19 @@ module Pindo
               version_code: version_info[:build_number]
             )
           else
-            puts "非Git仓库，保持工程原有版本号"
+            Funlog.warning("非Git仓库，保持工程原有版本号")
           end
 
-          # 添加以项目名称为 scheme 的配置
-          Pindo::AndroidBuildConfigHelper.add_test_scheme(project_dir: pindo_project_dir, scheme_name: scheme_name)
-
-          # 获取 bundle ID 并添加以 bundle ID 为 scheme 的配置
-          bundle_id = android_build_helper.get_application_id(pindo_project_dir)
-          if !bundle_id.nil? && !bundle_id.empty?
-            puts "获取到 Bundle ID: #{bundle_id}"
-            Pindo::AndroidBuildConfigHelper.add_test_scheme(project_dir: pindo_project_dir, scheme_name: bundle_id)
-          else
-            puts "警告: 未能获取到 Bundle ID，跳过添加 Bundle ID scheme"
+          build_helper = Pindo::BuildHelper.share_instance
+          if @args_upload_flag
+            is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+            if is_need_add_tag
+                Pindo::Command::Dev::Tag::run(tag_action_parms)
+            end
           end
-          
+
           begin
+            android_build_helper = Pindo::AndroidBuildHelper.share_instance
             apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
             ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
 

data/lib/pindo/command/android/build.rb

@@ -97,27 +97,15 @@ module Pindo
                 package_type: 'apk'
               )
 
-              # ===== 使用 workflow 配置修改 Android 配置 =====
+              # ===== 使用 workflow 配置更新 Android 项目 =====
               if workflow_info && workflow_info[:package_name]
                 package_name = workflow_info[:package_name]
 
-                puts "\n使用工作流配置更新 Android 配置:"
+                puts "\n使用工作流配置更新 Android 项目:"
                 puts "  Package Name: #{package_name}"
 
-                # 修改 App Name
-                Pindo::AndroidBuildConfigHelper.update_app_name_with_packagename(
-                  project_dir: pindo_project_dir,
-                  package_name: package_name
-                )
-
-                # 修改 Application ID
-                Pindo::AndroidBuildConfigHelper.update_applicationid_with_packagename(
-                  project_dir: pindo_project_dir,
-                  package_name: package_name
-                )
-
-                # 添加基于 package_name 的 Scheme
-                Pindo::AndroidBuildConfigHelper.add_scheme_packagename(
+                # 一次性更新 App Name、Application ID 和 URL Schemes
+                Pindo::AndroidBuildConfigHelper.update_project_with_packagename(
                   project_dir: pindo_project_dir,
                   package_name: package_name
                 )

data/lib/pindo/command/android/debug.rb

@@ -89,27 +89,15 @@ module Pindo
                 package_type: 'apk'
               )
 
-              # ===== 使用 workflow 配置修改 Android 配置 =====
+              # ===== 使用 workflow 配置更新 Android 项目 =====
               if workflow_info && workflow_info[:package_name]
                 package_name = workflow_info[:package_name]
 
-                puts "\n使用工作流配置更新 Android 配置:"
+                puts "\n使用工作流配置更新 Android 项目:"
                 puts "  Package Name: #{package_name}"
 
-                # 修改 App Name
-                Pindo::AndroidBuildConfigHelper.update_app_name_with_packagename(
-                  project_dir: pindo_project_dir,
-                  package_name: package_name
-                )
-
-                # 修改 Application ID
-                Pindo::AndroidBuildConfigHelper.update_applicationid_with_packagename(
-                  project_dir: pindo_project_dir,
-                  package_name: package_name
-                )
-
-                # 添加基于 package_name 的 Scheme
-                Pindo::AndroidBuildConfigHelper.add_scheme_packagename(
+                # 一次性更新 App Name、Application ID 和 URL Schemes
+                Pindo::AndroidBuildConfigHelper.update_project_with_packagename(
                   project_dir: pindo_project_dir,
                   package_name: package_name
                 )

data/lib/pindo/command/ios/adhoc.rb

@@ -90,21 +90,15 @@ module Pindo
                           package_type: 'ipa'
                         )
 
-                        # ===== 使用 workflow 配置修改 plist =====
+                        # ===== 使用 workflow 配置更新项目 =====
                         if workflow_info && workflow_info[:package_name]
                           package_name = workflow_info[:package_name]
 
-                          puts "\n使用工作流配置更新 Info.plist:"
+                          puts "\n使用工作流配置更新 iOS 项目:"
                           puts "  Package Name: #{package_name}"
 
-                          # 修改 Display Name
-                          Pindo::XcodeBuildConfig.update_display_name_with_packagename(
-                            project_dir: project_dir,
-                            package_name: package_name
-                          )
-
-                          # 修改 Bundle ID
-                          Pindo::XcodeBuildConfig.update_bundleid_with_packagename(
+                          # 一次性更新 Display Name、Bundle ID 和 URL Schemes
+                          Pindo::XcodeBuildConfig.update_project_with_packagename(
                             project_dir: project_dir,
                             package_name: package_name
                           )
@@ -130,23 +124,6 @@ module Pindo
                     # 处理entitlements配置
                     Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: project_dir, config_file: config_json_file)
 
-                    # 添加URL Scheme（基于 package_name）
-                    if @args_upload_flag && workflow_info && workflow_info[:package_name]
-                      Pindo::XcodeBuildConfig.add_url_scheme_packagename(
-                        project_dir: project_dir,
-                        package_name: workflow_info[:package_name]
-                      )
-                    end
-
-                    # 添加URL Schemes（基于 scheme_name 和 Bundle ID）
-                    if @args_upload_flag
-                      scheme_name = @args_proj_name
-                      Pindo::XcodeBuildConfig.add_url_schemes(
-                        project_dir: project_dir,
-                        scheme_name: scheme_name
-                      )
-                    end
-
                     if File.exist?(File.join(project_dir, "Podfile"))
                         
                         args_temp = []

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

@@ -157,26 +157,45 @@ module Pindo
                       package_type: 'ipa'
                     )
 
-                    # ===== 使用 workflow 配置修改 plist =====
+                    # ===== 使用 workflow 配置更新项目 =====
                     if workflow_info && workflow_info[:package_name]
                       package_name = workflow_info[:package_name]
 
-                      puts "\n使用工作流配置更新 Info.plist:"
+                      puts "\n使用工作流配置更新 iOS 项目:"
                       puts "  Package Name: #{package_name}"
 
-                      # 修改 Display Name
-                      Pindo::XcodeBuildConfig.update_display_name_with_packagename(
+                      # 一次性更新 Display Name、Bundle ID 和 URL Schemes
+                      Pindo::XcodeBuildConfig.update_project_with_packagename(
                         project_dir: pindo_project_dir,
                         package_name: package_name
                       )
+                    else
+                      raise Informative, "未获取到工作流信息"
+                    end
 
-                      # 修改 Bundle ID
-                      Pindo::XcodeBuildConfig.update_bundleid_with_packagename(
+                    # ===== 从 JPS 下载并替换项目 Icon =====
+                    if app_info_obj && app_info_obj["projectIcon"] && !app_info_obj["projectIcon"].empty?
+                      Pindo::XcodeBuildConfig.download_and_replace_icon_from_url(
                         project_dir: pindo_project_dir,
-                        package_name: package_name
+                        icon_url: app_info_obj["projectIcon"]
                       )
                     else
-                      raise Informative, "未获取到工作流信息"
+                      Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
+                    end
+
+                    # ===== 更新版本号和Build号（仅在Git仓库中）=====
+                    version_helper = Pindo::VersionHelper.share_instance
+                    version_info = version_helper.get_version_info(project_dir: pindo_project_dir)
+
+                    if version_info[:is_git_repo]
+                        # 更新iOS工程版本
+                        Pindo::XcodeBuildConfig.update_ios_project_version(
+                            project_dir: pindo_project_dir,
+                            version: version_info[:version],
+                            build_number: version_info[:build_number]
+                        )
+                    else
+                        Funlog.warning("非Git仓库，保持工程原有版本号")
                     end
 
                     args_temp = []
@@ -186,37 +205,9 @@ module Pindo
                     Dir.chdir(pindo_project_dir)
                     config_json_file = File.join(pindo_project_dir,"config.json")
 
-                    scheme_name = @args_proj_name if @args_proj_name
-                    if !app_info_obj.nil? && !app_info_obj["scheme"].nil? && !app_info_obj["scheme"].empty?
-                        scheme_name = app_info_obj["scheme"]
-                    end
-                    if scheme_name.nil? || scheme_name.empty? && is_git_directory?(local_repo_dir:pindo_project_dir)
-                        current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
-                        if current_git_root_path && !current_git_root_path.empty?
-                          git_repo_name = File.basename(current_git_root_path)
-                          if !git_repo_name.nil? && !git_repo_name.empty?
-                            scheme_name = git_repo_name
-                          end
-                        end
-                    end
-
                     # 处理entitlements配置
                     Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: pindo_project_dir, config_file: config_json_file)
 
-                    # 添加URL Scheme（基于 package_name）
-                    if workflow_info && workflow_info[:package_name]
-                      Pindo::XcodeBuildConfig.add_url_scheme_packagename(
-                        project_dir: pindo_project_dir,
-                        package_name: workflow_info[:package_name]
-                      )
-                    end
-
-                    # 添加URL Schemes（基于 scheme_name 和 Bundle ID）
-                    Pindo::XcodeBuildConfig.add_url_schemes(
-                      project_dir: pindo_project_dir,
-                      scheme_name: scheme_name
-                    )
-
                     if File.exist?(File.join(pindo_project_dir, "Podfile"))
                         
                         args_temp = []
@@ -270,21 +261,6 @@ module Pindo
 
                     Pindo::Command::Deploy::Cert::run(args_temp)
 
-                    # 更新版本号和Build号（仅在Git仓库中）
-                    version_helper = Pindo::VersionHelper.share_instance
-                    version_info = version_helper.get_version_info(project_dir: pindo_project_dir)
-
-                    if version_info[:is_git_repo]
-                        # 更新iOS工程版本
-                        Pindo::XcodeBuildConfig.update_ios_project_version(
-                            project_dir: pindo_project_dir,
-                            version: version_info[:version],
-                            build_number: version_info[:build_number]
-                        )
-                    else
-                        puts "非Git仓库，保持工程原有版本号"
-                    end
-
                     Dir.chdir(pindo_project_dir)
                     Pindo::Command::Deploy::Build::run(args_temp)
 

data/lib/pindo/command/ios/build.rb

@@ -121,37 +121,18 @@ module Pindo
                           package_type: 'ipa'
                         )
 
-                        # ===== 使用 workflow 配置修改 plist =====
+                        # ===== 使用 workflow 配置更新项目 =====
                         if workflow_info && workflow_info[:package_name]
                           package_name = workflow_info[:package_name]
 
-                          puts "\n使用工作流配置更新 Info.plist:"
+                          puts "\n使用工作流配置更新 iOS 项目:"
                           puts "  Package Name: #{package_name}"
 
-                          # 修改 Display Name
-                          Pindo::XcodeBuildConfig.update_display_name_with_packagename(
+                          # 一次性更新 Display Name、Bundle ID 和 URL Schemes
+                          Pindo::XcodeBuildConfig.update_project_with_packagename(
                             project_dir: pindo_project_dir,
                             package_name: package_name
                           )
-
-                          # 修改 Bundle ID
-                          Pindo::XcodeBuildConfig.update_bundleid_with_packagename(
-                            project_dir: pindo_project_dir,
-                            package_name: package_name
-                          )
-
-                          # 添加URL Scheme（基于 package_name）
-                          Pindo::XcodeBuildConfig.add_url_scheme_packagename(
-                            project_dir: pindo_project_dir,
-                            package_name: package_name
-                          )
-
-                          # 添加URL Schemes（基于 scheme_name 和 Bundle ID）
-                          scheme_name = @args_proj_name
-                          Pindo::XcodeBuildConfig.add_url_schemes(
-                            project_dir: pindo_project_dir,
-                            scheme_name: scheme_name
-                          )
                         else
                           raise Informative, "未获取到工作流信息"
                         end

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

@@ -1,12 +1,64 @@
 require 'fileutils'
+require 'open-uri'
 require_relative '../../base/funlog'
 require_relative 'base_helper'
+require_relative '../../base/executable'
+require_relative 'androidreshelper'
 
 module Pindo
 
     class AndroidBuildConfigHelper
         include BaseAndroidHelper
 
+        # 使用package_name一次性更新App Name、Application ID和URL Schemes
+        # 优化版本：提高性能，减少代码重复
+        # @param project_dir [String] Android项目目录路径
+        # @param package_name [String] 工作流的package_name（如："Test Demo"）
+        # @return [Boolean] 是否成功更新
+        def self.update_project_with_packagename(project_dir: nil, package_name: nil)
+            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+            raise ArgumentError, "Package Name不能为空" if package_name.nil?
+
+            # 生成各种值
+            app_name = package_name.gsub(/[^a-zA-Z0-9\s]/, '').gsub(/\s+/, '')
+            app_id_suffix = package_name.gsub(/[^a-zA-Z0-9]/, '').downcase
+            application_id = "com.heroneverdie101.#{app_id_suffix}"
+            package_scheme = package_name.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
+            )
+
+            # 2. 更新 Application ID
+            success_app_id = update_applicationid_with_packagename(
+                project_dir: project_dir,
+                package_name: package_name
+            )
+
+            # 3. 添加基于 package_name 的 Scheme
+            success_package_scheme = add_test_scheme(
+                project_dir: project_dir,
+                scheme_name: package_scheme
+            )
+            if success_package_scheme
+                puts "  ✓ 已添加Scheme: #{package_scheme} (基于 Package Name)"
+            end
+
+            # 4. 添加基于 Application ID 的 Scheme
+            success_bundle_scheme = add_test_scheme(
+                project_dir: project_dir,
+                scheme_name: bundle_scheme
+            )
+            if success_bundle_scheme
+                puts "  ✓ 已添加Scheme: #{bundle_scheme} (基于 Application ID)"
+            end
+
+            return success_app_name && success_app_id && success_package_scheme && success_bundle_scheme
+        end
+
         # 更新Android工程版本号
         # @param project_dir [String] Android项目目录路径
         # @param version_name [String] 版本名
@@ -253,27 +305,6 @@ module Pindo
             end
         end
 
-        # 使用package_name添加Android Scheme
-        # @param project_dir [String] Android项目目录路径
-        # @param package_name [String] 工作流的package_name（如："Test Demo"）
-        # @return [Boolean] 是否成功添加
-        def self.add_scheme_packagename(project_dir: nil, package_name: nil)
-            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
-            raise ArgumentError, "Package Name不能为空" if package_name.nil?
-
-            # 从 package_name 生成 scheme（去除特殊字符，转小写）
-            scheme_name = package_name.to_s.gsub(/[^a-zA-Z0-9]/, '').downcase
-
-            # 调用现有的 add_test_scheme 方法
-            result = add_test_scheme(project_dir: project_dir, scheme_name: scheme_name)
-
-            if result
-                puts "  ✓ 已添加Scheme: #{scheme_name} (来自: #{package_name})"
-            end
-
-            return result
-        end
-
         # 添加测试scheme到Android工程
         # @param project_dir [String] Android项目目录路径
         # @param scheme_name [String] 要添加的scheme名称
@@ -562,6 +593,96 @@ module Pindo
             end
         end
 
+        # ===== Android Icon 处理方法（使用 AndroidResHelper）=====
+
+        # 创建Android各种密度的icon（委托给 AndroidResHelper）
+        # @param icon_path [String] 原始icon路径（建议1024x1024或512x512）
+        # @param output_dir [String] 输出目录
+        # @return [Hash] 各密度icon路径
+        def self.create_android_icons(icon_path: nil, output_dir: nil)
+            AndroidResHelper.create_icons(icon_name: icon_path, new_icon_dir: output_dir)
+        end
+
+        # 安装Android icon到项目中（委托给 AndroidResHelper）
+        # @param project_dir [String] Android项目目录
+        # @param icon_dir [String] icon文件目录（包含各密度文件夹）
+        # @return [Boolean] 是否成功安装
+        def self.install_android_icon(project_dir: nil, icon_dir: nil)
+            AndroidResHelper.install_icon(proj_dir: project_dir, new_icon_dir: icon_dir)
+        end
+
+        # 从URL下载Icon并替换Android工程的Icon
+        # @param project_dir [String] Android项目目录路径
+        # @param icon_url [String] Icon的下载URL地址
+        # @return [Boolean] 是否成功下载并替换Icon
+        def self.download_and_replace_icon_from_url(project_dir: nil, icon_url: nil)
+            # 参数校验 - 不抛出异常，返回 false
+            if project_dir.nil?
+                Funlog.instance.fancyinfo_error("Icon 替换失败: 项目目录不能为空")
+                return false
+            end
+
+            if icon_url.nil? || icon_url.empty?
+                Funlog.instance.fancyinfo_error("Icon 替换失败: Icon URL不能为空")
+                return false
+            end
+
+            puts "\n检测到项目 Icon URL: #{icon_url}"
+
+            # 创建临时目录（所有 icon 处理都在此目录进行）
+            temp_icon_dir = File.join(project_dir, ".pindo_temp_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")
+
+                # 下载 icon
+                Funlog.instance.fancyinfo_start("正在从 JPS 下载项目 Icon...")
+                URI.open(icon_url) do |file|
+                    File.binwrite(icon_download_path, file.read)
+                end
+                Funlog.instance.fancyinfo_success("Icon 下载成功!")
+
+                # 验证文件已下载
+                unless File.exist?(icon_download_path)
+                    Funlog.instance.fancyinfo_error("Icon 下载失败: 文件未创建")
+                    return false
+                end
+
+                # 生成 icon 目录（在临时目录内部）
+                new_icon_dir = File.join(temp_icon_dir, "generated_icons")
+
+                # 创建各种密度的 icon
+                Funlog.instance.fancyinfo_start("正在创建 Android icon...")
+                create_android_icons(
+                    icon_path: icon_download_path,
+                    output_dir: new_icon_dir
+                )
+                Funlog.instance.fancyinfo_success("创建 icon 完成!")
+
+                # 替换工程中的 icon
+                Funlog.instance.fancyinfo_start("正在替换 icon...")
+                install_android_icon(
+                    project_dir: project_dir,
+                    icon_dir: new_icon_dir
+                )
+                Funlog.instance.fancyinfo_success("替换 icon 完成!")
+                replace_success = true
+
+            rescue => e
+                Funlog.instance.fancyinfo_error("Icon 处理失败: #{e.message}")
+                puts e.backtrace
+                replace_success = false
+            ensure
+                # 清理临时文件（无论成功失败都清理）
+                FileUtils.rm_rf(temp_icon_dir) if temp_icon_dir && File.exist?(temp_icon_dir)
+            end
+
+            return replace_success
+        end
+
     end
 
 end