pindo 4.7.0 → 4.7.2

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

@@ -3,11 +3,13 @@ require 'open3'
 require 'security'
 
 module Pindo
-  
+
   module KeychainHelper
 
     def self.import_file(path, keychain_path, keychain_password: nil, certificate_password: "", skip_set_partition_list: false, output: false)
-      puts "Could not find file '#{path}'" unless File.exist?(path)
+      # puts path
+
+      # puts "Could not find file '#{path}'" unless File.exist?(path)
 
       password_part = " -P #{certificate_password.shellescape}"
 
@@ -19,22 +21,28 @@ module Pindo
       command << " -T /usr/bin/productsign"  # to not be asked for permission when using an installer cert for macOS
       command << " 1> /dev/null" unless output
 
-      sensitive_command = command.gsub(password_part, " -P ********")
-      UI.command(sensitive_command) if output
-      Open3.popen3(command) do |stdin, stdout, stderr, thrd|
-        UI.command_output(stdout.read.to_s) if output
+      # puts command
+      # sensitive_command = command.gsub(password_part, " -P ********")
 
+      # UI.command(sensitive_command) if output
+      Open3.popen3(command) do |stdin, stdout, stderr, thrd|
+        # UI.command_output(stdout.read.to_s) if output
+        # puts "123"
         # Set partition list only if success since it can be a time consuming process if a lot of keys are installed
         if thrd.value.success? && !skip_set_partition_list
+          # puts "安装成功!"
           keychain_password ||= resolve_keychain_password(keychain_path)
           set_partition_list(path, keychain_path, keychain_password: keychain_password, output: output)
         else
           # Output verbose if file is already installed since not an error otherwise we will show the whole error
           err = stderr.read.to_s.strip
+
           if err.include?("SecKeychainItemImport") && err.include?("The specified item already exists in the keychain")
-            # UI.verbose("'#{File.basename(path)}' is already installed on this machine")
+            # UI.verbose("'}' is already installed on this machine")
+            # puts "证书key已经存在，安装完成!"
           else
-            raise Informative, err
+            # puts err
+            # raise Informative, err
           end
         end
       end
@@ -64,8 +72,9 @@ module Pindo
         # Helper.show_loading_indicator("Setting key partition list... (this can take a minute if there are a lot of keys installed)")
 
         # Strip keychain password from command output
-        sensitive_command = command.gsub(password_part, " -k ********")
-        UI.command(sensitive_command) if output
+        # sensitive_command = command.gsub(password_part, " -k ********")
+        # puts command
+        # UI.command(sensitive_command) if output
         Open3.popen3(command) do |stdin, stdout, stderr, thrd|
           unless thrd.value.success?
             err = stderr.read.to_s.strip
@@ -73,6 +82,9 @@ module Pindo
             # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
             if err.include?("SecKeychainItemSetAccessWithPassword")
               keychain_name = File.basename(keychain_path, ".*")
+              # puts "password #{keychain_password}"
+              # puts "keychain #{keychain_name}"
+              # puts "security #{server_name(keychain_name)}"
               Security::InternetPassword.delete(server: server_name(keychain_name))
 
               # UI.important("")
@@ -83,9 +95,9 @@ module Pindo
               # UI.important("Please look at the following docs to see how to set a keychain password:")
               # UI.important(" - https://docs.fastlane.tools/actions/sync_code_signing")
               # UI.important(" - https://docs.fastlane.tools/actions/get_certificates")
-              puts "密码错误"
+              # puts "证书密码错误!"
             else
-              raise Informative, err
+              puts err
             end
           end
         end
@@ -130,7 +142,7 @@ module Pindo
 
     # server name used for accessing the macOS keychain
     def self.server_name(keychain_name)
-      ["fastlane", "keychain", keychain_name].join("_")
+      ["pindo", "keychain", keychain_name].join("_")
     end
 
     private_class_method :server_name

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

@@ -89,7 +89,7 @@ module Pindo
 
         
         destination = File.join(profiles_path, profile_filename(path, keychain_path))
-        puts "Installing provisioning profile... #{destination}"
+        # puts "Installing provisioning profile... #{destination}"
         
         if path != destination
           # copy to Xcode provisioning profile directory

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

@@ -1,5 +1,6 @@
 
 require 'fileutils'
+require 'pindo/base/aeshelper'
 
 module Pindo
 
@@ -69,12 +70,17 @@ module Pindo
 
             new_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]) || 
+                    target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+                    next
+                end
                 provisioning_info = nil
 
                 if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
                     bundle_id_map_key = target_map["MainTarget"]
                     provisioning_info = provisioning_info_array.select { |s| s["type"].to_s.eql?(bundle_id_map_key.to_s) }.first
-                elsif
+                else 
+
                     target_map.each do |k, v|
                         if target.name.to_s.end_with?(k)
                             bundle_id_map_key = v.to_s
@@ -83,29 +89,34 @@ module Pindo
                     end
                 end
 
