cocoapods-kz 0.0.10 → 0.0.13

data/lib/cocoapods-kz/helpers/kz_generator.rb

@@ -8,6 +8,8 @@ module KZ
     def initialize(main_project)
       @all_kz_pod_targets = KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets
       @main_project = main_project
+      @installation_root = Pod::Config.instance.installation_root
+      @on_demand_resources_folder = KZ_POD_CONFIG_ROOT + "OnDemandResources"
     end
 
     def add_framework_generator_build_phase(native_target)
@@ -29,20 +31,27 @@ module KZ
       end
 
       xml_rule = new_build_rule(project, native_target, '[KZ] Custom Xml Build')
+      xml_rule.run_once_per_architecture = '0'
       xml_rule.file_type = 'text.xml'
       xml_rule.output_files = Array['${KZ_XML_FLEX_DIR}/${INPUT_FILE_BASE}.flex']
       xml_rule.script = KZ.deal_path_for_xcconfig(KZ_XML_BUILD_PATH, true)
     end
 
     def add_force_load_exe_path_build_phase(native_target, output_path)
-      return if KZ::KZGlobalHelper.instance.disable_generate_framework
-
       build_phase = native_target.new_shell_script_build_phase('[KZ] Froce Load File Output Path')
       build_phase.show_env_vars_in_log = '0'
       build_phase.output_paths = [output_path]
       build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_FIX_FORCE_LOAD_EXE, true)
     end
 
+    def add_improve_yaml_build_phase(project, native_target, output_path)
+      build_phase = new_shell_script_build_phase(project, native_target, '[KZ] Improve Custom Yaml', true)
+      build_phase.show_env_vars_in_log = '0'
+      # build_phase.always_out_of_date = '1'
+      build_phase.output_paths = [output_path]
+      build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_IMPROVE_CUSTOM_YAML_PATH, true)
+    end
+
     def new_build_rule(project, native_target, name)
       new_rule = nil
       native_target.build_rules.each do |build_rule|
@@ -59,6 +68,27 @@ module KZ
       new_rule
     end
 
+    def new_shell_script_build_phase(project, native_target, name, before_compile = false)
+      new_build_phase = project.new(Xcodeproj::Project::PBXShellScriptBuildPhase)
+      new_build_phase.name = name
+      if before_compile
+        find_compile = false
+        native_target.build_phases.each_with_index do |build_phase, index|
+          if build_phase.is_a?(Xcodeproj::Project::PBXSourcesBuildPhase)
+            find_compile = true
+            native_target.build_phases.insert(index, new_build_phase)
+            break
+          end
+        end
+        unless find_compile
+          native_target.build_phases << new_build_phase
+        end
+      else
+        native_target.build_phases << new_build_phase
+      end
+      new_build_phase
+    end
+
     def create_hamp
       # 创建壳工程hmap
       main_sources_path = @main_project.project_dir + @main_project.root_object.display_name
@@ -108,18 +138,33 @@ module KZ
 
         if all_repair_hmap_info.count > 0
           hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
+          FileUtils.mkdir_p(hmap_cache_path) unless File.exist?(hmap_cache_path)
+
           save_hmap_file(all_repair_hmap_info, hmap_cache_path, target_name + '_repair')
           kz_pod_target.repair_header_search_path = hmap_cache_path + "#{target_name}_repair.hmap"
         end
 
         # 添加私有头文件引用
         if kz_pod_target.current_should_build?
-          private_hamp_info = private_hmap_info(kz_pod_target)
-          if private_hamp_info.count > 0
+          pod_hamp_info = pod_hmap_info(kz_pod_target)
+          if pod_hamp_info.count > 0
             hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
-            save_hmap_file(private_hamp_info, hmap_cache_path, target_name)
+            FileUtils.mkdir_p(hmap_cache_path) unless File.exist?(hmap_cache_path)
+
+            save_hmap_file(pod_hamp_info, hmap_cache_path, target_name)
             kz_pod_target.private_header_search_path = hmap_cache_path + "#{target_name}.hmap"
           end
