pindo 4.7.1 → 4.7.3

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

@@ -63,13 +63,13 @@ module Pindo
 
     def install_certs(cert_url:nil, certs_dir:nil, cert_type:nil)
 
-      
+      cert_git_dir = cert_type.downcase
       if !cert_type.downcase.include?("development")
-        cert_type = "distribution"
+        cert_git_dir = "distribution"
       end
 
-      certs = Dir[File.join(certs_dir, "certs", cert_type.to_s, "*.cer")]
-      keys = Dir[File.join(certs_dir, "certs", cert_type.to_s, "*.p12")]      
+      certs = Dir[File.join(certs_dir, "certs", cert_git_dir.to_s, "*.cer")]
+      keys = Dir[File.join(certs_dir, "certs", cert_git_dir.to_s, "*.p12")]      
 
       if certs.count == 0 || keys.count == 0
         raise Informative, "No certificates found in #{certs_dir}"
@@ -80,13 +80,13 @@ module Pindo
           Funlog.instance.fancyinfo_start("正在安装证书...")
 
           cert_path = AESHelper.decrypt_specific_file(src_file: certs.first, password:decrypt_password, output_dir: output_dir)
-          unless cert_path.nil? || File.exist?(cert_path)
+          if cert_path.nil? || cert_path.empty? || !File.exist?(cert_path)
             AESHelper.delete_password(keychain_name:cert_url)
             raise Informative, "证书解析失败，密码错误！"
           end
 
           key_path = AESHelper.decrypt_specific_file(src_file: keys.first, password:decrypt_password, output_dir: output_dir)
-          unless key_path.nil? || File.exist?(key_path)
+          if key_path.nil? || key_path.empty? || !File.exist?(key_path)
             AESHelper.delete_password(keychain_name:cert_url)
             raise Informative, "证书解析失败，密码错误！"
           end
@@ -110,8 +110,8 @@ module Pindo
               KeychainHelper.import_file(cert_path, keychain_path, keychain_password: cert_password, certificate_password:'' )
               KeychainHelper.import_file(key_path, keychain_path, keychain_password: cert_password, certificate_password: '')
 
-
               Funlog.instance.fancyinfo_success("证书'#{File.basename(cert_path)}'安装完成！")
+
             end
           else
             Funlog.instance.fancyinfo_error("非Mac电脑不支持安装证书!")
@@ -122,23 +122,17 @@ module Pindo
       def install_provisionfiles(cert_url:nil, certs_dir:nil, bundle_id_map:nil, cert_type:nil)
 
 
-          Funlog.instance.fancyinfo_start("正在安装Provisioning Profiles文件...")
+            if cert_type.downcase.include?("development")
+              cert_type = "Development"
+            elsif cert_type.downcase.include?("adhoc")
+              cert_type = "Adhoc"
+            else
+              cert_type = "AppStore"
+            end
 
-
-          if cert_type.downcase.include?("development")
-            cert_type = "Development"
-          elsif cert_type.downcase.include?("adhoc")
-            cert_type = "Adhoc"
-          else
-            cert_type = "AppStore"
-          end
+            Funlog.instance.fancyinfo_start("正在安装#{cert_type} Provisioning Profiles...")
 
             un_exist_files = []
-
-          provisioning_info_array = []
-
-
-
             provisioning_info_array = []
 
             bundle_id_map.each do |type, bundle_id_temp|
@@ -169,14 +163,15 @@ module Pindo
                   provisioning_info_array << provisioning_info
             end
 
-            Funlog.instance.fancyinfo_success("Provisioning Profiles文件安装完成！")
+            Funlog.instance.fancyinfo_success("#{cert_type} Provisioning Profiles文件安装完成！")
 
             if un_exist_files.size > 0
-              Funlog.instance.fancyinfo_error("证书Provisioning Profiles文件不存在！")
+              Funlog.instance.fancyinfo_error("证书 #{cert_type} Provisioning Profiles文件不存在！")
               raise Informative, "The following profiles do not exist: #{un_exist_files.join(', ')}"
             end
 
             return provisioning_info_array
+            
       end
 
 

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

@@ -1,5 +1,6 @@
 
 require 'fileutils'
