flr 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e7b9ee5330233ba9aac3017cd51d403139365b6f95bd0729e188671dfadfb35
-  data.tar.gz: 8be015c230dc9581326c39f7b5dd53074779e7f6291c911a18f9e9afac20ef7c
+  metadata.gz: 0b4e690c98b54e5cb00ed7136585e7d86d47b14a499fff89b8c607faf750cfb7
+  data.tar.gz: 5a7335ddb9a37e4d94aee57ce86d291ea971d9ead763663f91c355210b07e0a2
 SHA512:
-  metadata.gz: 3ae44108a8e59cd1680700276f5b1d47a6235c5624566c6195f17bd522d901b02182faecee8dba056c200723f57f54e379ca37a8483c0493dc6dfe5a3678e7e2
-  data.tar.gz: 98b5bf07ab3bce3305572555d58ef71037d9c6822aa1f4842fcb1d07e8090bf9a198b40cd269e08bbdd18103c4419d6b2b30f38b8cff6ce7300c9c2c613e937d
+  metadata.gz: 14dd754b4e3277fc773128058f8a167501c519e056aeb18e8e7f4ae0b1eb351d88da61b0482509ef2fbe3bd378d24cbaf09f39b52d8ae8f1412b92deb25e819a
+  data.tar.gz: 9ba05b656a9ed2c2e1c95004f1f4a0ce2e2fa1b43a0650164c3de5415f886376cb0a8bd3a3cfbda66ec5b7eccb97a960fb0fa958ee0194f06a12d71d4d683c66

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.1.0
+
+- Support for processing(init/generate/monitor) multi projects(the main project and its sub projects in one workspace)
+
+- Support for auto merging old asset specifications when specifying new assets
+
+   > This is can help you to auto keep the manually added asset specifications.
+
 ## 3.0.0
 
 - Support for processing non-implied resource file

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flr (3.0.0)
+    flr (3.1.0)
       bundler (~> 2.0, >= 2.0.2)
       listen (~> 3.0, >= 3.2.1)
       thor (~> 1.0, >= 1.0.1)

data/lib/flr.rb

@@ -42,7 +42,7 @@ More details see https://github.com/Fly-Mix/flr-cli
 
     LONGDESC
     def init
-      Command.init
+      Command.init_all
     end
 
     desc "run [--auto]", "Scan assets, specify scanned assets in pubspec.yaml, generate \"r.g.dart\""
@@ -62,7 +62,7 @@ More details see https://github.com/Fly-Mix/flr-cli
     LONGDESC
     option :auto, :type => :boolean
     def run_command
-      options[:auto] ? Command.start_monitor : Command.generate
+      options[:auto] ? Command.start_monitor : Command.generate_all
     end
     map 'run' => :run_command
 

data/lib/flr/command.rb

@@ -164,31 +164,86 @@ Flr recommends the following flutter resource structure schemes:
       return r_dart_library_version
     end
 
-    # 对 flutter 工程进行初始化
-    def self.init
-      flutter_project_root_dir = FileUtil.get_cur_flutter_project_root_dir
+    def self.init_all
+      flutter_main_project_root_dir = FileUtil.get_flutter_main_project_root_dir
 
       # ----- Step-1 Begin -----
-      # 进行环境检测:
-      #  - 检测当前 flutter 工程根目录是否存在 pubspec.yaml
+      # 进行环境检测；若发现不合法的环境，则抛出异常，终止当前进程
+      #  - 检测当前flutter主工程根目录是否存在 pubspec.yaml
       #
 
       begin
-        Checker.check_pubspec_file_is_existed(flutter_project_root_dir)
+        Checker.check_pubspec_file_is_existed(flutter_main_project_root_dir)
+      rescue Exception => e
+        puts(e.message)
+        return
+      end
 
-        pubspec_file_path = FileUtil.get_pubspec_file_path(flutter_project_root_dir)
+      # ----- Step-1 End -----
 