+
+          pod_yaml_info = pod_yaml_info(kz_pod_target)
+          if pod_yaml_info.count > 0
+            yaml_cache_path = kz_pod_target.pod_config_cache_path(false)
+            FileUtils.mkdir_p(yaml_cache_path) unless File.exist?(yaml_cache_path)
+
+            yaml_name = "#{target_name}_origin.yaml"
+            save_yaml_file(pod_yaml_info, yaml_cache_path + yaml_name)
+            kz_pod_target.custom_origin_yaml_path = yaml_cache_path + yaml_name
+            kz_pod_target.custom_yaml_path = yaml_cache_path + "#{target_name}.yaml"
+          end
         end
       end
     end
@@ -141,13 +186,14 @@ module KZ
 
     def clean_hmap_cache(kz_pod_target)
       hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
+
       Dir.foreach(hmap_cache_path) do |file_name|
         next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
-        if file_name.end_with?(".hmap", ".json")
+        if file_name.end_with?(".hmap", ".json", "yaml")
           FileUtils.rm(hmap_cache_path + file_name) if File.exist?(hmap_cache_path + file_name)
         end
-      end
+      end if File.exist?(hmap_cache_path)
     end
 
     def repair_hmap_info(kz_pod_target)
@@ -175,50 +221,105 @@ module KZ
       end
     end
 
-    def private_hmap_info(kz_pod_target)
-      header_paths = kz_pod_target.all_headers
-      # 更新Headers
-      if kz_pod_target.is_dev_pod
-        header_paths.each do |header_pathname|
-          symlink_path = kz_pod_target.local_private_headers_path + header_pathname.basename
-          File.symlink(header_pathname, symlink_path) unless File.symlink?(symlink_path) || File.exist?(symlink_path)
-        end
-        kz_pod_target.use_local_private_headers_path = true
+    def pod_hmap_info(kz_pod_target)
+      pod_hmap_info = {}
+      module_name = kz_pod_target.kz_module_name
+
+      # public headers
+      public_headers = kz_pod_target.public_headers
+      public_headers.each do |header_pathname|
+        header_pathname_basename = header_pathname.basename.to_s
+
+        header_hmap_value_quotes = {}
+        header_hmap_value_quotes['suffix'] = header_pathname_basename
+        header_hmap_value_quotes['prefix'] = module_name + '/'
+        pod_hmap_info[header_pathname_basename] = header_hmap_value_quotes
+        pod_hmap_info[module_name + '/' + header_pathname_basename] = header_hmap_value_quotes
       end
-      header_paths.each_with_object({}) do |header_pathname, hmap_info|
+
+      # private headers
+      all_headers = kz_pod_target.all_headers
+      (all_headers - public_headers).each do |header_pathname|
         header_pathname_basename = header_pathname.basename.to_s
 
         header_hmap_value_quotes = {}
         header_hmap_value_quotes['suffix'] = header_pathname_basename
         header_hmap_value_quotes['prefix'] = header_pathname.dirname.to_s + '/'
-        hmap_info[header_pathname_basename] = header_hmap_value_quotes
+        pod_hmap_info[header_pathname_basename] = header_hmap_value_quotes
+      end
 
-        # pch
-        pchfile_path = kz_pod_target.prefix_header_path
-        if pchfile_path.exist?
-          suffix = pchfile_path.basename.to_s
-          hmap_info[suffix] = { 'suffix' => suffix, 'prefix' => "#{pchfile_path.dirname.to_s}/" }
-        end
+      # pch
+      pchfile_path = kz_pod_target.prefix_header_path
+      if pchfile_path.exist?
+        suffix = pchfile_path.basename.to_s
+        pod_hmap_info[suffix] = { 'suffix' => suffix, 'prefix' => "#{pchfile_path.dirname.to_s}/" }
+      end
 
-        unless kz_pod_target.is_dev_pod
-          # 个别第三方在使用自己组件文件时，会使用#import <xx/xx.h>的方式
-          hmap_info[kz_pod_target.product_basename + '/' + header_pathname_basename] = header_hmap_value_quotes
-        end
+      # umbrella
+      umbrella_path =  kz_pod_target.umbrella_header_path
+      if umbrella_path.exist?
+        suffix = umbrella_path.basename.to_s
+        pod_hmap_info[suffix] = { 'suffix' => suffix, 'prefix' => "#{module_name}/" }
+      end
 