-                target.build_configurations.each do |config|
-                    target_atts_obj[target.uuid] = target_atts_obj[target.uuid] || {}
-                    target_atts_obj[target.uuid]['DevelopmentTeam'] = team_id_vaule
-                    target_atts_obj[target.uuid]['ProvisioningStyle'] = "Manual"
-                    config.build_settings['DEVELOPMENT_TEAM'] = team_id_vaule
-                    config.build_settings['DEVELOPMENT_TEAM[sdk=iphoneos*]'] = team_id_vaule
-                    config.build_settings['CODE_SIGN_STYLE'] = "Manual"
-
-                    config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution"
-                    config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Distribution"
-    
-                    if cert_type == "development"
-                        config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Development"
-                        config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Development"
-                    end
+                # puts "=====1 target name: #{target.name.to_s}  bundle_id_map_key: #{bundle_id_map_key}  provisioning_info: #{provisioning_info}"
 
-                    if !provisioning_info.nil?
-                        config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
-                        config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
-                        config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
-                        
+                if !provisioning_info.nil?
+                    target.build_configurations.each do |config|
+                        target_atts_obj[target.uuid] = target_atts_obj[target.uuid] || {}
+                        target_atts_obj[target.uuid]['DevelopmentTeam'] = team_id_vaule
+                        target_atts_obj[target.uuid]['ProvisioningStyle'] = "Manual"
+                        config.build_settings['DEVELOPMENT_TEAM'] = team_id_vaule
+                        config.build_settings['DEVELOPMENT_TEAM[sdk=iphoneos*]'] = team_id_vaule
+                        config.build_settings['CODE_SIGN_STYLE'] = "Manual"
+
+                        config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution"
+                        config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Distribution"
+        
+                        if cert_type == "development"
+                            config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Development"
+                            config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Development"
+                        end
+
+                        if !provisioning_info.nil?
+                            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
+                            config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
+                            config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
+                            
+                        end
                     end
                 end
+                
 
             end
             new_project_obj.save
@@ -120,6 +131,11 @@ 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]) || 
+                        target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+                        next
+                    end
+
                     temp_entitlements_file = target.build_configurations.first.build_settings['CODE_SIGN_ENTITLEMENTS']
                     if !temp_entitlements_file.nil? && !temp_entitlements_file.empty?
                         entitlements_plist_path = File.join(new_project_dir, temp_entitlements_file)
@@ -127,27 +143,37 @@ module Pindo
                         if !File.exist?(entitlements_plist_path)
                           raise Informative, "Target: #{target.name.to_s} 找不到文件 #{entitlements_plist_path}"
                         end
-                    end
 
-                    temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                    info_plist_path = File.join(new_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!!!  #{info_plist_path}  Modify Info.plist Error !!!"           
+                        if !group_id.nil?
+                            modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, group_id:group_id)
+                        end
+
+                        if target.product_type.to_s.eql?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) then
+                            add_swark_entitlement(entitlements_plist_path:entitlements_plist_path, bundle_id_dict:provisioning_info_array)
+                            if !icloud_id.nil?
+                              modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, icloud_id:icloud_id)
+                            end
+                        end
+
                     end
 
+                    temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+                    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 !!!"           
+                        end
 
-                    if target.product_type.to_s.eql?("com.apple.product-type.application") then
-                        add_swark_entitlement(entitlements_plist_path:entitlements_plist_path, bundle_id_dict:provisioning_info_array)
-                        if !icloud_id.nil?
-                          modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, icloud_id:icloud_id)
-                          modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:icloud_id)
-                        else
-                          modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:nil)
+                        if target.product_type.to_s.eql?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) then
+                            if !icloud_id.nil?
+                              modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:icloud_id)
+                            else
+                              modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:nil)
+                            end
                         end
+
                     end
-                    if !group_id.nil?
-                        modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, group_id:group_id)
-                    end
+
                 end
 
         end
@@ -200,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")
@@ -247,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

@@ -36,21 +36,27 @@ module Pindo
         def login
             @pgyer_client = PgyerClient.new
             if @force_login || !@has_login