-        pubspec_config = FileUtil.load_pubspec_config_from_file(pubspec_file_path)
+      puts("init all flutter projects now...")
+
+      # ----- Step-2 Begin -----
+      # 获取主工程和其所有子工程，对它们进行init_one操作
+      # - 获取flutter主工程根目录下所有的子工程目录
+      # - 初始化主工程
+      # - 初始化所有子工程
+      #
+      flutter_sub_project_root_dir_array = FileUtil.get_flutter_sub_project_root_dirs(flutter_main_project_root_dir)
+
+      puts("")
+      init_one(flutter_main_project_root_dir)
+
+      flutter_sub_project_root_dir_array.each do |flutter_project_root_dir|
+        puts("")
+        init_one(flutter_project_root_dir)
+      end
+
+      # ----- Step-2 End -----
 
+      # ----- Step-3 Begin -----
+      # 调用 flutter 工具，为主工程和所有子工程获取依赖
+      #
+      puts("")
+      puts("get dependencies for all flutter projects via execute \"flutter pub get\" now ...")
+
+      get_flutter_pub_cmd = "flutter pub get"
+      system(get_flutter_pub_cmd)
+
+      puts("[√]: get dependencies for all flutter projects done !!!")
+
+      # ----- Step-3 End -----
+      puts("")
+      puts("[√]: init all flutter projects done !!!")
+
+      puts("")
+      puts("[*]: if you want to know how to make a good resource structure for your flutter project, please run \"flr recommend\" ".tips_style)
+    end
+
+    # 对指定 flutter 工程进行初始化
+    def self.init_one(flutter_project_root_dir)
+      puts("------------------------------- init specified project -------------------------------")
+
+      puts("init #{flutter_project_root_dir} now...")
+
+      # ----- Step-1 Begin -----
+      # 进行环境检测；若发现不合法的环境，则抛出异常，终止当前进程
+      #  - 检测 pubspec.yaml 是否存在
+      #  - 检测 pubspec.yaml 是否合法
+      #
+      begin
+        Checker.check_pubspec_file_is_existed(flutter_project_root_dir)
+        pubspec_file_path = FileUtil.get_pubspec_file_path(flutter_project_root_dir)
+        pubspec_config = FileUtil.load_pubspec_config_from_file(pubspec_file_path)
       rescue Exception => e
         puts(e.message)
+        puts("[x]: init #{flutter_project_root_dir} failed".error_style)
+        puts("--------------------------------------------------------------------------------------")
         return
       end
 
       # ----- Step-1 End -----
 
-      puts("init #{flutter_project_root_dir} now...")
-
       # ----- Step-2 Begin -----
       # 添加 flr_config 和 r_dart_library 的依赖声明到 pubspec.yaml
       #
@@ -264,6 +319,9 @@ Flr recommends the following flutter resource structure schemes:
       #
 
       flutter_config = pubspec_config["flutter"]
+      if flutter_config.nil?
+        flutter_config = {}
+      end
 
       flutter_assets = flutter_config["assets"]
       should_rm_flutter_assets_Key = true
@@ -290,29 +348,67 @@ Flr recommends the following flutter resource structure schemes:
       # 保存 pubspec.yaml
       FileUtil.dump_pubspec_config_to_file(pubspec_config, pubspec_file_path)
 
-      puts("get dependency \"r_dart_library\" via execute \"flutter pub get\" now ...")
+      puts("[√]: init #{flutter_project_root_dir} done !!!")
+      puts("--------------------------------------------------------------------------------------")
 
-      # ----- Step-4 Begin -----
-      # 调用 flutter 工具，为 flutter 工程获取依赖
+    end
 
-      get_flutter_pub_cmd = "flutter pub get"
-      system(get_flutter_pub_cmd)
+    def self.generate_all
+      flutter_main_project_root_dir = FileUtil.get_flutter_main_project_root_dir
 
-      puts("get dependency \"r_dart_library\" done !!!")
+      # ----- Step-1 Begin -----
+      # 进行环境检测；若发现不合法的环境，则抛出异常，终止当前进程。
+      #  - 检测当前flutter主工程根目录是否存在 pubspec.yaml
+      #
+      begin
+        Checker.check_pubspec_file_is_existed(flutter_main_project_root_dir)
+      rescue Exception => e
+        puts(e.message)
+        return
+      end
 
