cocoapods-kz 0.0.14 → 0.0.15

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

@@ -5,6 +5,10 @@ require_relative 'kz_global_helper'
 
 module KZ
 
+  Initial_Install_Tags = "Initial Install Tags"
+  Prefetched_Tag_Order = "Prefetched Tag Order"
+  Download_Only_On_Demand = "Download Only On Demand"
+
   class KZPodTarget
 
     attr_reader :native_pod_target
@@ -50,6 +54,9 @@ module KZ
 
     attr_accessor :disable_to_simulator_frameworks
 
+    attr_accessor :on_demand_resources_config_patterns
+    attr_accessor :on_demand_resources_config_path
+
     def initialize(native_pod_target)
       @native_pod_target = native_pod_target
       @name = native_pod_target.name
@@ -235,10 +242,11 @@ module KZ
     end
 
     # 获取target对应的配置根目录，部分文件需要依赖版本进行存储
-    def pod_config_cache_path(concat_version, vendored_framework = false)
+    def pod_config_cache_path(concat_version, vendored_framework = false, on_demand_resources = 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 += "on_demand_resources" if on_demand_resources
       kz_target_config_folder
     end
 
@@ -341,11 +349,70 @@ module KZ
       @native_pod_target.configuration_build_dir
     end
 
-    def add_on_demand_resources(path)
-      @on_demand_resources.push(path).uniq!
+    def on_demand_resources_info
+      return {} if @on_demand_resources_config_patterns.nil?
+
+      pod_root = self.native_pod_target.sandbox.pod_dir(self.root_name)
+      path_list = Pod::Sandbox::PathList.new(pod_root)
+      list = path_list.glob(@on_demand_resources_config_patterns)
+      result = list.select {|path| path.extname == ".plist" }
+
+      on_demand_resources_info = {}
+      result.each do |config_plist_path|
+        plist_hash = Xcodeproj::Plist.read_from_path(config_plist_path)
+        initial_plist_hash = plist_hash[Initial_Install_Tags]
+        traversal_resource_for_tag(initial_plist_hash, path_list) do |tag_resources|
+          on_demand_resources_info[Initial_Install_Tags] = tag_resources
+        end
+
+        prefetched_plist_hash = plist_hash[Prefetched_Tag_Order]
+        traversal_resource_for_tag(prefetched_plist_hash, path_list) do |tag_resources|
+          on_demand_resources_info[Prefetched_Tag_Order] = tag_resources
+        end
+
+        download_plist_hash = plist_hash[Download_Only_On_Demand]
+        traversal_resource_for_tag(download_plist_hash, path_list) do |tag_resources|
+          on_demand_resources_info[Download_Only_On_Demand] = tag_resources
+        end
+      end
+      on_demand_resources_info
+    end
+
+    def traversal_resource_for_tag(plist_hash, path_list)
+      if !plist_hash.nil? && plist_hash.size > 0
+        tag_resources = {}
+
+        plist_hash.each do |tag, resource_paths|
+          valid_paths = []
+          resource_paths.each do |resource_path|
+            valid_path = path_list.relative_path_in_snadbox?(resource_path)
+            unless valid_path.nil?
+              valid_paths.append(valid_path)
+            end
+          end
+          if valid_paths.size > 0
+            tag_resources[tag] = valid_paths
+          end
+        end
+
+        yield(tag_resources)
+      end
     end
-    def get_on_demand_resources
-      @on_demand_resources
+
+    def all_xcassets_paths
+      @all_xcassets_paths ||= begin
+        all_xcassets_paths = []
+        native_pod_target.file_accessors.each do |file_accessor|
+          file_accessor.resource_bundles.map do |_, paths|
+            paths.each do |path|
+              if path.extname == ".xcassets"
+                all_xcassets_paths << path
+              end
+            end
+          end
+        end
+        all_xcassets_paths
+      end
     end
 
     def get_swift_lldb_ast_path

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

@@ -31,7 +31,7 @@ module KZ
 
       @all_kz_pod_targets.values.each do |kz_pod_target|
         next unless kz_pod_target.is_dev_pod
-        next unless @specify_pod_names.count > 0 && @specify_pod_names.include?(kz_pod_target.name)
+        next unless @specify_pod_names.count == 0 || (@specify_pod_names.count > 0 && @specify_pod_names.include?(kz_pod_target.name))
 
         need_repair_files = []
         kz_pod_target.native_pod_target.file_accessors.each do |file_accessor|

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

@@ -0,0 +1,12 @@
+module Xcodeproj
+  class Project
+    module Object
+      class XCBuildConfiguration
+        def kz_simple_attributes_buildSettings_hash
+          simple_attributes_hash["buildSettings"]
+        end
+      end
+    end
+  end
+end
+

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

@@ -40,14 +40,20 @@ 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
+      def odr_target(name, options = nil)
+        if options
+          raise Informative, "Unsupported options `#{options}` for " \
+            "target `#{name}`."
         end
+        KZ::KZGlobalHelper.instance.on_demand_resources_info.enable = true
+        KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name = name
+
+        parent = current_target_definition
+        definition = TargetDefinition.new(name, parent)
+        self.current_target_definition = definition
+        yield if block_given?
+      ensure
+        self.current_target_definition = parent
       end
 
     end

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

@@ -1,6 +1,6 @@
 require 'cocoapods/installer'
 require 'cocoapods-kz/helpers/kz_global_helper'
-require 'cocoapods-kz/helpers/kz_generator'
+require 'cocoapods-kz/helpers/kz_generator_hmap'
 
 module Pod
   class Installer
@@ -12,6 +12,13 @@ module Pod
       # 因为kz_pod_target提供不少方法，需要判断pod文件情况，所以依赖分析需要挪到download之后
       if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
         main_project = aggregate_targets.first.user_project
+        main_project.targets.each do |main_target|
+          if main_target.display_name == KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name
+            bundle_id = main_target.build_configurations.first.kz_simple_attributes_buildSettings_hash["PRODUCT_BUNDLE_IDENTIFIER"]
+            KZ::KZGlobalHelper.instance.on_demand_resources_info.bundle_id = bundle_id unless bundle_id.nil?
+          end
+        end
+
         kz_analyer = KZ::KZAnalyzer.new(pod_targets, self.sandbox.development_pods)
         kz_analyer.analyer
         KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
@@ -25,7 +32,8 @@ module Pod
       if KZ::KZGlobalHelper.instance.kz_pod_enable
         # hmap的创建需要在download之后，integrate之前
         KZ::KZGlobalHelper.instance.kz_generator.create_hamp
-        unless KZ::KZGlobalHelper.instance.on_demand_resources_bundle_id.nil?
+
+        if KZ::KZGlobalHelper.instance.on_demand_resources_info.enable
           KZ::KZGlobalHelper.instance.kz_generator.create_on_demand_resources
         end
       end

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

@@ -0,0 +1,11 @@
+module Pod
+  class Sandbox
+    class PathList
+
+      def relative_path_in_snadbox?(relative_path)
+        full_path = root.join(relative_path)
+        full_path.exist? ? full_path : nil
+      end
+    end
+  end
+end

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

@@ -42,26 +42,6 @@ module Pod
 
             target_installation_result
           end
-
-          alias_method :origin_filter_resource_file_references, :filter_resource_file_references
-          def filter_resource_file_references(resource_file_references)
-            kz_pod_target = self.target.weakRef_kz_pod_target
-            if kz_pod_target
-              new_resource_file_references = []
-              odr_resources = kz_pod_target.get_on_demand_resources
-              resource_file_references.each do |path|
-                new_resource_file_references.push(path) unless odr_resources.include?(path)
-              end
-              origin_filter_resource_file_references(new_resource_file_references) do |compile_phase_refs, resources_phase_refs|
-                yield compile_phase_refs, resources_phase_refs
-              end
-            else
-              origin_filter_resource_file_references(resource_file_references) do |compile_phase_refs, resources_phase_refs|
-                yield compile_phase_refs, resources_phase_refs
-              end
-            end
-          end
-
         end
       end
     end

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

@@ -27,5 +27,11 @@ module Pod
         {}
       end
     end
+
+    def on_demand_resources_config_plists=(paths)
+      if KZ::KZGlobalHelper.instance.on_demand_resources_info.enable
+        KZ::KZGlobalHelper.instance.on_demand_resources_info.config_plist_path_patterns[self.name] = Array(paths)
+      end
+    end
   end
 end

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

@@ -23,6 +23,7 @@ module Pod
                 pod_targets = self.target.pod_targets_for_build_configuration(generator.configuration_name)
 
                 swift_lldb_ast_paths = []
+                on_demand_resources_config_paths = []
                 pod_targets.each do |native_pod_target|
                   kz_pod_target = native_pod_target.weakRef_kz_pod_target
                   if kz_pod_target
@@ -41,6 +42,10 @@ module Pod
                     if !ast_path.nil? and generator.configuration_name == "Debug"
                       swift_lldb_ast_paths << ast_path
                     end
+
+                    unless kz_pod_target.on_demand_resources_config_path.nil?
+                      on_demand_resources_config_paths << (kz_pod_target.name + ":" + kz_pod_target.on_demand_resources_config_path)
+                    end
                   end
                 end
 
@@ -51,7 +56,17 @@ module Pod
                   xcconfig.attributes.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]")
                   xcconfig.attributes['VALID_ARCHS'] = 'arm64 arm64_32 x86_64'
                 end