-                @has_login = @pgyer_client.do_login(force_login:@force_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
-                
+
                 if !app_info_obj.nil?
                     return app_info_obj
                 end
@@ -58,35 +64,35 @@ module Pindo
                 proj_name_array = []
                 if File.exist?(File.join(working_directory, "config.json"))
                     config_json = JSON.parse(File.read(File.join(working_directory, "config.json")))
-                    proj_name_array << config_json["project_info"]["project_name"]    
+                    proj_name_array << config_json["project_info"]["project_name"]
                 end
 
                 xcodeproj_file_name = Dir.glob(File.join(Dir.pwd, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
                 upload_proj_name = File.basename(xcodeproj_file_name, ".xcodeproj") if xcodeproj_file_name
                 if !upload_proj_name.nil? && !upload_proj_name.empty?
-                    proj_name_array << upload_proj_name    
+                    proj_name_array << upload_proj_name
                 end
-                
+
                 puts
                 dir_base_name = File.basename(working_directory)
                 unless ["Desktop", "Documents", "Downloads"].include?(dir_base_name)
                     proj_name_array << dir_base_name
                 end
-            
+
                 proj_name_array << "自定义输入Pyger上的App代号"
 
                 if proj_name_array.size > 1
                     cli = HighLine.new
                     upload_proj_name = cli.choose do |menu|
-                        menu.prompt = "请选择对应的Pgyer App代号:"
+                        menu.prompt = "请选择Pgyer上的App代号:"
                         menu.choices(*proj_name_array)
                     end
                     if upload_proj_name.include?("自定义输入")
-                        upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                        upload_proj_name = ask('请输入Pyger上的App代号(大小写空格忽略):') || nil
                         upload_proj_name = upload_proj_name.strip
                     end
                 else
-                    upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                    upload_proj_name = ask('请输入Pyger上的App代号(大小写空格忽略):') || nil
                     upload_proj_name = upload_proj_name.strip
                 end
 
@@ -94,15 +100,18 @@ module Pindo
                 app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
 
                 if app_info_obj.nil?
-                    upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                    upload_proj_name = ask('没有找到结果,请重新输入Pyger上的App代号(大小写空格忽略):') || nil
                     upload_proj_name = upload_proj_name.strip
                     app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
                 end
 
                 if app_info_obj.nil?
-                    raise Informative, "#{upload_proj_name} 错误， 请输入正确的App代号， pgyer网站没有该App"
+                    raise Informative, "#{upload_proj_name} 名称错误, 请输入正确的App代号,Pgyer网站没有该App!!!"
                 end
+            else
+                raise Informative, "请先登录Pgyer网站"
             end
+            @proj_name = upload_proj_name
             app_info_obj
         end
 
@@ -110,20 +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
-                puts "current_project_dir : #{current_project_dir}"
-                puts description
-                puts File.exist?(File.join(current_project_dir, ".git"))
                 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"))
 
@@ -150,7 +167,8 @@ module Pindo
 
                 puts
                 puts "上传项目: #{app_info_obj["appName"]}"
-                puts "上传备注: #{description}"
+                print "上传备注: "
+                puts description
 
 
                 aws_client = AWSS3Client.new
@@ -206,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
 
@@ -264,7 +285,7 @@ module Pindo
                             req.headers['Content-Type'] = 'application/json'
                             req.body =  body_data.to_json
                         end
-                        
+
 
                         body_data = {
                             msgtype:"text",
@@ -387,7 +408,7 @@ module Pindo
                 Funlog.instance.fancyinfo_error("拉取app信息列表失败!")
                 raise Informative, "Pgyer网络数据异常!!!"
             end
-            
+
 
             return app_info_list
         end
@@ -397,6 +418,7 @@ 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) || {}
 
                 if version_data["data"].nil? || version_data["data"].size <=0
@@ -424,7 +446,7 @@ module Pindo
                     app_incId_index = ask('请选择上面的Build号:')
 
                 end
-                
+
                 Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
 
                 version_item_obj = nil
@@ -508,7 +530,7 @@ module Pindo
                 return true
             else
                 Funlog.instance.fancyinfo_error("重签名失败!")
-                return false                
+                return false
             end
 
         end

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

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
@@ -109,17 +125,29 @@ module Pindo
         def get_xcodeproj_imessage_icon_path
             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")
+            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,"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/module/xcode/xcodereshelper.rb

@@ -63,7 +63,7 @@ module Pindo
                     'sips',
                     '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
                     '-z', width.to_s, height.to_s,
-                    icon_name,
+                    icon_ori_name,
                     '--out', File.join(new_icon_dir, image_name)
                 ]
                 Executable.capture_command('sips', command, capture: :out)
@@ -83,7 +83,6 @@ module Pindo
             create_icon(icon_name: icon_name, new_icon_dir: new_icon_dir, xcode_icon_json: XcodoeResConst.xcode_ios_icon_json)
             icon_dir = File.dirname(icon_name)
             imessage_icon = File.join(icon_dir, "icon1024_768.png")
-
             new_imessage_icon_dir = File.join(new_icon_dir, "imessage")
 
             if File.exist?(imessage_icon)
@@ -92,7 +91,7 @@ module Pindo
                 rescue => e
                     puts e
                 end
-                create_imessage_icon(icon_name: imessage_icon, image_icon_name:imessage_icon, new_icon_dir: new_imessage_icon_dir, xcode_icon_json: XcodoeResConst.xcode_ios_imessage_icon_json)
+                create_imessage_icon(icon_name: icon_name, image_icon_name:imessage_icon, new_icon_dir: new_imessage_icon_dir, xcode_icon_json: XcodoeResConst.xcode_ios_imessage_icon_json)
             end
         end