-      # ----- Step-4 End -----
+      # ----- Step-1 End -----
 
-      puts("[√]: init done !!!")
+      puts("generate for all flutter projects now...")
+
+      # ----- Step-2 Begin -----
+      # 获取主工程和其所有子工程，对它们进行generate_one操作
+      # - 获取flutter主工程根目录下所有的子工程目录
+      # - 对主工程执行generate_one操作
+      # - 对所有子工程执行generate_one操作
+      #
+      flutter_sub_project_root_dir_array = FileUtil.get_flutter_sub_project_root_dirs(flutter_main_project_root_dir)
 
       puts("")
-      puts("[*]: if you want to know how to make a good resource structure for your flutter project, please run \"flr recommend\" ".tips_style)
+      generate_one(flutter_main_project_root_dir)
 
-    end
+      flutter_sub_project_root_dir_array.each do |flutter_project_root_dir|
+        puts("")
+        generate_one(flutter_project_root_dir)
+      end
+
+      # ----- Step-2 End -----
 
-    # 扫描资源目录，自动为资源添加声明到 pubspec.yaml 和生成 r.g.dart
-    def self.generate
+      # ----- Step-3 Begin -----
+      # 调用 flutter 工具，为主工程和所有子工程获取依赖
+      #
+      puts("")
+      puts("get dependencies for all flutter projects via execute \"flutter pub get\" now ...")
+
+      get_flutter_pub_cmd = "flutter pub get"
+      system(get_flutter_pub_cmd)
+
+      puts("[√]: get dependencies for all flutter projects done !!!")
+
+      # ----- Step-3 End -----
+      puts("")
+      puts("[√]: generate for all flutter projects done !!!")
+    end
 
-      flutter_project_root_dir = FileUtil.get_cur_flutter_project_root_dir
+    # 为指定 flutter 工程扫描资源目录，自动为资源添加声明到 pubspec.yaml 和生成 r.g.dart
+    def self.generate_one(flutter_project_root_dir)
+      puts("--------------------------- generate for specified project ---------------------------")
+      puts("generate for #{flutter_project_root_dir} now...")
 
       # 警告日志数组
       warning_messages = []
@@ -340,6 +436,8 @@ Flr recommends the following flutter resource structure schemes:
 
       rescue Exception => e
         puts(e.message)
+        puts("[x]: generate for #{flutter_project_root_dir} failed".error_style)
+        puts("--------------------------------------------------------------------------------------")
         return
       end
 
@@ -552,23 +650,36 @@ Flr recommends the following flutter resource structure schemes:
 
       # ----- Step-8 Begin -----
       # 为扫描得到的legal_resource_file添加资源声明到pubspec.yaml：
-      # - 合并image_asset数组和text_asset数组为asset数组（image_asset数组元素在前）;
+      # - 合并image_asset数组和text_asset数组为new_asset_array（image_asset数组元素在前）；
+      # - 读取pubspec.yaml中flutter-assets配置，获得old_asset_array，然后和new_asset_array合并为asset数组；
       # - 修改pubspec.yaml中flutter-assets配置的值为asset数组；
       # - 修改pubspec.yaml中flutter-fonts配置的值为font_family_config数组。
 
-      asset_array = image_asset_array + text_asset_array
+      flutter_config = pubspec_config["flutter"]
+      if flutter_config.nil?
+        flutter_config = {}
+      end
+
+      new_asset_array = image_asset_array + text_asset_array
+      old_asset_array = flutter_config["assets"]
+      if old_asset_array.nil? or old_asset_array.is_a?(Array) == false
+        old_asset_array = []
+      end
+
+      asset_array = AssetUtil.mergeFlutterAssets(flutter_project_root_dir, package_name, new_asset_array, old_asset_array)
       if asset_array.length > 0
-        pubspec_config["flutter"]["assets"] = asset_array
+        flutter_config["assets"] = asset_array
       else