-                
+                if KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name == self.target.name.sub('Pods-', '')
+                  xcconfig.attributes["ENABLE_ON_DEMAND_RESOURCES"] = "NO"
+
+                  on_demadn_resources_paths = ""
+                  on_demand_resources_config_paths.each do |path|
+                    on_demadn_resources_paths += ((on_demadn_resources_paths.empty? ? ''  : ' ') + '"' + path + '"')
+                  end
+                  xcconfig.attributes["KZ_ON_DEMAND_RESOURCES_PATHS"] = on_demadn_resources_paths unless on_demadn_resources_paths.empty?
+                  xcconfig.attributes["KZ_POD_CONFIG_ROOT"] = KZ::KZ_POD_CONFIG_ROOT_STR
+                end
+
                 kz_update_xcconfig_file(xcconfig, path)
                 return
               end

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

@@ -7,24 +7,18 @@ module Pod
         alias_method :origin_integrate!, :integrate!
         def integrate!
           origin_integrate!
-
-          unless KZ::KZGlobalHelper.instance.on_demand_resources_bundle_id.nil?
-            add_on_demand_resources_script_phase
-          end
+          handle_on_demand_resources_script_phase
         end
 
-        def add_on_demand_resources_script_phase
+        def handle_on_demand_resources_script_phase
           phase_name = "[KZ] On Demand Resources Build"
           native_targets.each do |native_target|