-        if kz_pod_target.current_uses_swift? && kz_pod_target.is_dev_pod
-          # 修改SPBoss-Swift.h文件的导入方式
-          swift_bridge_file_name = "#{kz_pod_target.name}-Swift.h"
-          hmap_info[swift_bridge_file_name] = { 'suffix' => swift_bridge_file_name, 'prefix' => "#{kz_pod_target.name}/" }
+      if kz_pod_target.current_uses_swift? && kz_pod_target.is_dev_pod
+        # 修改SPBoss-Swift.h文件的导入方式
+        swift_bridge_file_name = "#{module_name}-Swift.h"
+        pod_hmap_info[swift_bridge_file_name] = { 'suffix' => swift_bridge_file_name, 'prefix' => "#{module_name}/" }
+      end
 
-          # 以SPBoss为例，在混编模式中，SPBoss-Swift.h会使用#import <SPBoss/SPBoss.h>方式导入swift需要使用的OC头文件
-          # SPBoss中头文件会存在当前组件与framework的Headers中，有两份。SPBoss-Swift.h只在framework中
-          # 编译默认从SPBoss-Swift.h找SPBoss.h，然后找SPBoss.h中的头文件也都会在framework中寻在，会造成与当前组件头文件重复
-          # 需要重新将#import <SPBoss/SPBoss.h>方式修复为寻找当前组件中的SPBoss.h文件，而不是framework中的SPBoss.h
-          if header_pathname_basename == "#{kz_pod_target.name}.h"
-            hmap_info[kz_pod_target.name + '/' + header_pathname_basename] = header_hmap_value_quotes
-          end
+      # 另存一份Headers，用于创建文件与import时的提示信息
+      if kz_pod_target.is_dev_pod
+        all_headers.each do |header_pathname|
+          symlink_path = kz_pod_target.local_private_headers_path + header_pathname.basename
+          File.symlink(header_pathname, symlink_path) unless File.symlink?(symlink_path) || File.exist?(symlink_path)
         end
+        kz_pod_target.use_local_private_headers_path = true
       end
+      pod_hmap_info
+    end
+
+    def pod_yaml_info(kz_pod_target)
+      built_products_dir = "__built_products_dir__/"
+
+      pod_yaml_info = {}
+      pod_yaml_info["case-sensitive"] = "false"
+      pod_yaml_info["version"] = "0"
+
+      yaml_roots = []
+      pod_yaml_info["roots"] = yaml_roots
+
+      yaml_header_info = {}
+      yaml_header_info["type"] = "directory"
+      yaml_header_info["name"] = built_products_dir + "#{kz_pod_target.product_name}/Headers"
+      yaml_roots.append(yaml_header_info)
+
+      public_headers = kz_pod_target.public_headers
+      yaml_header_contents = []
+      yaml_header_info["contents"] = yaml_header_contents
+      public_headers.each do |header_pathname|
+        yaml_header_content = {}
+        yaml_header_content["type"] = "file"
+        yaml_header_content["name"] = header_pathname.basename.to_s
+        yaml_header_content["external-contents"] = header_pathname.to_s
+        yaml_header_contents.append(yaml_header_content)
+      end
+
+      yaml_modulemap_info = {}
+      yaml_modulemap_info["type"] = "directory"
+      yaml_modulemap_info["name"] = built_products_dir + "#{kz_pod_target.product_name}/Modules"
+      yaml_roots.append(yaml_modulemap_info)
+
+      yaml_modulemap_contents = []
+      yaml_modulemap_info["contents"] = yaml_modulemap_contents
+
+      yaml_modulemap_content = {}
+      yaml_modulemap_content["type"] = "file"
+      yaml_modulemap_content["name"] = "module.modulemap"
+      yaml_modulemap_content["external-contents"] = built_products_dir + "#{kz_pod_target.product_name}/Modules/module.modulemap"
+      yaml_modulemap_contents.append(yaml_modulemap_content)
+
+      pod_yaml_info
     end
 
     def save_hmap_file(hmap_hash, save_path, file_name)
@@ -229,10 +330,240 @@ module KZ
       return unless json_file
 
       json_file.syswrite(hmap_json)
+      json_file.close
+
       system "#{HMAP_EXECUTE_PATH} convert #{hmap_json_path} #{hmap_path}"
 
       FileUtils.rm(hmap_json_path) unless KZ::KZGlobalHelper.instance.debug
     end
 