-        pubspec_config["flutter"].delete("assets")
+        flutter_config.delete("assets")
       end
 
       if font_family_config_array.length > 0
-        pubspec_config["flutter"]["fonts"] = font_family_config_array
+        flutter_config["fonts"] = font_family_config_array
       else
-        pubspec_config["flutter"].delete("fonts")
+        flutter_config.delete("fonts")
       end
 
+      pubspec_config["flutter"] = flutter_config
       FileUtil.dump_pubspec_config_to_file(pubspec_config, pubspec_file_path)
 
       # ----- Step-8 End -----
@@ -734,19 +845,6 @@ Flr recommends the following flutter resource structure schemes:
       # ----- Step-21 End -----
 
       # ----- Step-22 Begin -----
-      # 调用flutter工具，为flutter工程获取依赖
-      #
-
-      get_flutter_pub_cmd = "flutter pub get"
-      puts("execute \"#{get_flutter_pub_cmd}\" now ...")
-      system(get_flutter_pub_cmd)
-      puts("execute \"#{get_flutter_pub_cmd}\" done !!!")
-
-      # ----- Step-22 End -----
-
-      puts("[√]: generate done !!!")
-
-      # ----- Step-23 Begin -----
       # 判断警告日志数组是否为空，若不为空，输出所有警告日志
       #
 
@@ -757,87 +855,125 @@ Flr recommends the following flutter resource structure schemes:
         end
       end
 
-      # ----- Step-23 End -----
+      # ----- Step-22 End -----
+
+      puts("[√]: generate for #{flutter_project_root_dir} done !!!")
+      puts("--------------------------------------------------------------------------------------")
 
     end
 
-    # 启动一个资源变化监控服务，若检测到有资源变化，就自动执行generate操作；手动输入`Ctrl-C`，可终止当前服务
+    # 启动一个资源变化监控服务，若检测到flutter主工程和其子工程有资源变化，就自动执行generate_all操作；
+    # 手动输入`Ctrl-C`，可终止当前服务
     def self.start_monitor
 
-      flutter_project_root_dir = FileUtil.get_cur_flutter_project_root_dir
+      flutter_main_project_root_dir = FileUtil.get_flutter_main_project_root_dir
 
       # ----- Step-1 Begin -----
-      # 进行环境检测；若发现不合法的环境，则抛出异常，终止当前进程：
-      # - 检测当前flutter工程根目录是否存在pubspec.yaml
-      # - 检测当前pubspec.yaml中是否存在Flr的配置
-      # - 检测当前flr_config中的resource_dir配置是否合法：
-      #   判断合法的标准是：assets配置或者fonts配置了至少1个legal_resource_dir
+      # 对flutter主工程进行环境检测:
+      #  - 检测当前flutter主工程根目录是否存在 pubspec.yaml
       #
 
       begin
-        Checker.check_pubspec_file_is_existed(flutter_project_root_dir)
-
-        pubspec_file_path = FileUtil.get_pubspec_file_path(flutter_project_root_dir)
-
-        pubspec_config = FileUtil.load_pubspec_config_from_file(pubspec_file_path)
-
-        Checker.check_flr_config_is_existed(pubspec_config)
-
-        flr_config = pubspec_config["flr"]
-
-        resource_dir_result_tuple = Checker.check_flr_assets_is_legal(flutter_project_root_dir, flr_config)
-
+        Checker.check_pubspec_file_is_existed(flutter_main_project_root_dir)
       rescue Exception => e
         puts(e.message)
         return
       end
 
-      package_name = pubspec_config["name"]
-
       # ----- Step-1 End -----
 
+
       # ----- Step-2 Begin -----
-      # 执行一次 flr generate 操作
+      # 对flutter工程进行合法资源目录检测:
+      # - 获取主工程的所有子工程根目录，生成工程根目录数组flutter_project_root_dir_array
+      # - 遍历flutter_project_root_dir_array，获取每个工程的legal_resource_dir数组：
+      #   - 从flr_config中的assets配置获取assets_legal_resource_dir数组；
+      #   - 从flr_config中的fonts配置获取fonts_legal_resource_dir数组；
+      #   - 合并assets_legal_resource_dir数组和fonts_legal_resource_dir数组到legal_resource_dir数组。
+      # - 检测legal_resource_dir数组是否为空，为空则结束运行。
       #