-            if native_target.isa == "PBXNativeTarget" && native_target.product_type == "com.apple.product-type.application"
-              phase = TargetIntegrator.create_or_update_shell_script_build_phase(native_target, phase_name)
+            phase = TargetIntegrator.create_or_update_shell_script_build_phase(native_target, phase_name)
+            if native_target.name == KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name
               native_target.build_phases.push(phase).uniq! unless native_target.build_phases.include?(phase)
               phase.shell_script = KZ.deal_path_for_xcconfig(KZ::KZ_ON_DEMAND_RESOURCES_SHELL, true)
-
-              native_target.build_configurations.each do |config|
-                config.build_settings["ENABLE_ON_DEMAND_RESOURCES"] = "NO"
-                config.build_settings["KZ_POD_CONFIG_ROOT"] = KZ::KZ_POD_CONFIG_ROOT_STR
-              end
+            else
+              native_target.build_phases.delete(phase) if native_target.build_phases.include?(phase)
             end
           end
         end

data/lib/cocoapods-kz/native.rb

@@ -14,4 +14,6 @@ if Pod.match_version?('~> 1.11')
   require 'cocoapods-kz/native/pods_project_writer'
   require 'cocoapods-kz/native/pod_target_integrator'
   require 'cocoapods-kz/native/target_integrator'
