pindo 5.7.1 → 5.8.0

data/lib/pindo/module/xcode/xcodebuildconfig.rb

@@ -1,27 +1,34 @@
 require 'fileutils'
 require 'xcodeproj'
 require 'json'
+require 'open-uri'
 require_relative '../../base/funlog'
 
 module Pindo
 
     class XcodeBuildConfig
 
-        # 使用package_name更新Display Name到iOS工程的Info.plist
+        # 使用package_name一次性更新Display Name、Bundle ID和URL Schemes
+        # 优化版本：只读写一次plist文件，提高性能
         # @param project_dir [String] iOS项目目录路径
         # @param package_name [String] 工作流的package_name（如："Test Demo"）
         # @return [Boolean] 是否成功更新
-        def self.update_display_name_with_packagename(project_dir: nil, package_name: nil)
+        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?
 
-            # 生成 Display Name（去除特殊字符和空格）
+            # 生成各种值
             display_name = package_name.gsub(/[^a-zA-Z0-9\s]/, '').gsub(/\s+/, '')
+            bundle_id_suffix = package_name.gsub(/[^a-zA-Z0-9]/, '').downcase
+            final_bundle_id = "com.heroneverdie101.#{bundle_id_suffix}"
+            package_scheme = package_name.gsub(/[^a-zA-Z0-9]/, '').downcase
+            bundle_scheme = final_bundle_id.gsub(/[^a-zA-Z0-9]/, '').downcase
 
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             return false if project_fullname.nil?
 
             info_plist_path = nil
+            app_target = nil
 
             project_obj = Xcodeproj::Project.open(project_fullname)
             project_obj.targets.each do |target|
@@ -30,59 +37,39 @@ module Pindo
                     if temp_info_file && !temp_info_file.empty?
                         info_plist_path = File.join(project_dir, temp_info_file)
                     end
+                    app_target = target
                     break  # 找到第一个application target即可
                 end
             end
 
             return false unless info_plist_path && File.exist?(info_plist_path)
 
-            # 使用Xcodeproj::Plist读写plist
+            # 一次性读取plist
             info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
-            info_plist_dict["CFBundleDisplayName"] = display_name
-            Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
 
-            puts "  ✓ Display Name 已更新为: #{display_name} (来自: #{package_name})"
-            return true
-        end
-
-        # 使用package_name更新Bundle ID到iOS工程（同时修改plist和xcodeproj）
-        # @param project_dir [String] iOS项目目录路径
-        # @param package_name [String] 工作流的package_name（如："Test Demo"）
-        # @return [Boolean] 是否成功更新
-        def self.update_bundleid_with_packagename(project_dir: nil, package_name: nil)
-            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
-            raise ArgumentError, "Package Name不能为空" if package_name.nil?
-
-            # 从 package_name 生成 Bundle ID
-            bundle_id_suffix = package_name.gsub(/[^a-zA-Z0-9]/, '').downcase
-            final_bundle_id = "com.heroneverdie101.#{bundle_id_suffix}"
+            # 1. 更新 Display Name
+            info_plist_dict["CFBundleDisplayName"] = display_name
 
-            project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-            return false if project_fullname.nil?
+            # 2. 更新 Bundle ID（plist）
+            info_plist_dict["CFBundleIdentifier"] = final_bundle_id
 
-            info_plist_path = nil
-            app_target = nil
+            # 3. 添加 URL Schemes
+            info_plist_dict["CFBundleURLTypes"] ||= []
 
-            project_obj = Xcodeproj::Project.open(project_fullname)
-            project_obj.targets.each do |target|
-                if target.product_type.to_s.eql?("com.apple.product-type.application")
-                    temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                    if temp_info_file && !temp_info_file.empty?
-                        info_plist_path = File.join(project_dir, temp_info_file)
-                    end
-                    app_target = target
-                    break  # 找到第一个application target即可
-                end
+            # 添加基于 package_name 的 URL Scheme
+            if add_single_scheme(info_plist_dict, package_scheme)
+                puts "  ✓ 已添加URL Scheme: #{package_scheme} (基于 Package Name)"
             end
 
