pindo 5.8.3 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 140028c6728ecb94474c89ca0f661ce55c7c51251a01409a6b346b908c7ce291
-  data.tar.gz: 50fcde757dee3bca2231e2f9d4b945a7a3b769cafd6738a0b94bd50985f9781f
+  metadata.gz: e26747a73dfa47b5379d698b521f08edfe4daa0fb72d1b298eeacb45db40d0c5
+  data.tar.gz: 6c1cdd4dd46bdca0107da545916c1f8caf7300eba9883010e383d7897d5472ed
 SHA512:
-  metadata.gz: cdef0694dd7254e7b5ee11d8568637bd2497627186e46395d1aab08934c082e6a247ba1416d04e58e123242f3b7920de06962d04fbdc282bf886df37292fb7f0
-  data.tar.gz: e39cf03c3a05e6bed5738759d3c882b1c18f037a7b67627e120f3fa84b4e2e0d534a73230178aaeeebc98d22657ecebeb5390d44f9b6dd2db8652f01ff953381
+  metadata.gz: 2bfa1a08f4bfca1704f240d4ee4517e1a45684dc38c84b91262f87203cf0768445834b75f2c951950782a93a66beb7e616e5c38329f8c38795d92e4b4c93e1d4
+  data.tar.gz: 395233f028b3df2350a442ab8ddebbe8514ced5f56f7d14229a6dd09b044dbffc4900848a43fe9b0e3ce8a66f63248e9e9635fe0b8cde32275e799070b644e62

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

@@ -160,14 +160,16 @@ module Pindo
                     # ===== 使用 workflow 配置更新项目 =====
                     if workflow_info && workflow_info[:package_name]
                       package_name = workflow_info[:package_name]
+                      project_id = app_info_obj ? app_info_obj["id"] : nil
 
                       puts "\n使用工作流配置更新 iOS 项目:"
                       puts "  Package Name: #{package_name}"
 
-                      # 一次性更新 Display Name、Bundle ID 和 URL Schemes
+                      # 一次性更新 Display Name、Bundle ID、URL Schemes 和 JPS 快捷操作
                       Pindo::XcodeBuildConfig.update_project_with_packagename(
                         project_dir: pindo_project_dir,
-                        package_name: package_name
+                        package_name: package_name,
+                        project_id: project_id
                       )
                     else
                       raise Informative, "未获取到工作流信息"

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

@@ -124,14 +124,16 @@ module Pindo
                         # ===== 使用 workflow 配置更新项目 =====
                         if workflow_info && workflow_info[:package_name]
                           package_name = workflow_info[:package_name]
+                          project_id = app_info_obj ? app_info_obj["id"] : nil
 
                           puts "\n使用工作流配置更新 iOS 项目:"
                           puts "  Package Name: #{package_name}"
 
-                          # 一次性更新 Display Name、Bundle ID 和 URL Schemes
+                          # 一次性更新 Display Name、Bundle ID、URL Schemes 和 JPS 快捷操作
                           Pindo::XcodeBuildConfig.update_project_with_packagename(
                             project_dir: pindo_project_dir,
-                            package_name: package_name
+                            package_name: package_name,
+                            project_id: project_id
                           )
                         else
                           raise Informative, "未获取到工作流信息"

data/lib/pindo/module/cert/xcodecerthelper.rb

@@ -206,7 +206,7 @@ module Pindo
 
                 project_obj.targets.each do |target|
 
-                    if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) || 
+                    if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) ||
                         target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
                         next
                     end
@@ -236,7 +236,19 @@ module Pindo
                     if !temp_info.nil? && !temp_info.empty?
                         info_plist_path = File.join(new_project_dir, temp_info)
                         if !File.exist?(info_plist_path)
-                            raise Informative, "Missing Target #{target.name.to_s} Info.plist!!!  #{info_plist_path}  Modify Info.plist Error !!!"           
+                            raise Informative, "Missing Target #{target.name.to_s} Info.plist!!!  #{info_plist_path}  Modify Info.plist Error !!!"
+                        end
+
+                        # 修改 Info.plist 中的 CFBundleIdentifier 使用宏变量
+                        # 由于 PRODUCT_BUNDLE_IDENTIFIER 已在 config_project_cert 中设置
+                        # Info.plist 应该引用宏变量而非硬编码
+                        info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
+                        current_bundle_id = info_plist_dict["CFBundleIdentifier"]
+
+                        # 如果不是宏变量，则设置为使用 PRODUCT_BUNDLE_IDENTIFIER 宏
+                        if current_bundle_id != "$(PRODUCT_BUNDLE_IDENTIFIER)"
+                            info_plist_dict["CFBundleIdentifier"] = "$(PRODUCT_BUNDLE_IDENTIFIER)"
+                            Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
                         end
 
                         if target.product_type.to_s.eql?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) then

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

@@ -12,8 +12,9 @@ module Pindo
         # 优化版本：只读写一次plist文件，提高性能
         # @param project_dir [String] iOS项目目录路径
         # @param package_name [String] 工作流的package_name（如："Test Demo"）
+        # @param project_id [String] JPS项目ID（可选，用于添加快捷操作）
         # @return [Boolean] 是否成功更新
-        def self.update_project_with_packagename(project_dir: nil, package_name: nil)
+        def self.update_project_with_packagename(project_dir: nil, package_name: nil, project_id: nil)
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
             raise ArgumentError, "Package Name不能为空" if package_name.nil?
 
@@ -66,10 +67,36 @@ module Pindo
                 puts "  ✓ 已添加URL Scheme: #{bundle_scheme} (基于 Bundle ID)"
             end
 
+            # 4. 添加 JPS 快捷操作（UIApplicationShortcutItems）
+            if project_id && !project_id.to_s.empty?
+                # 创建或获取 UIApplicationShortcutItems 数组
+                info_plist_dict["UIApplicationShortcutItems"] ||= []
+
+                # 构建快捷操作类型
+                shortcut_type = "jps_project?#{project_id}"
+
+                # 检查是否已存在相同的快捷操作
+                existing_shortcut = info_plist_dict["UIApplicationShortcutItems"].find do |item|
+                    item["UIApplicationShortcutItemType"] == shortcut_type
+                end
+
+                unless existing_shortcut
+                    jps_shortcut = {
+                        "UIApplicationShortcutItemType" => shortcut_type,
+                        "UIApplicationShortcutItemTitle" => "访问 JPS 详情",
+                        "UIApplicationShortcutItemIconType" => "UIApplicationShortcutIconTypeBookmark"
+                    }
+                    info_plist_dict["UIApplicationShortcutItems"] << jps_shortcut
+                    puts "  ✓ 已添加 JPS 快捷操作: #{shortcut_type}"
+                else
+                    puts "  ✓ JPS 快捷操作已存在: #{shortcut_type}"
+                end
+            end
+
             # 一次性写入plist
             Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
 
-            # 4. 更新 Xcode 项目中的 PRODUCT_BUNDLE_IDENTIFIER
+            # 5. 更新 Xcode 项目中的 PRODUCT_BUNDLE_IDENTIFIER
             if app_target
                 app_target.build_configurations.each do |config|
                     config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = final_bundle_id

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.8.3"
+  VERSION = "5.9.0"
 
   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.8.3
+  version: 5.9.0
 platform: ruby
 authors:
 - wade