+      puts("")
+      puts("get the valid resource directories of all projects now ...")
 
-      now_str = Time.now.to_s
-      puts("--------------------------- #{now_str} ---------------------------")
-      puts("scan assets, specify scanned assets in pubspec.yaml, generate \"r.g.dart\" now ...")
-      puts("\n")
-      generate
-      puts("\n")
-      puts("scan assets, specify scanned assets in pubspec.yaml, generate \"r.g.dart\" done !!!")
-      puts("---------------------------------------------------------------------------------")
-      puts("\n")
+      flutter_main_project_root_dir = FileUtil.get_flutter_main_project_root_dir
+      flutter_sub_project_root_dir_array = FileUtil.get_flutter_sub_project_root_dirs(flutter_main_project_root_dir)
+
+      flutter_project_root_dir_array = []
+      flutter_project_root_dir_array.push(flutter_main_project_root_dir)
+      flutter_project_root_dir_array += flutter_sub_project_root_dir_array
+
+      # 合法的资源目录数组
+      legal_resource_dir_array = []
+      # 非法的资源目录数组
+      illegal_resource_dir_array = []
+
+      flutter_project_root_dir_array.each do |flutter_project_root_dir|
+        begin
+          puts("")
+          puts("--------------------------- get info of specified project ----------------------------")
+          puts("get the valid resource directories from #{flutter_project_root_dir} now...")
+
+          Checker.check_pubspec_file_is_existed(flutter_project_root_dir)
+
+          pubspec_file_path = FileUtil.get_pubspec_file_path(flutter_project_root_dir)
+
+          pubspec_config = FileUtil.load_pubspec_config_from_file(pubspec_file_path)
+
+          Checker.check_flr_config_is_existed(pubspec_config)
+
+          flr_config = pubspec_config["flr"]
+
+          resource_dir_result_tuple = Checker.check_flr_assets_is_legal(flutter_project_root_dir, flr_config)
+
+          assets_legal_resource_dir_array = resource_dir_result_tuple[0]
+          fonts_legal_resource_dir_array = resource_dir_result_tuple[1]
+          legal_resource_dir_array += (assets_legal_resource_dir_array + fonts_legal_resource_dir_array)
+
+          illegal_resource_dir_array += resource_dir_result_tuple[2]
+          puts("get the valid resource directories from #{flutter_project_root_dir} done !!!")
+          puts("--------------------------------------------------------------------------------------")
+        rescue Exception => e
+          puts(e.message)
+          puts("[x]: #{flutter_project_root_dir} has no valid resource directories".error_style)
+          puts("--------------------------------------------------------------------------------------")
+        end
+      end
+
+      if legal_resource_dir_array.length <= 0
+        puts("")
+        puts("[x]: have no valid resource directories to be monitored".error_style)
+        return
+      end
+
+      puts("")
+      puts("get the valid resource directories of all projects done !!!")
 
       # ----- Step-2 End -----
 
+
       # ----- Step-3 Begin -----
-      # 获取legal_resource_dir数组：
-      # - 从flr_config中的assets配置获取assets_legal_resource_dir数组；
-      # - 从flr_config中的fonts配置获取fonts_legal_resource_dir数组；
-      # - 合并assets_legal_resource_dir数组和fonts_legal_resource_dir数组为legal_resource_dir数组。
+      # 执行一次 generate_all 操作
       #
 
-      # 合法的资源目录数组
-      assets_legal_resource_dir_array = resource_dir_result_tuple[0]
-      fonts_legal_resource_dir_array = resource_dir_result_tuple[1]
-
-      legal_resource_dir_array = assets_legal_resource_dir_array + fonts_legal_resource_dir_array
-
-      # 非法的资源目录数组
-      illegal_resource_dir_array = resource_dir_result_tuple[2]
+      puts("")
+      puts("now generate for all projects once before launching the monitoring service ...")
+      puts("")
+      generate_all
+      puts("")
+      puts("did generate for all projects, now is going to launching the monitoring service ...")
 
       # ----- Step-3 End -----
 
