pindo 5.10.0 → 5.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db013721ed33d91504f227eaa4ae585c648808c9091fa1f7e7cb8fecb5042b9
-  data.tar.gz: 775da05eca99d6b0bc3a11a8ae1e5be5756879c8c88d5404f637f7cad8c9afdf
+  metadata.gz: cdc8a89f4c819c3b2fb36d8f6ef7a09ab3ff847a9d326afb7fbfaad146f81c4b
+  data.tar.gz: 79f7efef8bfa4a2dda00e02f545f52496c770a50f6e99174080f89fb056724e0
 SHA512:
-  metadata.gz: eadd395d931c0bb6993efd6085de67c7ea6e3a71a2904c2cbf32ff11b028d5064cb857f15c6ef7a385a8478b0eea4475cd1594c079da53765157fed98ff1f972
-  data.tar.gz: b3423e1e6498b5a526bffcbb6faf009d855bece2f0b91e01ce7bb51bdfb98c48fd29d1af34dc9b41d421147662787ee65d5d1d0c17d3d3dae457abc0f1c535e0
+  metadata.gz: 6b571d2e04fe5c1819d0f514c26fb8b0cb0d42f3a08b0543cde030a26cd47e67bd526e3737812d96b31128aeaa61da788982933af09c6f7a52b29411bad7e5dc
+  data.tar.gz: 527c09daf610e695b3794c58f723d881a8ef6b7d4d1353a498c6d35d0fe49ab2ca5005174b385b8b015b23e738ceba0d843507e714df1d52ff0fb2aff6ee461e

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

@@ -177,6 +177,15 @@ module Pindo
 
                     Pindo::Command::Deploy::Cert::run(args_temp)
 
+                    # 根据证书配置后的实际 Bundle ID 重新更新 URL Schemes
+                    # 因为 Cert::run 可能会修改 PRODUCT_BUNDLE_IDENTIFIER
+                    if @args_upload_flag && workflow_info && workflow_info[:package_name]
+                        Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
+                            project_dir: project_dir,
+                            package_name: workflow_info[:package_name]
+                        )
+                    end
+
                     Dir.chdir(project_dir)
                     Pindo::Command::Deploy::Build::run(args_temp)
 

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

@@ -268,6 +268,13 @@ module Pindo
 
                     Pindo::Command::Deploy::Cert::run(args_temp)
 
+                    # 根据证书配置后的实际 Bundle ID 重新更新 URL Schemes
+                    # 因为 Cert::run 可能会修改 PRODUCT_BUNDLE_IDENTIFIER
+                    Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
+                        project_dir: pindo_project_dir,
+                        package_name: package_name
+                    )
+
                     Dir.chdir(pindo_project_dir)
                     Pindo::Command::Deploy::Build::run(args_temp)
 

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

@@ -135,6 +135,12 @@ module Pindo
                             package_name: package_name,
                             project_id: project_id
                           )
+
+                          # 根据实际的 Bundle ID 更新 URL Schemes
+                          Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
+                            project_dir: pindo_project_dir,
+                            package_name: package_name
+                          )
                         else
                           raise Informative, "未获取到工作流信息"
                         end

data/lib/pindo/command/ios.rb

@@ -1,8 +1,6 @@
 
 require 'pindo/command/ios/debug'
-require 'pindo/command/ios/build'
 require 'pindo/command/ios/autobuild'
-require 'pindo/command/ios/adhoc'
 require 'pindo/command/ios/autoresign'
 require 'pindo/command/ios/applovin'
 

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

@@ -8,8 +8,10 @@ module Pindo
 
     class XcodeBuildConfig
 
-        # 使用package_name一次性更新Display Name、Bundle ID和URL Schemes
+        # 使用package_name一次性更新Display Name、Bundle ID和URL Schemes（基于package_name）
         # 优化版本：只读写一次plist文件，提高性能
+        # 注意：此函数只添加基于package_name的URL Scheme，基于实际Bundle ID的URL Scheme
+        #      将在update_url_schemes_with_bundleid函数中统一添加（在证书配置之后）
         # @param project_dir [String] iOS项目目录路径
         # @param package_name [String] 工作流的package_name（如："Test Demo"）
         # @param project_id [String] JPS项目ID（可选，用于添加快捷操作）
@@ -23,7 +25,6 @@ module Pindo
             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?
@@ -58,15 +59,11 @@ module Pindo
             info_plist_dict["CFBundleURLTypes"] ||= []
 
             # 添加基于 package_name 的 URL Scheme
+            # 注意：基于 Bundle ID 的 URL Scheme 将在 update_url_schemes_with_bundleid 函数中统一添加
             if add_single_scheme(info_plist_dict, package_scheme)
                 puts "  ✓ 已添加URL Scheme: #{package_scheme} (基于 Package Name)"
             end
 
-            # 添加基于 Bundle ID 的 URL Scheme
-            if add_single_scheme(info_plist_dict, bundle_scheme)
-                puts "  ✓ 已添加URL Scheme: #{bundle_scheme} (基于 Bundle ID)"
-            end
-
             # 4. 添加 JPS 快捷操作（UIApplicationShortcutItems）
             if project_id && !project_id.to_s.empty?
                 # 创建或获取 UIApplicationShortcutItems 数组