+    def save_yaml_file(yaml_hash, save_path)
+      yaml_json = JSON.pretty_generate(yaml_hash)
+      json_file = File.new(save_path, 'w')
+      return unless json_file
+
+      json_file.syswrite(yaml_json)
+      json_file.close
+    end
+
+    def create_on_demand_resources
+      # 清除历史配置
+      FileUtils.rm_r(@on_demand_resources_folder) if File.exist?(@on_demand_resources_folder)
+      FileUtils.mkdir_p(@on_demand_resources_folder)
+
+      # 汇总所有配置文件，用于代码中加载资源
+      on_demand_resources_all_config = {}
+      @all_kz_pod_targets.each do |target_name, kz_pod_target|
+        if kz_pod_target.is_dev_pod
+          # 寻找配置文件KZOnDemandResourcesConfig.plist
+          kz_pod_target.native_pod_target.file_accessors.each do |file_accessor|
+            file_accessor.resource_bundles.map do |bundle_name, paths|
+              paths.each do |path|
+                if path.basename.to_s == "KZOnDemandResourcesConfig.plist"
+                  plist_hash = Xcodeproj::Plist.read_from_path(path)
+                  if plist_hash.size > 0
+                    on_demand_resources_all_config[kz_pod_target.name] = plist_hash
+                    analyze_on_demand_resources_config_plist(plist_hash, kz_pod_target, paths)
+                    kz_pod_target.add_on_demand_resources(path)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      if on_demand_resources_all_config.size > 0
+        use_for_code_plist_path = @on_demand_resources_folder + "KZOnDemandResourcesAllConfig.plist"
+        Xcodeproj::Plist.write_to_path(on_demand_resources_all_config, use_for_code_plist_path)
+      end
+    end
+
+    def analyze_on_demand_resources_config_plist(plist_hash, kz_pod_target, all_resources_paths)
+      resources_path = @on_demand_resources_folder + "Bundles/#{kz_pod_target.name}"
+      FileUtils.mkdir_p(resources_path)
+
+      # 生成AssetPackOutputSpecifications.plist，用于Images.xcassets编译
+      asset_pack_output_specifications_resources = []
+
+      # 用于生成OnDemandResources.plist文件，放到main bundle中标记按需加载资源
+      on_demand_resources_plist = {}
+      bundle_resource_request_tags = {}
+      on_demand_resources_plist["NSBundleResourceRequestTags"] = bundle_resource_request_tags
+      bundle_resource_request_asset_packs = {}
+      on_demand_resources_plist["NSBundleResourceRequestAssetPacks"] = bundle_resource_request_asset_packs
+
+      # 统计所有的xcassets资源
+      have_config_xcassets = false
+
+      # 从配置plist中读取'Initial Install Tags'资源
+      initial_plist_hash = plist_hash["Initial Install Tags"]
+      on_deman_resources_from_plist(initial_plist_hash, kz_pod_target, 1, all_resources_paths, resources_path) do |tag, bundle_id, bundle_path, normal_file_names, have_xcassets_paths|
+        # 如有配置中有.xcassets资源，需要先标记，等待编译时单独再单独编译
+        if have_xcassets_paths
+          have_config_xcassets = true
+
+          resource_item = {}
+          resource_item["bundle-id"] = bundle_id
+          resource_item["bundle-path"] = bundle_path
+          resource_item["tags"] = [tag]
+          asset_pack_output_specifications_resources << resource_item
+        end
+
+        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
+        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+      end
+
+      # Prefetched Tag Order
+      prefetched_plist_hash = plist_hash["Prefetched Tag Order"]
+      on_deman_resources_from_plist(prefetched_plist_hash, kz_pod_target, 0.5, all_resources_paths, resources_path) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
+        if have_xcassets_paths
+          have_config_xcassets = true
+
+          resource_item = {}
+          resource_item["bundle-id"] = bundle_id
+          resource_item["bundle-path"] = bunlde_path
+          resource_item["tags"] = [tag]
+          asset_pack_output_specifications_resources << resource_item
+        end
+
+        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
+        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+      end
+
+      # Download Only On Demand
+      download_plist_hash = plist_hash["Download Only On Demand"]
+      on_deman_resources_from_plist(download_plist_hash, kz_pod_target, 0, all_resources_paths, resources_path) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
+        if have_xcassets_paths
+          have_config_xcassets = true
+
+          resource_item = {}
+          resource_item["bundle-id"] = bundle_id
+          resource_item["bundle-path"] = bunlde_path
+          resource_item["tags"] = [tag]
+          asset_pack_output_specifications_resources << resource_item
+        end
+
+        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
+        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+      end
+
+      if asset_pack_output_specifications_resources.size > 0
+        write_to_path(asset_pack_output_specifications_resources, resources_path + "AssetPackOutputSpecifications.plist")
+      end
+
+      if bundle_resource_request_tags.size > 0 || bundle_resource_request_asset_packs.size > 0
+        Xcodeproj::Plist.write_to_path(on_demand_resources_plist, resources_path + "OnDemandResources.plist")
+      end
+
+      # 一个组件可能有多个xcassets，只要其中一个有配置on demand resources，所有xcassets都需要单独编译
+      all_xcassets_paths = []
+      if have_config_xcassets
+        all_resources_paths.each do |path|
+          if path.extname == ".xcassets"
+            all_xcassets_paths << path
+          end
+        end
+      end
+
+      target_bundle_info = {}
+      target_bundle_info["name"] = kz_pod_target.name
+      target_bundle_info["xcassets_paths"] = all_xcassets_paths
+      Xcodeproj::Plist.write_to_path(target_bundle_info, resources_path + "TargetBundleInfo.plist")
+
+    end
+
+    def on_deman_resources_from_plist(plist_hash, kz_pod_target, priority, all_resources_paths, resources_path)
+      return unless (!plist_hash.nil? && plist_hash.size > 0)
+
+      plist_hash.each do |tag, file_paths|
+        normal_file_names = []
+        normal_file_paths = []
+        have_xcassets_paths = false
+        file_paths.each do |rel_file_path|
+          file_path = @installation_root + rel_file_path.strip
+          next unless file_path.exist?
+
+          if file_path.extname == ".imageset"
+            # imageset文件配置
+            xcassets_path = find_xcassets_path(file_path)
+            if all_resources_paths.include?(xcassets_path)
+              kz_pod_target.add_on_demand_resources(xcassets_path)
+              have_xcassets_paths = true
+            end
+
+            content_json_path = file_path + "Contents.json"
+            content_json = JSON.parse(File.read(file_path + "Contents.json"))
+            content_json["properties"] = { "on-demand-resource-tags" => [tag] }
+            content_json_file = File.new(content_json_path, 'w')
+            content_json_file.syswrite(JSON.pretty_generate(content_json))
+          else
+            # 普通文件配置
+            if all_resources_paths.include?(file_path)
+              kz_pod_target.add_on_demand_resources(file_path)
+              normal_file_paths << file_path
+              normal_file_names << file_path.basename
+            end
+          end
+        end
+
+        create_bundle_info_plist(tag, priority, normal_file_paths, resources_path) do |bundle_id, bundle_path|
+          yield(tag, bundle_id, bundle_path, normal_file_names, have_xcassets_paths)
+        end
+      end
+    end
+
+    def find_xcassets_path(path)
+      return "" if path.root?
+
+      if path.extname == ".xcassets"
+        path
+      else
+        find_xcassets_path(path + "..")
+      end
+    end
+
+    def create_bundle_info_plist(tag, priority, normal_file_paths, resource_path)
+      # project bundle identifier
+      project_bundle_identifier = KZGlobalHelper.instance.on_demand_resources_bundle_id
+      tag_md5 = md5_sign(tag)
+      # bundle folder
+      demand_bundle_folder_name = "#{project_bundle_identifier}.#{tag}-#{tag_md5}.assetpack"
+      demand_bundle_folder = resource_path + "OnDemandResources/#{demand_bundle_folder_name}"
+      # create bundle folder
+      FileUtils.mkdir_p(demand_bundle_folder) unless FileTest::exist?(demand_bundle_folder)
+      # copy file
+      normal_file_paths.each do |file|
+        FileUtils.cp(file, demand_bundle_folder)
+      end
+
+      bundle_info_plist = {}
+      bundle_info_plist["Priority"] = priority if priority > 0
+      bundle_info_plist["Tags"] = [tag]
+      demand_bundle_id = "#{project_bundle_identifier}.asset-pack-#{tag_md5}"
+      bundle_info_plist["CFBundleIdentifier"] = demand_bundle_id
+      Xcodeproj::Plist.write_to_path(bundle_info_plist, demand_bundle_folder + "Info.plist")
+
+      yield(demand_bundle_id, demand_bundle_folder_name)
+    end
+
+    def md5_sign(key)
+      OpenSSL::Digest::MD5.hexdigest(key)
+    end
+
+    # Xcodeproj::Plist.write_to_path只支持hash，如果是数组需要重写write方法
+    def write_to_path(hash, path)
+      unless path.is_a?(String) || path.is_a?(Pathname)
+        raise TypeError, "The given `#{path}` must be a string or 'pathname'."
+      end
+      path = path.to_s
+      raise IOError, 'Empty path.' if path.empty?
+
+      File.open(path, 'w') do |f|
+        plist = Nanaimo::Plist.new(hash, :xml)
+        Nanaimo::Writer::XMLWriter.new(plist, :pretty => true, :output => f, :strict => false).write
+      end
+    end
+
   end
 end