+require 'pindo/base/aeshelper'
 
 module Pindo
 
@@ -225,7 +226,40 @@ module Pindo
               end
         end
 
-        def create_upload_cert_info(apple_id:nil, cert_type:nil, provisioning_info_array:nil)
+        def create_upload_cert_info(apple_id:nil, cert_type:nil)
+
+            cert_dest_dir = File.join(Dir.pwd, "cert")
+            if !File.exist?(cert_dest_dir)
+                FileUtils.mkdir_p(cert_dest_dir)
+            end
+
+
+            cert_git_url = pindo_single_config.deploy_cert_giturl
+            if apple_id.eql?(pindo_single_config.demo_apple_id)
+                cert_git_url = pindo_single_config.dev_cert_giturl
+            end
+            cert_reponame = cert_git_url.split("/").last.chomp(".git")
+            certs_dir = getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:apple_id)
+
+            cert_git_dir = cert_type.downcase
+            if !cert_type.downcase.include?("development")
+                cert_git_dir = "distribution"
+            end
+
+            keys = Dir[File.join(certs_dir, "certs", cert_git_dir.to_s, "*.p12")]   
+            decrypt_password = AESHelper.fetch_password(keychain_name:cert_git_url)
+            output_dir = Dir.mktmpdir
+            key_path = AESHelper.decrypt_specific_file(src_file: keys.first, password:decrypt_password, output_dir: output_dir)
+            if key_path.nil? || key_path.empty? || !File.exist?(key_path)
+                AESHelper.delete_password(keychain_name:cert_git_url)
+                raise Informative, "证书解析失败，密码错误！"
+            end
+
+            FileUtils.copy(key_path, File.join(cert_dest_dir, "#{cert_type}.p12"))
+
+        end
+
+        def create_upload_provisioning_info(apple_id:nil, cert_type:nil, provisioning_info_array:nil)
             
             cert_dir = File.join(Dir.pwd, "cert")
             cert_json_file = File.join(cert_dir, "certs.json")
@@ -272,8 +306,8 @@ module Pindo
 
             cert_item["cert_id"] = cert_item["cert_id"] || bundle_id_signing_identity
             cert_item["password"] = "goodcert1"
-            cert_item["cert_file"] = "#{cert_type}.p12".downcase
-            cert_item["cert_type"] = cert_type.downcase
+            cert_item["cert_file"] = "#{cert_type}.p12"
+            cert_item["cert_type"] = cert_type
             cert_item["cert_provisioning_group"] = cert_item["cert_provisioning_group"] || []
 
 

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -38,16 +38,22 @@ module Pindo
             if @force_login || !@has_login
                 @has_login = @pgyer_client.do_login(force_login:@force_login)
                 @force_login = false
+            else
+                @has_login = @pgyer_client.do_login(force_login:false)
             end
             return @has_login
         end
 
         def prepare_upload(working_directory:nil, proj_name:nil)
             upload_proj_name = proj_name
+            if upload_proj_name.nil? || upload_proj_name.empty?
+                upload_proj_name = @proj_name
+            end
+
             app_info_obj = nil
             if login
 
-                if !proj_name.nil?
+                if !upload_proj_name.nil?
                     app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
                 end
 
@@ -105,6 +111,7 @@ module Pindo
             else
                 raise Informative, "请先登录Pgyer网站"
             end
+            @proj_name = upload_proj_name
             app_info_obj
         end
 
@@ -112,17 +119,28 @@ module Pindo
 
                 args_ipa_file_dir = File.expand_path(File::dirname(ipa_file_upload))
                 ipa_file_upload=File.join(args_ipa_file_dir, File.basename(ipa_file_upload))
-
                 current_project_dir = Dir.pwd
                 if description.nil? && File.exist?(File.join(current_project_dir, ".git"))