+
       # ----- Step-4 Begin -----
       # 启动资源监控服务
       #  - 启动一个文件监控服务，对 legal_resource_dir 数组中的资源目录进行文件监控
       #  - 若服务检测到资源变化（资源目录下的发生增/删/改文件），则执行一次 flr generate 操作
       #
 
+      puts("")
       now_str = Time.now.to_s
-      puts("--------------------------- #{now_str} ---------------------------")
+      puts("----------------------------- #{now_str} -----------------------------")
       puts("launch a monitoring service now ...")
       puts("launching ...")
       # stop the monitoring service if exists
@@ -854,7 +990,7 @@ Flr recommends the following flutter resource structure schemes:
           puts("  - #{resource_dir}".warning_style)
         end
       end
-      puts("---------------------------------------------------------------------------------")
+      puts("--------------------------------------------------------------------------------------")
       puts("\n")
 
       # Allow array of directories as input #92
@@ -862,16 +998,16 @@ Flr recommends the following flutter resource structure schemes:
       @@listener = Listen.to(*legal_resource_dir_array, ignore: [/\.DS_Store/], latency: 0.5, wait_for_delay: 5, relative: true) do |modified, added, removed|
         # for example: 2013-03-30 03:13:14 +0900
         now_str = Time.now.to_s
-        puts("--------------------------- #{now_str} ---------------------------")
+        puts("----------------------------- #{now_str} -----------------------------")
         puts("modified resource files: #{modified}")
         puts("added resource files: #{added}")
         puts("removed resource files: #{removed}")
-        puts("scan assets, specify scanned assets in pubspec.yaml, generate \"r.g.dart\" now ...")
+        puts("generate for all projects now ...")
         puts("\n")
-        generate
+        generate_all
         puts("\n")
-        puts("scan assets, specify scanned assets in pubspec.yaml, generate \"r.g.dart\" done !!!")
-        puts("---------------------------------------------------------------------------------")
+        puts("generate for all projects done !!!")
+        puts("--------------------------------------------------------------------------------------")
         puts("\n")
         puts("[*]: the monitoring service is monitoring the asset changes, and then auto scan assets, specifies assets and generates \"r.g.dart\" ...".tips_style)
         puts("[*]: you can press \"Ctrl-C\" to terminate it".tips_style)

data/lib/flr/util/asset_util.rb

@@ -34,6 +34,162 @@ module Flr
       return false
     end
 