data/lib/cocoapods-kz/helpers/kz_global_helper.rb

@@ -18,11 +18,16 @@ module KZ
 
   HMAP_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/hmap'
   FLEX_COMPLIER_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'FlexCompiler'
+  ARM64_TO_SIMULATOR_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/arm64ToSimulator'
   KZ_GENERATOR_FRAMEWORK_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_generator_framework.sh'
   KZ_XML_BUILD_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_xml_build.sh'
   KZ_LOCK_FILE_PATH = KZ_POD_CONFIG_ROOT + 'KZConfigLock'
   KZ_FIX_FORCE_LOAD_EXE = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_fix_force_load_exe.sh'
   KZ_FEFRESH_PODS_PBXPROJ = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_refresh_pods_pbxproj.rb'
+  KZ_IMPROVE_CUSTOM_YAML_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_improve_custom_yaml.sh'
+
+  KZ_ON_DEMAND_RESOURCES = KZ_POD_CONFIG_SUPPORT_FILES + 'on_demand_resources'
+  KZ_ON_DEMAND_RESOURCES_SHELL = KZ_ON_DEMAND_RESOURCES + 'kz_on_demand_resources_xocde.sh'
 
   def self.deal_path_for_xcconfig(path, add_quotes = false)
     if path.is_a?(String)