+  require 'cocoapods-kz/native/path_list'
+  require 'cocoapods-kz/native/build_configuration'
 end

data/lib/cocoapods-kz/resources/on_demand_resources/kz_on_demand_resources_process.rb

@@ -0,0 +1,194 @@
+require 'xcodeproj'
+require "date"
+require 'fileutils'
+require 'tmpdir'
+require 'json'
+autoload :Nanaimo, 'nanaimo'
+
+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
+
+# shell输入参数
+kz_on_demand_resources_paths = ENV["KZ_ON_DEMAND_RESOURCES_PATHS"]
+target_build_dir = Pathname(ENV["TARGET_BUILD_DIR"])
+target_build_temp_dir = Pathname(ENV["TARGET_TEMP_DIR"])
+if ENV["ACTION"] == "install" && ENV["SKIP_INSTALL"] == "NO"
+  target_build_dir = Pathname(ENV["INSTALL_DIR"])
+end
+app_path = target_build_dir + ENV["UNLOCALIZED_RESOURCES_FOLDER_PATH"]
+
+# pod过程解析的odr内容路径，放在环境参数KZ_ON_DEMAND_RESOURCES_PATHS中，
+# 格式为：'"KZChat:/Users/admin/Desktop/RubyProject/washington-ios/Pods/KZPodConfigure/PodTargets/KZChat/on_demand_resources" "KZGeek:/Users/admin/Desktop/RubyProject/washington-ios/Pods/KZPodConfigure/PodTargets/KZGeek/on_demand_resources"'
+kz_on_demand_resources_info = kz_on_demand_resources_paths.gsub('"', '').split.map { |s| s.split(':', 2) }.to_h
+# Xcode编译的产物路径，build目录下Product目录，开启odr时，会在这个目录下生成OnDemandResources，因为这里odr改成手动构建，所以此文件夹需要手动创建
+target_build_on_demand_resources_path = target_build_dir + "OnDemandResources"
+if ENV["ACTION"] == "install" && ENV["SKIP_INSTALL"] == "NO"
+  target_build_on_demand_resources_path = Pathname(ENV["INSTALL_ROOT"]) + "OnDemandResources"
+end
+FileUtils.mkdir_p(target_build_on_demand_resources_path) unless File.exist?(target_build_on_demand_resources_path)
+
+# 将KZOnDemandResourcesAllConfig.plist拷贝到.app中，用于业务使用代码加载odr资源
+kz_on_demand_resources_all_config_plist_path = Pathname(ENV["KZ_POD_CONFIG_ROOT"]) + "KZOnDemandResourcesAllConfig.plist"
+return unless File.exist?(kz_on_demand_resources_all_config_plist_path)
+FileUtils.cp(kz_on_demand_resources_all_config_plist_path, app_path)
+
+# 用于在最终.app中生成所有odr信息的plist文件，固定名称为OnDemandResources.plist，系统会自动识别
+app_on_demand_resources_plist = {}
+bundle_resource_request_tags = {}
+app_on_demand_resources_plist["NSBundleResourceRequestTags"] = bundle_resource_request_tags
+bundle_resource_request_asset_packs = {}
+app_on_demand_resources_plist["NSBundleResourceRequestAssetPacks"] = bundle_resource_request_asset_packs
+
+# 遍历所有组件的odr信息，然后将需要的资源进行拷贝
+kz_on_demand_resources_info.each do |pod_name, kz_on_demand_resources_path|
+  kz_on_demand_resources_path = Pathname(kz_on_demand_resources_path)
+  odr_build_info_plist_paht = kz_on_demand_resources_path + "odr_build_info.plist"
+  next unless File.exist?(odr_build_info_plist_paht)
+
+  odr_build_info = Xcodeproj::Plist.read_from_path(odr_build_info_plist_paht)
+
+  # 获取对应组件的bundle，如果没有需要创建，这里的bundle名称会与target名称相同
+  pod_bundle_path = Pathname(app_path) + "#{pod_name}.bundle"
+  FileUtils.mkdir_p(pod_bundle_path) unless File.exist?(pod_bundle_path)
+
+  # 将预处理的OnDemandResources拷贝到Product的OnDemandResources中
+  on_demand_resources_build_path = kz_on_demand_resources_path + "OnDemandResources"
+  FileUtils.cp_r("#{on_demand_resources_build_path}/.", target_build_on_demand_resources_path)
+
+  # 将组件自己的OnDemandResources.plist拷贝到组件bundle中，这里bundle其实也是一种app，也需要OnDemandResources.plist，用于系统识别odr资源 
+  bundle_on_demand_resources_plist_path = kz_on_demand_resources_path + "OnDemandResources.plist"
+  FileUtils.cp(bundle_on_demand_resources_plist_path, pod_bundle_path + "OnDemandResources.plist")
+  # 读取组件的OnDemandResources.plist中的tag信息，用于最终.app中生成的OnDemandResources.plist
+  bundle_on_demand_resources_plist = Xcodeproj::Plist.read_from_path(bundle_on_demand_resources_plist_path)
+  bundle_resource_request_tags.update(bundle_on_demand_resources_plist["NSBundleResourceRequestTags"])
+  bundle_resource_request_asset_packs.update(bundle_on_demand_resources_plist["NSBundleResourceRequestAssetPacks"])
+
+  # 清除已经编译的普通非odr资源
+  if odr_build_info["normal_files"]
+    odr_build_info["normal_files"].each do |file_name|
+      normal_file_path = pod_bundle_path + file_name
+      FileUtils.rm_rf(normal_file_path) if File.exist?(normal_file_path)
+    end
+  end
+
+  # 将pod install过程生成的AssetPackOutputSpecifications拷贝到编译临时目录，并修改AssetPackOutputSpecifications.plist中的路径
+  kz_asset_pack_output_specifications_plist_path = kz_on_demand_resources_path + "AssetPackOutputSpecifications.plist"
+  next unless File.exist?(kz_asset_pack_output_specifications_plist_path)
+  # 在Xcode编译过程中，会在build目录下生成一个临时目录，用于存放AssetPackOutputSpecifications.plist（该文件在pod install过程中生成了模版，拷贝到这里会进行修改后才能使用）
+  build_on_demand_resources_temp_path = target_build_temp_dir + pod_name + "KZOnDemandResources"
+  FileUtils.mkdir_p(build_on_demand_resources_temp_path) unless File.exist?(build_on_demand_resources_temp_path)
+  FileUtils.cp(kz_asset_pack_output_specifications_plist_path, build_on_demand_resources_temp_path)
+
+  # 修改编译临时目录中AssetPackOutputSpecifications.plist文件标记资源的真实路径
+  asset_pack_output_specifications_plist_path = build_on_demand_resources_temp_path + "AssetPackOutputSpecifications.plist"
+  asset_pack_output_specifications_plist = Xcodeproj::Plist.read_from_path(asset_pack_output_specifications_plist_path)
+  asset_pack_output_specifications_plist.each do |item|
+    bundle_paht = item["bundle-path"]
+    unless bundle_paht.start_with?(target_build_on_demand_resources_path.to_s)
+      item["bundle-path"] = target_build_on_demand_resources_path + bundle_paht
+    end
+  end
+  write_to_path(asset_pack_output_specifications_plist, asset_pack_output_specifications_plist_path)
+
+  # 处理xcasset资源编译，从odr_info中读取原始xcasset资源，为了不破坏原有资源，这里将原始资源拷贝到临时目录，并修改对应的odr信息，然后使用actool进行编译
+  all_xcassets = odr_build_info["all_xcassets"]
+  unless all_xcassets.nil?
+    temp_dir = Pathname(Dir.mktmpdir)
+    xcasset_files = []
+    all_xcassets.each do |xcassets_name, xcassets_info|
+      path = xcassets_info["path"]
+      next if path.nil? || path.empty? || !File.exist?(path)
+      path = Pathname(path)
+      tags = xcassets_info["tags"]
+      next if tags.nil? || tags.empty?
+
+      FileUtils.cp_r(path, temp_dir)
+      new_path = temp_dir + path.basename
+      xcasset_files << new_path
+
+      tags.each do |imageset_name, tag|
+        content_json_path = new_path + imageset_name + "Contents.json"
+        content_json = JSON.parse(File.read(content_json_path))
+        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))
+      end
+    end
+    next if xcasset_files.empty?
+
+    # 将所有配置好的xcasset资源进行编译，生成odr资源，odr资源到Product的OnDemandResources中，非odr资源放到组件bundle中
+    if ENV["WRAPPER_EXTENSION"] && `xcrun --find actool`.strip != "" && !xcasset_files.empty?
+      actool_cmd = [
+        "xcrun", "actool",
+        "--output-format", "human-readable-text",
+        "--notices", "--warnings",
+        "--platform", ENV["PLATFORM_NAME"],
+        "--minimum-deployment-target", ENV["#{ENV['DEPLOYMENT_TARGET_SETTING_NAME']}"],
+        *ENV["TARGET_DEVICE_ARGS"].to_s.split,
+        "--compress-pngs",
+        "--enable-on-demand-resources", "YES",
+        "--asset-pack-output-specifications", asset_pack_output_specifications_plist_path.to_s,
+        "--compile", pod_bundle_path.to_s,
+        *xcasset_files.map(&:to_s)
+      ].compact
+      system(*actool_cmd)
+    end
+    FileUtils.rm_rf(temp_dir)
+  end
+end
+
+# OnDemandResources.plist放到.app中，用于系统读取odr资源
+app_on_demand_resources_plist_path = app_path + "OnDemandResources.plist"
+write_to_path(app_on_demand_resources_plist, app_on_demand_resources_plist_path)
+
+# 生成AssetPackManifestTemplate.plist放到.app中，用于系统读取odr记载路径与信息（archive时，系统会使用此文件生成新的AssetPackManifest.plist）
+asset_pack_manifest_template_plist_path = app_path + "AssetPackManifestTemplate.plist"
+manifest_url = "http://127.0.0.1"
+
+manifest_template_plist_hash = {}
+manifest_template_resources = []
+manifest_template_plist_hash["resources"] = manifest_template_resources
+
+Dir.foreach(target_build_on_demand_resources_path) do |sub_file|
+  if sub_file != "." && sub_file != ".." && sub_file != ".DS_Store"
+    resources_item = {}
+    primary_content_hash = {}
+    time = Time.now
+    primary_content_hash["hash"] = time.utc.strftime('%Y-%m-%dT%H:%M:%S.000Z')
+    primary_content_hash["strategy"] = "modtime"
+    resources_item["primaryContentHash"] = primary_content_hash
+    resources_item["isStreamable"] = true
+    total_size = 0
+    Dir.foreach(target_build_on_demand_resources_path + sub_file) do |resource|
+      if resource != "." && resource != ".." && resource != ".DS_Store"
+        if resource == "Info.plist"
+          info_plist = Xcodeproj::Plist.read_from_path(target_build_on_demand_resources_path + sub_file + resource)
+          priority = info_plist["Priority"]
+          if priority && priority > 0
+            resources_item["downloadPriority"] = priority
+          end
+          resources_item["bundleKey"] = info_plist["CFBundleIdentifier"]
+        else
+          resources_item["URL"] = "#{manifest_url}#{target_build_on_demand_resources_path}/#{sub_file}"
+          total_size = total_size + File.size(target_build_on_demand_resources_path + sub_file + resource)
+        end
+      end
+    end
+    resources_item["uncompressedSize"] = total_size
+    manifest_template_resources << resources_item
+  end
+end
+
+if manifest_template_resources.size > 0
+  write_to_path(manifest_template_plist_hash, asset_pack_manifest_template_plist_path)
+end