+    # is_image_asset?(asset) -> true or false
+    #
+    # 判断当前资产是不是图片类资产
+    #
+    # === Examples
+    #
+    # === Example-1
+    # asset = "packages/flutter_r_demo/assets/images/test.png"
+    # @return true
+    #
+    # === Example-2
+    # asset = "assets/images/test.png"
+    # @return true
+    #
+    def self.is_image_asset?(asset)
+      if FileUtil.is_image_resource_file?(asset)
+        return true
+      end
+
+      return false
+    end
+
+    # is_package_asset?(asset) -> true or false
+    #
+    # 判断当前资产是不是package类资产
+    #
+    # === Examples
+    #
+    # === Example-1
+    # asset = "packages/flutter_r_demo/assets/images/test.png"
+    # @return true
+    #
+    # === Example-2
+    # asset = "assets/images/test.png"
+    # @return false
+    #
+    def self.is_package_asset?(asset)
+      package_prefix = "packages/"
+      if asset =~ /\A#{package_prefix}/
+        return true
+      end
+
+      return false
+    end
+
+    # is_specified_package_asset?(package_name, asset) -> true or false
+    #
+    # 判断当前资产是不是指定的package的资产
+    #
+    # === Examples
+    # package_name = "flutter_r_demo"
+    #
+    # === Example-1
+    # asset = "packages/flutter_r_demo/assets/images/test.png"
+    # @return true
+    #
+    # === Example-2
+    # asset = "packages/hello_demo/assets/images/test.png"
+    # @return false
+    #
+    def self.is_specified_package_asset?(package_name, asset)
+      specified_package_prefix = "packages/" + package_name + "/"
+      if asset =~ /\A#{specified_package_prefix}/
+        return true
+      end
+
+      return false
+    end
+
+    # get_main_resource_file(flutter_project_dir, package_name, asset) -> main_resource_file
+    #
+    # 获取指定flutter工程的asset对应的主资源文件
+    # 注意：主资源文件不一定存在，比如图片资产可能只存在变体资源文件
+    #
+    # === Examples
+    # flutter_project_dir = "~/path/to/flutter_r_demo"
+    # package_name = "flutter_r_demo"
+    #
+    # === Example-1
+    # asset = "packages/flutter_r_demo/assets/images/test.png"
+    # main_resource_file = "~/path/to/flutter_r_demo/lib/assets/images/test.png"
+    #
+    # === Example-2
+    # asset = "assets/images/test.png"
+    # main_resource_file = "~/path/to/flutter_r_demo/assets/images/test.png"
+    #
+    def self.get_main_resource_file(flutter_project_dir, package_name, asset)
+      if is_specified_package_asset?(package_name, asset)
+        specified_package_prefix = "packages/" + package_name + "/"
+
+        # asset: packages/flutter_r_demo/assets/images/test.png
+        # to get implied_relative_resource_file: lib/assets/images/test.png
+        implied_relative_resource_file = asset.dup
+        implied_relative_resource_file[specified_package_prefix] = ""
+        implied_relative_resource_file = "lib/" + implied_relative_resource_file
+
+        # main_resource_file:  ~/path/to/flutter_r_demo/lib/assets/images/test.png
+        main_resource_file = flutter_project_dir + "/" + implied_relative_resource_file
+        return main_resource_file
+      else
+        # asset: assets/images/test.png
+        # main_resource_file:  ~/path/to/flutter_r_demo/assets/images/test.png
+        main_resource_file = flutter_project_dir + "/" + asset
+        return main_resource_file
+      end
+    end
+
+    # is_asset_existed?(flutter_project_dir, package_name, asset) -> true or false
+    #
+    # 判断指定flutter工程的asset是不是存在；存在的判断标准是：asset需要存在对应的资源文件
+    #
+    # === Examples
+    # flutter_project_dir = "~/path/to/flutter_r_demo"
+    # package_name = "flutter_r_demo"
+    #
+    # === Example-1
+    # asset = "packages/flutter_r_demo/assets/images/test.png"
+    # @return true
+    #
+    # === Example-2
+    # asset = "packages/flutter_r_demo/404/not-existed.png"
+    # @return false
+    #
+    def self.is_asset_existed?(flutter_project_dir, package_name, asset)
+      # 处理指定flutter工程的asset
+      # 1. 获取asset对应的main_resource_file
+      # 2. 若main_resource_file是非SVG类图片资源文件，判断asset是否存在的标准是：主资源文件或者至少一个变体资源文件存在
+      # 3. 若main_resource_file是SVG类图片资源文件或者其他资源文件，判断asset是否存在的标准是：主资源文件存在
+      #
+      main_resource_file = get_main_resource_file(flutter_project_dir, package_name, asset)
+      if FileUtil.is_non_svg_image_resource_file?(main_resource_file)
+        if File.exist?(main_resource_file)
+          return true
+        end
+
+        file_name = File.basename(main_resource_file)
+        file_dir = File.dirname(main_resource_file)
+        did_find_variant_resource_file = false
+        Dir.glob(["#{file_dir}/*/#{file_name}"]).each do |file|
+          if is_asset_variant?(file)
+            did_find_variant_resource_file = true
+          end
+        end
+
+        if did_find_variant_resource_file
+          return true
+        end
+      else
+        if File.exist?(main_resource_file)
+          return true
+        end
+      end
+
+      return false
+    end
+
     # generate_main_asset(flutter_project_dir, package_name, legal_resource_file) -> main_asset
     #
     # 为当前资源文件生成 main_asset