@@ -48,6 +53,9 @@ module KZ
     attr_accessor :kz_config_lock
     attr_accessor :disable_generate_framework
     attr_accessor :generate_kz_pod_targets
+    attr_accessor :debug_shell_log_tag
+    attr_accessor :arm64_simulator
+    attr_accessor :on_demand_resources_bundle_id
 
     private_class_method :new
 
@@ -60,6 +68,15 @@ module KZ
       @disable_generate_framework = false
       @generate_kz_pod_targets = false
       @olde_lock_file_content = nil
+      @debug_shell_log_tag = "&> /dev/null"
+      @arm64_simulator = false
+    end
+
+    def debug=(value)
+      @debug = value
+      if debug
+        @debug_shell_log_tag = ""
+      end
     end
 
     @@instance = nil
@@ -76,7 +93,8 @@ module KZ
         end
         FileUtils.mkdir_p(KZ_POD_CONFIG_SUPPORT_FILES) unless File.exist?(KZ_POD_CONFIG_SUPPORT_FILES)
         FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TARGETS) unless File.exist?(KZ_POD_CONFIG_POD_TARGETS)
-        FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TEMPDIR) unless File.exist?(KZ_POD_CONFIG_POD_TEMPDIR)
+        FileUtils.rm_rf(KZ_POD_CONFIG_POD_TEMPDIR) if File.exist?(KZ_POD_CONFIG_POD_TEMPDIR)
+        FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TEMPDIR)
 
         FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
@@ -93,7 +111,16 @@ module KZ
 
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_refresh_pods_pbxproj.rb', KZ_FEFRESH_PODS_PBXPROJ)
 
+        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_improve_custom_yaml.sh', KZ_IMPROVE_CUSTOM_YAML_PATH)
+        system("chmod +x #{KZ_IMPROVE_CUSTOM_YAML_PATH}")
+
         Pod::Config.instance.podfile.use_frameworks!(:linkage => :static)
+
+        if !@on_demand_resources_bundle_id.nil?
+          FileUtils.rm_r(KZ_ON_DEMAND_RESOURCES) if File.exist?(KZ_ON_DEMAND_RESOURCES)
+          FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/on_demand_resources/', KZ_ON_DEMAND_RESOURCES)
+          system("chmod +x #{KZ_ON_DEMAND_RESOURCES_SHELL}")
+        end
       else
         @kz_pod_enable = false
         @generate_kz_pod_targets = false