data/lib/cocoapods-kz/resources/on_demand_resources/kz_on_demand_resources_xocde.sh

@@ -1,4 +1,4 @@
- #!/bin/sh
+#!/bin/sh
 
 set -e
 set -u
@@ -13,14 +13,8 @@ if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
     exit 0
 fi
 
-TARGET_DIR=${TARGET_BUILD_DIR}
-if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]] ; then
-    TARGET_DIR=${INSTALL_DIR}
-fi
-
-KZ_ON_DEMAND_RESOURCES_PATH="${KZ_POD_CONFIG_ROOT}/OnDemandResources/Bundles"
-if [ ! -d $KZ_ON_DEMAND_RESOURCES_PATH ]; then
-    exit 0
+if [ -z "${KZ_ON_DEMAND_RESOURCES_PATHS+x}" ]; then
+  exit 0
 fi
 
 case "${TARGETED_DEVICE_FAMILY:-}" in
@@ -88,75 +82,4 @@ if [ -z $RUBY_PATH ];then
     exit 1
 fi
 
-BUILDE_ON_DEMAND_RESOURCES_PATH="${TARGET_BUILD_DIR}/OnDemandResources"
-if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]] ; then
-    BUILDE_ON_DEMAND_RESOURCES_PATH="${INSTALL_ROOT}/OnDemandResources"
-fi
-mkdir -p $BUILDE_ON_DEMAND_RESOURCES_PATH
-
-# 拷贝所有配置，供代码中读取
-KZ_ON_DEMAND_RESOURCES_ALL_CONFIG_PATH="${KZ_POD_CONFIG_ROOT}/OnDemandResources/KZOnDemandResourcesAllConfig.plist"
-if [ -e $KZ_ON_DEMAND_RESOURCES_ALL_CONFIG_PATH ]; then
-    cp "${KZ_ON_DEMAND_RESOURCES_ALL_CONFIG_PATH}" "${TARGET_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/"
-fi
-
-ls $KZ_ON_DEMAND_RESOURCES_PATH | while read line 
-do
-    KZ_ON_DEMAND_RESOURCES_BUNDLE_INFO_PATH="${KZ_ON_DEMAND_RESOURCES_PATH}/${line}/TargetBundleInfo.plist"
-    if [ ! -f $KZ_ON_DEMAND_RESOURCES_BUNDLE_INFO_PATH ] ; then
-        continue
-    fi
-
-    TARGET_BUILD_DIR_BUNDLE="${TARGET_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/${line}.bundle"
-
-    if [ ! -d $TARGET_BUILD_DIR_BUNDLE ] ; then
-        mkdir -p $TARGET_BUILD_DIR_BUNDLE
-    fi
-
-    KZ_BUILDE_ON_DEMAND_RESOURCES_PATH="${TARGET_TEMP_DIR}/${line}/KZOnDemandResources"
-    mkdir -p $KZ_BUILDE_ON_DEMAND_RESOURCES_PATH
-
-    # copy on demand resources
-    BUNDLE_ON_DEMAND_RESOURCES="${KZ_ON_DEMAND_RESOURCES_PATH}/${line}/OnDemandResources"
-    if [ -d $BUNDLE_ON_DEMAND_RESOURCES ] ; then
-        cp -r $BUNDLE_ON_DEMAND_RESOURCES/ $BUILDE_ON_DEMAND_RESOURCES_PATH/
-    fi
-    # copy on demand resources plist
-    BUNDLE_ON_DEMAND_RESOURCES_PLIST="${KZ_ON_DEMAND_RESOURCES_PATH}/${line}/OnDemandResources.plist"
-    if [ -f $BUNDLE_ON_DEMAND_RESOURCES_PLIST ] ; then
-        cp $BUNDLE_ON_DEMAND_RESOURCES_PLIST $TARGET_BUILD_DIR_BUNDLE
-    fi
-    # complete asset pack output specifications plist
-    ASSET_PACK_OUTPUT_SPECIFICATIONS="${KZ_ON_DEMAND_RESOURCES_PATH}/${line}/AssetPackOutputSpecifications.plist"
-    if [ ! -f $ASSET_PACK_OUTPUT_SPECIFICATIONS ] ; then
-        continue
-    fi
-    cp -f $ASSET_PACK_OUTPUT_SPECIFICATIONS $KZ_BUILDE_ON_DEMAND_RESOURCES_PATH
-    ASSET_PACK_OUTPUT_SPECIFICATIONS="${KZ_BUILDE_ON_DEMAND_RESOURCES_PATH}/AssetPackOutputSpecifications.plist"
-    $RUBY_PATH "${KZ_POD_CONFIG_ROOT}/SupportFiles/on_demand_resources/kz_complete_asset_pack_output_spec_plist.rb" "${BUILDE_ON_DEMAND_RESOURCES_PATH}" "${ASSET_PACK_OUTPUT_SPECIFICATIONS}"
-    ORIGIN_ASSETS_CAR=$TARGET_BUILD_DIR_BUNDLE/"Assets.car"
-    if [ -f $ORIGIN_ASSETS_CAR ] ; then
-        rm $ORIGIN_ASSETS_CAR
-    fi
-    XCASSET_FILES=()
-    XCASSETS_PATHS=$(/usr/libexec/PlistBuddy -c "Print xcassets_paths" $KZ_ON_DEMAND_RESOURCES_BUNDLE_INFO_PATH)
-    while read xcassets; do
-        if [[ $xcassets != "Array {" ]] && [[ $xcassets != "}" ]] ; then
-            if [ ! -d $xcassets ] ; then
-                continue
-            else
-                XCASSET_FILES+=("$xcassets")
-            fi
-        fi
-    done <<<"$XCASSETS_PATHS"
-    if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ] ; then
-        printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --platform "${PLATFORM_NAME}" --compress-pngs  --enable-on-demand-resources YES --asset-pack-output-specifications "${ASSET_PACK_OUTPUT_SPECIFICATIONS}" --compile "${TARGET_BUILD_DIR_BUNDLE}"
-    fi
-done
-
-ASSET_PACK_MANIFEST_TEMPLATE_PATH="${TARGET_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AssetPackManifestTemplate.plist"
-ON_DEMAND_RESOUCES_PATH="${TARGET_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/OnDemandResources.plist"
-# create asset pack manifest template
-$RUBY_PATH "${KZ_POD_CONFIG_ROOT}/SupportFiles/on_demand_resources/kz_create_asset_pack_manifest_plist.rb" "${BUILDE_ON_DEMAND_RESOURCES_PATH}" "${ASSET_PACK_MANIFEST_TEMPLATE_PATH}"
-# create on demand resources to .app
-$RUBY_PATH "${KZ_POD_CONFIG_ROOT}/SupportFiles/on_demand_resources/kz_create_on_demand_resources_plis.rb" "${KZ_ON_DEMAND_RESOURCES_PATH}" "${ON_DEMAND_RESOUCES_PATH}"
+$RUBY_PATH "${KZ_POD_CONFIG_ROOT}/SupportFiles/on_demand_resources/kz_on_demand_resources_process.rb"