@@ -74,22 +71,33 @@ module Pindo
 
                 # 构建快捷操作类型
                 shortcut_type = "jps_project?#{project_id}"
+                jps_title = "访问 JPS 详情"
 
-                # 检查是否已存在相同的快捷操作
+                # 先查找是否存在标题为"访问 JPS 详情"的快捷操作（无论其 type 是什么）
                 existing_shortcut = info_plist_dict["UIApplicationShortcutItems"].find do |item|
-                    item["UIApplicationShortcutItemType"] == shortcut_type
+                    item["UIApplicationShortcutItemTitle"] == jps_title
                 end
 
-                unless existing_shortcut
+                if existing_shortcut
+                    # 如果存在，检查 type 是否一致
+                    if existing_shortcut["UIApplicationShortcutItemType"] == shortcut_type
+                        puts "  ✓ JPS 快捷操作已存在: #{shortcut_type}"
+                    else
+                        # type 不一致，更新为新的 type
+                        old_type = existing_shortcut["UIApplicationShortcutItemType"]
+                        existing_shortcut["UIApplicationShortcutItemType"] = shortcut_type
+                        existing_shortcut["UIApplicationShortcutItemIconType"] = "UIApplicationShortcutIconTypeBookmark"
+                        puts "  ✓ 已更新 JPS 快捷操作: #{old_type} -> #{shortcut_type}"
+                    end
+                else
+                    # 不存在，添加新的快捷操作
                     jps_shortcut = {
                         "UIApplicationShortcutItemType" => shortcut_type,
-                        "UIApplicationShortcutItemTitle" => "访问 JPS 详情",
+                        "UIApplicationShortcutItemTitle" => jps_title,
                         "UIApplicationShortcutItemIconType" => "UIApplicationShortcutIconTypeBookmark"
                     }
                     info_plist_dict["UIApplicationShortcutItems"] << jps_shortcut
                     puts "  ✓ 已添加 JPS 快捷操作: #{shortcut_type}"
-                else
-                    puts "  ✓ JPS 快捷操作已存在: #{shortcut_type}"
                 end
             end
 
@@ -109,6 +117,76 @@ module Pindo
             return true
         end
 
+        # 根据当前项目中的实际 Bundle ID 重新更新 URL Schemes
+        # 此函数用于在证书配置后更新 URL Schemes，确保与最终的 Bundle ID 匹配
+        # @param project_dir [String] iOS项目目录路径
+        # @param package_name [String] 工作流的package_name（如："Test Demo"）
+        # @return [Boolean] 是否成功更新
+        def self.update_url_schemes_with_bundleid(project_dir: nil, package_name: nil)
+            raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+
+            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
+            current_bundle_id = 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
+                    # 获取当前实际的 Bundle ID
+                    current_bundle_id = target.build_configurations.first.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
+                    break  # 找到第一个application target即可
+                end
+            end
+
+            return false unless info_plist_path && File.exist?(info_plist_path)
+            return false unless current_bundle_id && !current_bundle_id.empty?
+
+            puts "\n根据更新后的 Bundle ID 重新配置 URL Schemes:"
+            puts "  当前 Bundle ID: #{current_bundle_id}"
+
+            # 读取 plist
+            info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
+            info_plist_dict["CFBundleURLTypes"] ||= []
+
+            # 生成 schemes
+            package_scheme = package_name ? package_name.gsub(/[^a-zA-Z0-9]/, '').downcase : nil
+            bundle_scheme = current_bundle_id.gsub(/[^a-zA-Z0-9]/, '').downcase
+
+            schemes_updated = []
+
+            # 添加基于 package_name 的 URL Scheme（如果提供了 package_name）
+            if package_scheme && !package_scheme.empty?
+                if add_single_scheme(info_plist_dict, package_scheme)
+                    schemes_updated << package_scheme
+                    puts "  ✓ 已更新 URL Scheme: #{package_scheme} (基于 Package Name)"
+                else
+                    puts "  ✓ URL Scheme 已存在: #{package_scheme} (基于 Package Name)"
+                end
+            end
+
+            # 添加基于实际 Bundle ID 的 URL Scheme
+            if add_single_scheme(info_plist_dict, bundle_scheme)
+                schemes_updated << bundle_scheme
+                puts "  ✓ 已更新 URL Scheme: #{bundle_scheme} (基于更新后的 Bundle ID)"
+            else
+                puts "  ✓ URL Scheme 已存在: #{bundle_scheme} (基于更新后的 Bundle ID)"
+            end
+
+            # 写入 plist
+            if schemes_updated.any?
+                Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
+                puts "  ✓ URL Schemes 更新完成"
+            end
+
+            return true
+        end
+
         # 添加URL Schemes到iOS工程的Info.plist
         # @param project_dir [String] iOS项目目录路径
         # @param scheme_name [String] 要添加的scheme名称（可选）

data/lib/pindo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.10.1
 platform: ruby
 authors:
 - wade