data/lib/cocoapods-kz/helpers/kz_log.rb

@@ -0,0 +1,11 @@
+module KZ
+
+  class KZLog
+    def self.log(logStr)
+      if KZGlobalHelper.instance.debug
+        puts logStr
+      end
+    end
+  end
+end
+

data/lib/cocoapods-kz/helpers/kz_pod_target.rb

@@ -26,6 +26,8 @@ module KZ
     # 用于临时保存hamp过程的配置
     attr_accessor :private_header_search_path
     attr_accessor :repair_header_search_path
+    attr_accessor :custom_yaml_path
+    attr_accessor :custom_origin_yaml_path
 
     attr_accessor :platform_name
     # target编译最终的产物名称
@@ -46,6 +48,8 @@ module KZ
 
     attr_accessor :use_modulemap
 
+    attr_accessor :disable_to_simulator_frameworks
+
     def initialize(native_pod_target)
       @native_pod_target = native_pod_target
       @name = native_pod_target.name
@@ -64,6 +68,9 @@ module KZ
       @use_local_private_headers_path = false
       @force_load = false
       @use_modulemap = true
+      @disable_to_simulator_frameworks = []
+      # 配置按需加载的资源，需要从bundle target中移除，然后手动进行配置
+      @on_demand_resources = []
 
       native_pod_target.file_accessors.each do |file_accessor|
         file_accessor.kz_pod_target = self
@@ -188,6 +195,8 @@ module KZ
 
     # 直接用于配置HEADER_SEARCH_PATHS
     def header_search_paths(custom_paths)
+      return '' unless current_should_build?
+
       header_search_paths = ''
       header_search_paths = KZ.deal_path_for_xcconfig(@private_header_search_path, true) if @private_header_search_path
       repair_header_search_paths = self.all_repair_header_search_paths.join(' ')
@@ -226,11 +235,11 @@ module KZ
     end
 
     # 获取target对应的配置根目录，部分文件需要依赖版本进行存储
-    def pod_config_cache_path(concat_version)
-      kz_target_framework_folder = KZ_POD_CONFIG_POD_TARGETS + @name
-      kz_target_framework_folder += @version if concat_version
-      FileUtils.mkdir_p(kz_target_framework_folder) unless File.exist?(kz_target_framework_folder) || concat_version
-      kz_target_framework_folder
+    def pod_config_cache_path(concat_version, vendored_framework = false)
+      kz_target_config_folder = KZ_POD_CONFIG_POD_TARGETS + @name
+      kz_target_config_folder += @version if concat_version
+      kz_target_config_folder += "vendored_framework" if vendored_framework
+      kz_target_config_folder
     end
 
     # 获取target中的module name，默认为product_module_name与target.name也相同。
@@ -247,7 +256,7 @@ module KZ
           end
         end
       end
-      return @native_pod_target.product_module_name
+      @native_pod_target.product_module_name
     end
 
     # 获取所有用于修复的modulemap路径，原因参考@repair_modulemap_path
@@ -275,6 +284,10 @@ module KZ
       @native_pod_target.prefix_header_path
     end
 
+    def umbrella_header_path
+      @native_pod_target.umbrella_header_path
+    end
+
     # 当前pod是否存在可编译的文件，配置framework后当前pod就不存在可编译文件
     def current_should_build?
       @native_pod_target.should_build?
@@ -328,5 +341,12 @@ module KZ
       @native_pod_target.configuration_build_dir
     end
 
+    def add_on_demand_resources(path)
+      @on_demand_resources.push(path).uniq!
+    end
+    def get_on_demand_resources
+      @on_demand_resources
+    end
+
   end
 end

data/lib/cocoapods-kz/native/dls.rb

@@ -40,6 +40,16 @@ module Pod
         KZ::KZGlobalHelper.instance.kz_pod_config.merge!(kz_pod_config)
       end
 
+      def kz_cocoapods_configure(*requirements)
+        configure = requirements.last
+        return false unless configure.is_a?(Hash)
+
+        on_demand_resources_bundle_id = configure.delete(:on_demand_resources_bundle_id)
+        if !on_demand_resources_bundle_id.nil? && on_demand_resources_bundle_id.is_a?(String)
+          KZ::KZGlobalHelper.instance.on_demand_resources_bundle_id = on_demand_resources_bundle_id
+        end
+      end
+
     end
   end
 end