-            return false unless info_plist_path && File.exist?(info_plist_path)
+            # 添加基于 Bundle ID 的 URL Scheme
+            if add_single_scheme(info_plist_dict, bundle_scheme)
+                puts "  ✓ 已添加URL Scheme: #{bundle_scheme} (基于 Bundle ID)"
+            end
 
-            # 1. 修改 Info.plist 中的 CFBundleIdentifier
-            info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
-            info_plist_dict["CFBundleIdentifier"] = final_bundle_id
+            # 一次性写入plist
             Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
 
-            # 2. 修改 Xcode 项目中的 PRODUCT_BUNDLE_IDENTIFIER
+            # 4. 更新 Xcode 项目中的 PRODUCT_BUNDLE_IDENTIFIER
             if app_target
                 app_target.build_configurations.each do |config|
                     config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = final_bundle_id
@@ -90,49 +77,8 @@ module Pindo
                 project_obj.save
             end
 
-            puts "  ✓ Bundle ID 已更新为: #{final_bundle_id} (来自: #{package_name})"
-            return true
-        end
-
-        # 使用package_name添加URL Scheme到iOS工程的Info.plist
-        # @param project_dir [String] iOS项目目录路径
-        # @param package_name [String] 工作流的package_name（如："Test Demo"）
-        # @return [Boolean] 是否成功添加
-        def self.add_url_scheme_packagename(project_dir: nil, package_name: nil)
-            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
-            raise ArgumentError, "Package Name不能为空" if package_name.nil?
-
-            # 从 package_name 生成 URL Scheme（去除特殊字符，转小写）
-            scheme_value = package_name.to_s.gsub(/[^a-zA-Z0-9]/, '').downcase
-
-            project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-            return false if project_fullname.nil?
-
-            info_plist_path = nil
-
-            project_obj = Xcodeproj::Project.open(project_fullname)
-            project_obj.targets.each do |target|
-                if target.product_type.to_s.eql?("com.apple.product-type.application")
-                    temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                    if temp_info_file && !temp_info_file.empty?
-                        info_plist_path = File.join(project_dir, temp_info_file)
-                    end
-                    break  # 找到第一个application target即可
-                end
-            end
-
-            return false unless info_plist_path && File.exist?(info_plist_path)
-
-            # 使用Xcodeproj::Plist读写plist
-            info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
-            info_plist_dict["CFBundleURLTypes"] ||= []
-
-            # 添加基于package_name的URL Scheme
-            if add_single_scheme(info_plist_dict, scheme_value)
-                Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
-                puts "  ✓ 已添加URL Scheme: #{scheme_value} (来自: #{package_name})"
-            end
-
+            puts "  ✓ Display Name 已更新为: #{display_name}"
+            puts "  ✓ Bundle ID 已更新为: #{final_bundle_id}"
             return true
         end
 
@@ -368,6 +314,78 @@ module Pindo
             return false
         end
 
+        # 从URL下载Icon并替换iOS工程的Icon
+        # @param project_dir [String] iOS项目目录路径
+        # @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("正在创建 icon...")
+                XcodeResHelper.create_icons(
+                    icon_name: icon_download_path,
+                    new_icon_dir: new_icon_dir
+                )
+                Funlog.instance.fancyinfo_success("创建 icon 完成!")
+
+                # 替换工程中的 icon
+                Funlog.instance.fancyinfo_start("正在替换 icon...")
+                XcodeResHelper.install_icon(
+                    proj_dir: project_dir,
+                    new_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

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.7.1"
+  VERSION = "5.8.0"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 5.8.0
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-10-20 00:00:00.000000000 Z
+date: 2025-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -421,6 +421,7 @@ files:
 - lib/pindo/config/pindoconfig.rb
 - lib/pindo/config/pindouserlocalconfig.rb
 - lib/pindo/module/android/android_build_config_helper.rb
+- lib/pindo/module/android/androidreshelper.rb
 - lib/pindo/module/android/apk_helper.rb
 - lib/pindo/module/android/base_helper.rb
 - lib/pindo/module/android/build_helper.rb