-                    commit_id_info = git_latest_commit_id(local_repo_dir:current_project_dir)
-                    if commit_id_info
-                        description = "commit " + commit_id_info
+                    description = git!(%W(-C #{current_project_dir} show -s --format=commit::%H)).strip
+                    xcodeproj_file_name = Dir.glob(File.join(current_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                    if !xcodeproj_file_name.nil? && !xcodeproj_file_name.empty? && File.exist?(xcodeproj_file_name)
+                        project_obj = Xcodeproj::Project.open(xcodeproj_file_name)
+                        main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+                        provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
+                        if provisioning_profile_name.include?("adhoc")
+                            description = git!(%W(-C #{current_project_dir} show -s --format=commit::%H)).strip
+                        elsif provisioning_profile_name.include?("development")
+                            if File.exist?(File.join(current_project_dir, ".release_info"))
+                                description = File.read(File.join(current_project_dir, ".release_info"))
+                            else
+                                description = git!(%W(-C #{current_project_dir} show -s --format=%h::%s)).strip
+                            end
+                        elsif provisioning_profile_name.include?("appstore")
+                            description = "提交包重签名"
+                        end
                     end
                 end
 
-                puts "description : #{description}"
-
                 addtach_file = nil
                 if ipa_file_upload.include?(File.join(current_project_dir, "build")) && File.exist?(File.join(current_project_dir, "VMData"))
 
@@ -149,7 +167,8 @@ module Pindo
 
                 puts
                 puts "上传项目: #{app_info_obj["appName"]}"
-                puts "上传备注: #{description}"
+                print "上传备注: "
+                puts description
 
 
                 aws_client = AWSS3Client.new
@@ -205,9 +224,12 @@ module Pindo
         end
 
 
-        def send_apptest_wechat_msg(msg_data:nil)
+        def send_apptest_wechat_msg(msg_data:nil, wechat_url:nil)
 
-                wechat_msg_url = get_user_local_wechat_url()
+                wechat_msg_url = wechat_url
+                if wechat_msg_url.nil? || wechat_msg_url.empty?
+                    wechat_msg_url = get_user_local_wechat_url()
+                end
 
                 if !wechat_msg_url.nil? && wechat_msg_url.length >1
 
@@ -396,8 +418,11 @@ module Pindo
                 Funlog.instance.fancyinfo_start("正在拉取app上传记录...")
 
                 appId = app_info_obj["appId"]
+                # puts "appId #{appId}"
                 version_data = @pgyer_client.get_app_version_list_req(appId:appId) || {}
 
+                Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
+
                 if version_data["data"].nil? || version_data["data"].size <=0
                     raise Informative, "#{proj_name} 错误， 没有找到上传记录"
                 end
@@ -424,7 +449,7 @@ module Pindo
 
                 end
 
-                Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
+
 
                 version_item_obj = nil
                 if !app_incId_index.nil?

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

@@ -7,8 +7,7 @@ module Pindo
     module XcodeAppConfig
         
         def auto_increase_buildnumber(app_config_file:nil)
-
-            if !File.exist?(app_config_file)
+            if File.exist?(app_config_file)
                 config_json = JSON.parse(File.read(app_config_file))
                 app_version = config_json['app_info']['app_version']
                 app_build_version = config_json['app_info']['app_build_version']
@@ -26,7 +25,7 @@ module Pindo
                 app_build_version = app_build_version_array.join(".")
 
                 config_json['app_info']['app_build_version'] = app_build_version
-                File.open(app_origin_config, "w") do |file|
+                File.open(app_config_file, "w") do |file|
                     file.write(JSON.pretty_generate(config_json))
                     file.close
                 end
@@ -139,7 +138,9 @@ module Pindo
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             project_obj = Xcodeproj::Project.open(project_fullname) 
             presources_group = find_group(group:project_obj.main_group, group_name:"PResources")
-
+            if presources_group.nil? 
+                presources_group = find_group(group:project_obj.main_group, group_name:"PResource")
+            end
             if presources_group.nil? 
                 raise Informative, "没有找到资源目录PResources!!!!"
             end 

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

@@ -7,13 +7,13 @@ require 'pindo/module/cert/xcodecerthelper'
 module Pindo
 
     module XcodeBuildHelper
-    
+
         def pull_podfile_lock(project_dir:nil, app_config_dir:nil)
             begin
                 src_pod_file = File.join(app_config_dir, "Podfile.lock")
                 build_verify_file = File.join(app_config_dir, "build_verify.json")
                 build_verify_json = nil
-                begin 
+                begin
                     build_verify_json = JSON.parse(File.read(build_verify_file))
                 rescue => error
                 end
@@ -37,7 +37,7 @@ module Pindo
                 end
             rescue => error
                 raise Informative,  "获取Podfile.lock 文件失败！！！"
-            end 
+            end
         end
 
 
@@ -52,7 +52,7 @@ module Pindo
                 checksum = Digest::MD5.hexdigest(bytes)
                 build_verify_file = File.join(app_config_dir, "build_verify.json")
                 build_verify_json = nil
-                begin 
+                begin
                     build_verify_json = JSON.parse(File.read(build_verify_file))
                 rescue => error
                 end
@@ -61,7 +61,7 @@ module Pindo
                 build_verify_json["output_config_commit"] = git_latest_commit_id(local_repo_dir:app_config_dir)
                 build_verify_json["output_podfile_checksum"] = checksum
                 build_verify_json["output_time"] = Time.now.strftime('%y/%m/%d %H:%M:%S')
-                
+
                 File.open(build_verify_file, "w") do |file|
                     file.write(JSON.pretty_generate(build_verify_json))
                     file.close
@@ -70,26 +70,26 @@ module Pindo
 
           rescue => error
               raise Informative,  "保存Podfile.lock 文件失败！！！"
-          end 
+          end
         end
 
         def install_google_plist(project_dir:nil, app_config_dir:nil)
 
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-            project_obj = Xcodeproj::Project.open(project_fullname) 
+            project_obj = Xcodeproj::Project.open(project_fullname)
             select_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
             file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("GoogleService-Info.plist") }.first
-            
+
             if !file_ref.nil?
                 xcode_googleinfo_path = file_ref.real_path
-                
-                if !File.exist?(File.join(app_config_dir, "GoogleService-Info.plist")) 
+
+                if !File.exist?(File.join(app_config_dir, "GoogleService-Info.plist"))
                     raise Informative, "缺少 GoogleService-Info.plist ==> #{app_config_dir}!!!"
                 else
                     FileUtils.cp(File.join(app_config_dir, "GoogleService-Info.plist"), xcode_googleinfo_path)
                 end
-                
-                if !File.exist?(xcode_googleinfo_path) 
+
+                if !File.exist?(xcode_googleinfo_path)
                     raise Informative, "拷贝 GoogleService-Info.plist 失败！！==> #{xcode_googleinfo_path}!!!"
                 end
             end
@@ -120,7 +120,7 @@ module Pindo
                 target_name_map = get_target_name_map
                if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
                     target.build_configurations.each do |config|
-                        config.build_settings['PRODUCT_NAME'] = exe_binary_name 
+                        config.build_settings['PRODUCT_NAME'] = exe_binary_name
                         config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_targe
                     end
                 elsif
@@ -151,64 +151,67 @@ module Pindo
                 if !info_plist_dict["CFBundleName"].nil?
                     info_plist_dict["CFBundleName"] = exe_binary_name
                 end
-                
-                if config_json['app_info']["imessage_display_name"] && target_name && target_name.end_with?("iMessage") 
+
+                if config_json['app_info']["imessage_display_name"] && target_name && target_name.end_with?("iMessage")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["imessage_display_name"]
                 end
-                if config_json['app_info']["extension_display_name"] && target_name && target_name.end_with?("Extension") 
+                if config_json['app_info']["extension_display_name"] && target_name && target_name.end_with?("Extension")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["extension_display_name"]
                 end
 
 
-                if config_json['app_info']["extensionad_display_name"] && target_name && target_name.end_with?("ExtensionAd") 
+                if config_json['app_info']["extensionad_display_name"] && target_name && target_name.end_with?("ExtensionAd")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["extensionad_display_name"]
                 end
 
-                if config_json['app_info']["extensionporn_display_name"] && target_name && target_name.end_with?("ExtensionPorn") 
+                if config_json['app_info']["extensionporn_display_name"] && target_name && target_name.end_with?("ExtensionPorn")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["extensionporn_display_name"]
                 end
-                
-                if config_json['app_info']["keyboard_display_name"] && target_name && target_name.end_with?("Keyboard") 
+
+                if config_json['app_info']["keyboard_display_name"] && target_name && target_name.end_with?("Keyboard")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["keyboard_display_name"]
                 end
-                
 
-                if config_json['app_info']["siri_display_name"] && target_name && target_name.end_with?("Keyboard") 
+
+                if config_json['app_info']["siri_display_name"] && target_name && target_name.end_with?("Keyboard")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["siri_display_name"]
                 end
 
-                if config_json['app_info']["siriui_display_name"] && target_name && target_name.end_with?("iMessage") 
+                if config_json['app_info']["siriui_display_name"] && target_name && target_name.end_with?("iMessage")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["siriui_display_name"]
                 end
-                
+
 
 
                 unless config_json['app_info']["app_version"]
                     raise Informative, "config.json Missing app_info app_version !!!"
-                end 
+                end
 
                 info_plist_dict["CFBundleShortVersionString"] = config_json['app_info']["app_version"]
 
                 unless config_json['app_info']["app_build_version"]
                     raise Informative, "config.json Missing app_info app_build_version !!!"
-                end 
+                end
                 info_plist_dict["CFBundleVersion"] = config_json['app_info']["app_build_version"]
                 Xcodeproj::Plist.write_to_path(info_plist_dict, plist_file_name)
             end
         end
 
-        
+
         def modify_maintarget_info_plist(plist_file_name:nil, config_json:nil, target_name:nil)
             if File.exist?(plist_file_name)
                 info_plist_dict = Xcodeproj::Plist.read_from_path(plist_file_name)
 
                 info_plist_dict.delete("AccountKitClientToken")
-                
-                if info_plist_dict["Fabric"] 
+
+                if info_plist_dict["Fabric"]
                     info_plist_dict.delete('Fabric')
                 end
 
-                
+                if info_plist_dict["UIRequiredDeviceCapabilities"] && !info_plist_dict["UIRequiredDeviceCapabilities"].first.nil? && info_plist_dict["UIRequiredDeviceCapabilities"].first == "armv7"
+                    raise Informative, "Info.plist里面有多余的Key  UIRequiredDeviceCapabilities  armv7"
+                end
+
                 if !config_json['app_info']['admob_app_id'].nil? && config_json['app_info']['admob_app_id'].include?("__________config")
                     raise Informative, "config.json 配置文件key :admob_app_id 包含初始值未修改, 配置正确的值或者删除！！！"
                 end
@@ -217,7 +220,7 @@ module Pindo
                     raise Informative, "工程Info.plist中有 Admob 配置，config.json缺少 Admob 配置参数！！！"
                 end
 
-                if !config_json['app_info']['admob_app_id'].nil? 
+                if !config_json['app_info']['admob_app_id'].nil?
                     info_plist_dict["GADApplicationIdentifier"] = config_json['app_info']['admob_app_id']
                 end
 
@@ -227,7 +230,7 @@ module Pindo
                 if !config_json['app_info']['applovin_app_id'].nil? && config_json['app_info']['applovin_app_id'].include?("__________config")
                     raise Informative, "config.json 配置文件key :applovin_app_id 包含初始值未修改, 配置正确的值或者删除！！！"
                 end
-                
+
                 if !info_plist_dict["AppLovinSdkKey"].nil? && config_json['app_info']['applovin_app_id'].nil?
                     raise Informative, "工程Info.plist中有 AppLovin 配置，config.json缺少 AppLovin 配置参数！！！"
                 end
@@ -246,10 +249,10 @@ module Pindo
                 #     info_plist_dict.delete('AppLovinSdkKey')
                 # end
 
-            
 
-                
-                
+
+
+
                 info_plist_dict["CFBundleURLTypes"] = []
                 item0 = {}
                 item0["CFBundleTypeRole"] = "Editor"
@@ -257,7 +260,7 @@ module Pindo
                 item0["CFBundleURLSchemes"] = []
                 item0["CFBundleURLSchemes"] << "$(PRODUCT_BUNDLE_IDENTIFIER)"
                 info_plist_dict["CFBundleURLTypes"] << item0
-                
+
                 if config_json['app_info'] && config_json['app_info']['facebook_app_id']
                     info_plist_dict["FacebookAppID"] = config_json['app_info']['facebook_app_id']
                     if config_json['app_info']['facebook_client_token'].nil?
@@ -294,7 +297,7 @@ module Pindo
                 info_plist_path = File.join(project_dir, temp_info)
 
                 if target.product_type.to_s.eql?("com.apple.product-type.application") &&  !File.exist?(info_plist_path)
-                    raise Informative, "Missing Target #{target.name.to_s} Info.plist !!! Modify Info.plist Error !!!"                
+                    raise Informative, "Missing Target #{target.name.to_s} Info.plist !!! Modify Info.plist Error !!!"
                 end
 
                 if target.product_type.to_s.eql?("com.apple.product-type.application") then

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

@@ -72,20 +72,36 @@ module Pindo
 
         def initialize(proj_fullname:nil)
             @proj_fullname = proj_fullname
-            @project_obj = Xcodeproj::Project.open(proj_fullname) 
+            @project_obj = Xcodeproj::Project.open(proj_fullname)
         end
 
         def get_xcodeproj_icon_path
+
+            icon_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
-            file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
-            icon_path = File.join(file_ref.real_path,"AppIcon.appiconset")
+            if !select_target.nil?
+                file_refs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
+                file_refs.each do |file_ref|
+                    icon_path = File.join(file_ref.real_path,"AppIcon.appiconset")
+                    if File.exist?(icon_path)
+                        break
+                    else
+                        next
+                    end
+                end
+            end
+
+            if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
+                raise Informative, "没有找到Xcode icon 目录"
+            end
+
             return icon_path
         end
 
         def install_icon_res(new_icon_dir:nil)
             icon_path = get_xcodeproj_icon_path
             begin
-                FileUtils.rm_rf(icon_path) 
+                FileUtils.rm_rf(icon_path)
                 FileUtils.mkdir_p(icon_path)
             rescue StandardError => e
             end
@@ -110,16 +126,28 @@ module Pindo
             icon_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:messages_extension])  }.first
             if !select_target.nil?
-                file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
-                icon_path = File.join(file_ref.real_path,"iMessage App Icon.stickersiconset")
+                file_refs = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") } || []
+                file_refs.each do |file_ref|
+                    icon_path = File.join(file_ref.real_path,"iMessage App Icon.stickersiconset")
+                    if File.exist?(icon_path)
+                        break
+                    else
+                        next
+                    end
+                end
+
+                if icon_path.nil? || icon_path.empty? || !File.exist?(icon_path)
+                    raise Informative, "没有找到Xcode iMessage icon 目录"
+                end
             end
+
             return icon_path
         end
 
         def install_imessage_icon_res(new_icon_dir:nil)
             icon_path = get_xcodeproj_imessage_icon_path
             begin
-                FileUtils.rm_rf(icon_path) 
+                FileUtils.rm_rf(icon_path)
                 FileUtils.mkdir_p(icon_path)
             rescue StandardError => e
             end
@@ -147,7 +175,7 @@ module Pindo
             launchimg_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
             file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
-            
+
             assets_path = file_ref.real_path
             if File.exist?(File.join(assets_path, "LaunchImage.imageset"))
                 launchimg_path = File.join(assets_path, "LaunchImage.imageset")
@@ -167,9 +195,9 @@ module Pindo
             end
 
             project_origin_launchimg = Dir.glob(File.join(xcodeproj_launchimg_path, "/*.png")).max_by {|f| File.mtime(f)}
-            
+
             if project_origin_launchimg.nil? || !File.exist?(project_origin_launchimg)
-                return                
+                return
             end
 
             if File.exist?(project_origin_launchimg) && !File.exist?(launchimg_file)
@@ -177,7 +205,7 @@ module Pindo
             end
 
             begin
-                FileUtils.rm_rf(xcodeproj_launchimg_path) 
+                FileUtils.rm_rf(xcodeproj_launchimg_path)
                 FileUtils.mkdir_p(xcodeproj_launchimg_path)
             rescue StandardError => e
             end
@@ -190,7 +218,7 @@ module Pindo
             File.open(File.join(xcodeproj_launchimg_path, "Contents.json"), "w") do |f|
                 f.write(JSON.pretty_generate(launch_json))
             end
-        
+
         end
 
     end

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.7.1"
+  	VERSION = "4.7.3"
 
   	class VersionCheck