@@ -185,5 +341,47 @@ module Flr
       return font_asset_config_array
     end
 
+    # mergeFlutterAssets(new_asset_array, old_asset_array) -> merged_asset_array
+    #
+    # 合并新旧2个asset数组：
+    # - old_asset_array - new_asset_array = diff_asset_array，获取old_asset_array与new_asset_array的差异集合
+    # - 遍历diff_asset_array，筛选合法的asset得到legal_old_asset_array；合法的asset标准是：非图片资源 + 存在对应的资源文件
+    # - 按照字典序对legal_old_asset_array进行排序，并追加到new_asset_array
+    # - 返回合并结果merged_asset_array
+    #
+    # === Examples
+    # flutter_project_dir = "~/path/to/flutter_r_demo"
+    # package_name = "flutter_r_demo"
+    # new_asset_array = ["packages/flutter_r_demo/assets/images/test.png", "packages/flutter_r_demo/assets/jsons/test.json"]
+    # old_asset_array = ["packages/flutter_r_demo/assets/htmls/test.html"]
+    # merged_asset_array = ["packages/flutter_r_demo/assets/images/test.png", "packages/flutter_r_demo/assets/jsons/test.json", "packages/flutter_r_demo/assets/htmls/test.html"]
+    def self.mergeFlutterAssets(flutter_project_dir, package_name, new_asset_array, old_asset_array)
+      legal_old_asset_array = []
+
+      diff_asset_array = old_asset_array - new_asset_array;
+      diff_asset_array.each do |asset|
+        # 若是第三方package的资源，则合并到new_asset_array
+        # 引用第三方package的资源的推荐做法是：通过引用第三方package的R类来访问
+        if is_package_asset?(asset)
+          if is_specified_package_asset?(package_name, asset) == false
+            legal_old_asset_array.push(asset)
+            next
+          end
+        end
+
+        # 处理指定flutter工程的asset
+        # 1. 判断asset是否存在
+        # 2. 若asset存在，则合并到new_asset_array
+        #
+        if is_asset_existed?(flutter_project_dir, package_name, asset)
+          legal_old_asset_array.push(asset)
+        end
+      end
+
+      legal_old_asset_array.sort!
+      merged_asset_array = new_asset_array + legal_old_asset_array
+      return merged_asset_array
+    end
+
   end
 end

data/lib/flr/util/file_util.rb

@@ -8,13 +8,26 @@ module Flr
 
     # get_cur_flutter_project_root_dir -> String
     #
-    # 获取当前flutter工程的根目录
+    # 获取flutter主工程的根目录
     #
-    def self.get_cur_flutter_project_root_dir
+    def self.get_flutter_main_project_root_dir
       flutter_project_root_dir = "#{Pathname.pwd}"
       return flutter_project_root_dir
     end
 
+    # get_flutter_sub_project_root_dirs -> [sub_project_root_dir]
+    #
+    # 获取flutter主工程的所有子工程的根目录
+    #
+    def self.get_flutter_sub_project_root_dirs(flutter_main_project_root_dir)
+      flutter_sub_project_root_dir_array = []
+      Dir.glob(["#{flutter_main_project_root_dir}/*/pubspec.yaml"]).each do |file|
+        flutter_project_root_dir = File.dirname(file)
+        flutter_sub_project_root_dir_array.push(flutter_project_root_dir)
+      end
+      return flutter_sub_project_root_dir_array
+    end
+
     # get_pubspec_file_path(flutter_project_dir) -> String
     #
     # 获取当前flutter工程的pubspec.yaml文件的路径

data/lib/flr/version.rb

@@ -1,9 +1,9 @@
 module Flr
   # 工具版本号
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 
   # 核心逻辑版本号
-  CORE_VERSION = "3.0.0"
+  CORE_VERSION = "3.1.0"
 
   class Version < Array
     def initialize str

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flr
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - York
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler