flr 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c066c1bf53372cfb42446a4478e319c4251e2dd6d9c30267135588cadee209f
-  data.tar.gz: da3036ab6a3452fe35d05321ee068ca8059f88e64d878f249bfaf230ddada681
+  metadata.gz: cf8e0a359356f8ea371d681026c47f7e4e649d144a0c1cda4acc051f07404cbd
+  data.tar.gz: fbf661e81c360e715695c2b9906ccb0328ed07163a208aab3b1d50ef024a5423
 SHA512:
-  metadata.gz: 98e30fa23cae12986881c75b7fc15d6ec7fa2b423d74fd1bc7ba5549f882ff0194211f202867aa30acd3ce81253b70d3d73718022cc3ed9b082e14c8f4cb47d7
-  data.tar.gz: 2d6cbb7417a21c448860f02bdb41c494d37a05108515542638e0bb6ca36677fc52cfb58e19a132bb2642c2d0b2591eae28ccc77290e817fb506b0046143d217e
+  metadata.gz: 6263917c0732cc4b6e772fe024267b8854d9b0f99c6868f2326caa6986dc68015db43f5e24be2bf0f06a3478d84de900099289c6b6ae2780542eb492d50ff93a
+  data.tar.gz: 87218e5d6f9d85fbce53246077b8a2e74e7e9df84fc45e221635b2b0c5980373177530b5bb6f4996d8cae1576f3ffc2d3beb741c49a99ee18f2a4c081f0444a8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.0
+
+- New asset generation algorithm to support all kinds of standard or nonstandard image/text resource structure
+- New asset-id generation algorithm to support assets with the same filename but different path
+- New recommended flutter resource structure
+
 ## 1.1.0
 
 - Improve generate-capability to support nonstandard image resource structure

data/Gemfile.lock

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

data/lib/flr/checker.rb

@@ -12,7 +12,7 @@ module Flr
     #
     # === Examples
     #
-    # flutter_dir = "~/path/to/flutter_project/pubspec.yaml"
+    # flutter_dir = "~path/to/flutter_r_demo"
     # Checker.check_pubspec_file_is_existed(flutter_dir)
     #
     def self.check_pubspec_file_is_existed(flutter_dir)
@@ -63,7 +63,7 @@ module Flr
       return true
     end
 
-    # check_flr_assets_is_legal(flr_config)  ->  resource_dir_result_tuple
+    # check_flr_assets_is_legal(flutter_dir, flr_config)  ->  resource_dir_result_tuple
     #
     # 检测当前flr配置信息中的assets配置是否合法
     # 若合法，返回资源目录结果三元组 resource_dir_result_triplet
@@ -88,11 +88,12 @@ module Flr
     # 判断flr的assets配置合法的标准是：assets配置的resource_dir数组中的legal_resource_dir数量大于0。
     #
     # === Examples
-    # assets_legal_resource_dir_array = ["lib/assets/images", "lib/assets/texts"]
-    # fonts_legal_resource_dir_array = ["lib/assets/fonts"]
-    # illegal_resource_dir_array = ["wrong/path/to/non-existed_folder"]
+    # flutter_dir = "~/path/to/flutter_r_demo"
+    # assets_legal_resource_dir_array = ["~/path/to/flutter_r_demo/lib/assets/images", "~/path/to/flutter_r_demo/lib/assets/texts"]
+    # fonts_legal_resource_dir_array = ["~/path/to/flutter_r_demo/lib/assets/fonts"]
+    # illegal_resource_dir_array = ["~/path/to/flutter_r_demo/to/non-existed_folder"]
     #
-    def self.check_flr_assets_is_legal(flr_config)
+    def self.check_flr_assets_is_legal(flutter_dir, flr_config)
       core_version = flr_config["core_version"]
       dartfmt_line_length = flr_config["dartfmt_line_length"]
       assets_resource_dir_array = flr_config["assets"]
@@ -119,7 +120,8 @@ module Flr
       fonts_legal_resource_dir_array = []
       illegal_resource_dir_array = []
 
-      assets_resource_dir_array.each do |resource_dir|
+      assets_resource_dir_array.each do |relative_resource_dir|
+        resource_dir = flutter_dir + "/" + relative_resource_dir
         if File.exist?(resource_dir) == true
           assets_legal_resource_dir_array.push(resource_dir)
         else
@@ -127,7 +129,8 @@ module Flr
         end
       end
 
-      fonts_resource_dir_array.each do |resource_dir|
+      fonts_resource_dir_array.each do |relative_resource_dir|
+        resource_dir = flutter_dir + "/" + relative_resource_dir
         if File.exist?(resource_dir) == true
           fonts_legal_resource_dir_array.push(resource_dir)
         else

data/lib/flr/command.rb

@@ -43,46 +43,46 @@ Flr recommends the following flutter resource structure:
   │   ├── ..
   ├── lib
   │   ├── assets
-  │   │   ├── \#{module}-images #{"// image resources root directory of a moudle".red}
-  │   │   │   ├── \#{main_image_asset}
-  │   │   │   ├── \#{variant-dir} #{"// image resources root directory of a variant".red}
-  │   │   │   │   ├── \#{image_asset_variant}
-  │   │   │   │   
-  │   │   ├── home-images #{"// image resources root directory of home module".red}
-  │   │   │   ├── home_icon.png
-  │   │   │   ├── home_badge.svg
-  │   │   │   ├── 3.0x #{"// image resources root directory of a 3.0x-ratio-variant".red}
+  │   │   ├── images #{"// image resource directory of all modules".red}
+  │   │   │   ├── \#{module} #{"// image resource directory of a module".red}
+  │   │   │   │   ├── \#{main_image_asset}
+  │   │   │   │   ├── \#{variant-dir} #{"// image resource directory of a variant".red}
+  │   │   │   │   │   ├── \#{image_asset_variant}
+  │   │   │   │
+  │   │   │   ├── home #{"// image resource directory of home module".red}
+  │   │   │   │   ├── home_badge.svg
   │   │   │   │   ├── home_icon.png
-  │   │   │   │   
-  │   │   ├── texts #{"// text resources root directory".red}
+  │   │   │   │   ├── 3.0x #{"// image resource directory of a 3.0x-ratio-variant".red}
+  │   │   │   │   │   ├── home_icon.png
+  │   │   │   │		
+  │   │   ├── texts #{"// text resource directory".red}
   │   │   │   │     #{"// (you can also break it down further by module)".red}
   │   │   │   └── test.json
   │   │   │   └── test.yaml
-  │   │   │   │     
-  │   │   ├── fonts #{"// font resources root directory of all font-family".red}
-  │   │   │   ├── \#{font-family} #{"// font resources root directory of a font-family".red}
+  │   │   │   │
+  │   │   ├── fonts #{"// font resource directory of all font-families".red}
+  │   │   │   ├── \#{font-family} #{"// font resource directory of a font-family".red}
   │   │   │   │   ├── \#{font-family}-\#{font_weight_or_style}.ttf
-  │   │   │   │     
-  │   │   │   ├── Amiri #{"// font resources root directory of Amiri font-family".red}
+  │   │   │   │
+  │   │   │   ├── Amiri #{"// font resource directory of Amiri font-family".red}
   │   │   │   │   ├── Amiri-Regular.ttf
   │   │   │   │   ├── Amiri-Bold.ttf
   │   │   │   │   ├── Amiri-Italic.ttf
   │   │   │   │   ├── Amiri-BoldItalic.ttf
   │   ├── ..
-  
+
 #{"[*]: Then config the resource directories that need to be scanned as follows：".tips_style}
 
-    #{"flr:".tips_style}
-      #{"core_version: #{Flr::CORE_VERSION}".tips_style}
-      #{"dartfmt_line_length: #{Flr::DARTFMT_LINE_LENGTH}".tips_style}
-      #{"# config the image and text resource directories that need to be scanned".tips_style}
-      #{"assets:".tips_style}
-        #{"- lib/assets/moduleX-images".tips_style}
-        #{"- lib/assets/home-images".tips_style}
-        #{"- lib/assets/texts".tips_style}
-      #{"# config the font resource directories that need to be scanned".tips_style}
-      #{"fonts:".tips_style}
-        #{"- lib/assets/fonts".tips_style}
+  #{"flr:".tips_style}
+    #{"core_version: #{Flr::CORE_VERSION}".tips_style}
+    #{"dartfmt_line_length: #{Flr::DARTFMT_LINE_LENGTH}".tips_style}
+    #{"# config the image and text resource directories that need to be scanned".tips_style}
+    #{"assets:".tips_style}
+      #{"- lib/assets/images".tips_style}
+      #{"- lib/assets/texts".tips_style}
+    #{"# config the font resource directories that need to be scanned".tips_style}
+    #{"fonts:".tips_style}
+      #{"- lib/assets/fonts".tips_style}
 
       MESSAGE
 
@@ -145,7 +145,9 @@ Flr recommends the following flutter resource structure:
 
       dependencies_config = pubspec_config["dependencies"]
 
-      # 添加 flr_config 到 pubspec.yaml
+      # 添加flr_config到pubspec.yaml：检测当前是否存在flr_config；若不存在，则添加flr_config；若存在，则按照以下步骤处理：
+      #  - 读取dartfmt_line_length选项、assets选项和fonts选项的值（这些选项值若存在，则应用于新建的flr_config；需要注意，使用前需要判断选项值是否合法：dartfmt_line_length选项值 >=80；assets选项和fonts选项的值为数组）
+      #  - 新建flr_config，然后使用旧值或者默认值设置各个选项
       #
       # flr_config: Flr的配置信息
       # ```yaml
@@ -155,7 +157,33 @@ Flr recommends the following flutter resource structure:
       #  assets: []
       #  fonts: []
       # ```
-      flr_config = Hash["core_version" => "#{Flr::CORE_VERSION}", "dartfmt_line_length" => Flr::DARTFMT_LINE_LENGTH,  "assets" => [], "fonts" => []]
+
+      dartfmt_line_length = Flr::DARTFMT_LINE_LENGTH
+      asset_resource_dir_array = []
+      font_resource_dir_array = []
+
+      old_flr_config = pubspec_config["flr"]
+      if old_flr_config.is_a?(Hash)
+        dartfmt_line_length = old_flr_config["dartfmt_line_length"]
+        if dartfmt_line_length.nil? or dartfmt_line_length.is_a?(Integer) == false
+          dartfmt_line_length = Flr::DARTFMT_LINE_LENGTH
+        end
+        if dartfmt_line_length < Flr::DARTFMT_LINE_LENGTH
+          dartfmt_line_length = Flr::DARTFMT_LINE_LENGTH
+        end
+
+        asset_resource_dir_array = old_flr_config["assets"]
+        if asset_resource_dir_array.nil? or asset_resource_dir_array.is_a?(Array) == false
+          asset_resource_dir_array = []
+        end
+
+        font_resource_dir_array = old_flr_config["fonts"]
+        if font_resource_dir_array.nil? or font_resource_dir_array.is_a?(Array) == false
+          font_resource_dir_array = []
+        end
+      end
+
+      flr_config = Hash["core_version" => "#{Flr::CORE_VERSION}", "dartfmt_line_length" => dartfmt_line_length,  "assets" => asset_resource_dir_array, "fonts" => font_resource_dir_array]
       pubspec_config["flr"] = flr_config
 
       # 添加 r_dart_library（https://github.com/YK-Unit/r_dart_library）的依赖声明
@@ -258,7 +286,7 @@ Flr recommends the following flutter resource structure:
 
         flr_config = pubspec_config["flr"]
 
-        resource_dir_result_tuple = Checker.check_flr_assets_is_legal(flr_config)
+        resource_dir_result_tuple = Checker.check_flr_assets_is_legal(flutter_project_root_dir, flr_config)
 
       rescue Exception => e
         puts(e.message)
@@ -271,7 +299,10 @@ Flr recommends the following flutter resource structure:
 
       # ----- Step-2 Begin -----
       # 进行核心逻辑版本检测：
-      # 检测Flr配置中的核心逻辑版本号和当前工具的核心逻辑版本号是否一致；若不一致，则生成“核心逻辑版本不一致”的警告日志，存放到警告日志数组
+      # 检测flr_config中的core_version和当前工具的core_version是否一致；若不一致，则按照以下规则处理：
+      #  - 更新flr_config中的core_version的值为当前工具的core_version；
+      #  - 生成“核心逻辑版本不一致”的警告日志，存放到警告日志数组。
+      #
 
       flr_core_version = flr_config["core_version"]
 
@@ -280,10 +311,12 @@ Flr recommends the following flutter resource structure:
       end
 
       if flr_core_version != Flr::CORE_VERSION
+        flr_config["core_version"] = Flr::CORE_VERSION
+
         message = <<-MESSAGE
-#{"[!]: warning, the \"core_version\"(CoreLogic version) of the configured Flr tool is #{flr_core_version}, while the \"core_version\"(CoreLogic version) of the currently used Flr tool is #{Flr::CORE_VERSION}".warning_style}
-#{"[*]: to fix it, you should make sure that the core logic version of the Flr tool you are currently using is consistent with the configuration".tips_style}
-#{"[*]: to get the value of \"core_version\"(CoreLogic version), just run \"flr version\"".tips_style}
+#{"[!]: warning, some team members may be using Flr tool with core_version #{flr_core_version}, while you are using Flr tool with core_version #{Flr::CORE_VERSION}".warning_style}
+#{"[*]: to fix it, you and your team members should use the Flr tool with same core_version".tips_style}
+#{"[*]: \"core_version\" is the core logic version of Flr tool, you can run \"flr version\" to get it".tips_style}
 
         MESSAGE
 
@@ -319,16 +352,18 @@ Flr recommends the following flutter resource structure:
       puts("scan assets now ...")
 
       # ----- Step-4 Begin -----
-      # 扫描assets_legal_resource_dir数组中的legal_resource_dir，输出image_asset数组和illegal_image_file数组：
+      # 扫描assets_legal_resource_dir数组中的legal_resource_dir，输出有序的image_asset数组、non_svg_image_asset数组、svg_image_asset数组、illegal_image_file数组：
       # - 创建image_asset数组、illegal_image_file数组；
       # - 遍历assets_legal_resource_dir数组，按照如下处理每个资源目录：
-      #  - 扫描当前资源目录和其第1级的子目录，查找所有image_file；
+      #  - 扫描当前资源目录和其所有层级的子目录，查找所有image_file；
       #  - 根据legal_resource_file的标准，筛选查找结果生成legal_image_file子数组和illegal_image_file子数组；illegal_image_file子数组合并到illegal_image_file数组；
       #  - 根据image_asset的定义，遍历legal_image_file子数组，生成image_asset子数；组；image_asset子数组合并到image_asset数组。
       # - 对image_asset数组做去重处理；
       # - 按照字典顺序对image_asset数组做升序排列（一般使用开发语言提供的默认的sort算法即可）；
-      # - 输出image_asset数组和illegal_image_file数组。
-      #
+      # - 按照SVG分类，从image_asset数组筛选得到有序的non_svg_image_asset数组和svg_image_asset数组：
+      #  - 按照SVG分类，从image_asset数组筛选得到non_svg_image_asset数组和svg_image_asset数组；
+      #  - 按照字典顺序对non_svg_image_asset数组和svg_image_asset数组做升序排列（一般使用开发语言提供的默认的sort算法即可）；
+      # - 输出有序的image_asset数组、non_svg_image_asset数组、svg_image_asset数组、illegal_image_file数组。
 
       image_asset_array = []
       illegal_image_file_array = []
@@ -340,13 +375,28 @@ Flr recommends the following flutter resource structure:
 
         illegal_image_file_array += illegal_image_file_subarray
 
-        image_asset_subarray = AssetUtil.generate_image_assets(legal_image_file_subarray, resource_dir, package_name)
+        image_asset_subarray = AssetUtil.generate_image_assets(flutter_project_root_dir, package_name, legal_image_file_subarray)
         image_asset_array += image_asset_subarray
       end
 
       image_asset_array.uniq!
       image_asset_array.sort!
 
+      non_svg_image_asset_array = []
+      svg_image_asset_array = []
+
+      image_asset_array.each do |image_asset|
+        if FileUtil.is_svg_image_resource_file?(image_asset)
+          svg_image_asset_array.push(image_asset)
+        else
+          non_svg_image_asset_array.push(image_asset)
+        end
+
+      end
+
+      non_svg_image_asset_array.sort!
+      svg_image_asset_array.sort!
+
       # ----- Step-4 End -----
 
       # ----- Step-5 Begin -----
@@ -371,7 +421,7 @@ Flr recommends the following flutter resource structure:
 
         illegal_text_file_array += illegal_text_file_subarray
 
-        text_asset_subarray = AssetUtil.generate_text_assets(legal_text_file_subarray, resource_dir, package_name)
+        text_asset_subarray = AssetUtil.generate_text_assets(flutter_project_root_dir, package_name, legal_text_file_subarray)
         text_asset_array += text_asset_subarray
       end
 
@@ -415,7 +465,7 @@ Flr recommends the following flutter resource structure:
             next
           end
 
-          font_asset_config_array = AssetUtil.generate_font_asset_configs(legal_font_file_array, font_family_dir, package_name)
+          font_asset_config_array = AssetUtil.generate_font_asset_configs(flutter_project_root_dir, package_name, legal_font_file_array)
           font_asset_config_array.sort!{|a, b| a["asset"] <=> b["asset"]}
 
           font_family_config =  Hash["family" => font_family_name , "fonts" => font_asset_config_array]
@@ -475,26 +525,31 @@ Flr recommends the following flutter resource structure:
       puts("specify scanned assets in pubspec.yaml done !!!")
 
       # ----- Step-9 Begin -----
-      # 按照SVG分类，从image_asset数组筛选得到有序的non_svg_image_asset数组和svg_image_asset数组：
-      #  - 按照SVG分类，从image_asset数组筛选得到non_svg_image_asset数组和svg_image_asset数组；
-      #  - 按照字典顺序对non_svg_image_asset数组和svg_image_asset数组做升序排列（一般使用开发语言提供的默认的sort算法即可）；
+      # 分别遍历non_svg_image_asset数组、svg_image_asset数组、text_asset数组，
+      # 根据asset_id生成算法，分别输出non_svg_image_asset_id字典、svg_image_asset_id 字典、text_asset_id字典。
+      # 字典的key为asset，value为asset_id。
       #
+      non_svg_image_asset_id_dict = Hash[]
+      svg_image_asset_id_dict = Hash[]
+      text_asset_id_dict = Hash[]
+
+      non_svg_image_asset_array.each do |asset|
+        used_asset_id_array = non_svg_image_asset_id_dict.values
+        asset_id = CodeUtil.generate_asset_id(asset, used_asset_id_array, Flr::PRIOR_NON_SVG_IMAGE_FILE_TYPE)
+        non_svg_image_asset_id_dict[asset] = asset_id
+      end
 
-      non_svg_image_asset_array = []
-      svg_image_asset_array = []
-
-      image_asset_array.each do |image_asset|
-        file_extname = File.extname(image_asset).downcase
-
-        if file_extname.eql?(".svg")
-          svg_image_asset_array.push(image_asset)
-        else
-          non_svg_image_asset_array.push(image_asset)
-        end
+      svg_image_asset_array.each do |asset|
+        used_asset_id_array = svg_image_asset_id_dict.values
+        asset_id = CodeUtil.generate_asset_id(asset, used_asset_id_array, Flr::PRIOR_SVG_IMAGE_FILE_TYPE)
+        svg_image_asset_id_dict[asset] = asset_id
       end
 
-      non_svg_image_asset_array.sort!
-      svg_image_asset_array.sort!
+      text_asset_array.each do |asset|
+        used_asset_id_array = text_asset_id_dict.values
+        asset_id = CodeUtil.generate_asset_id(asset, used_asset_id_array, Flr::PRIOR_TEXT_FILE_TYPE)
+        text_asset_id_dict[asset] = asset_id
+      end
 
       # ----- Step-9 End -----
 
@@ -533,7 +588,7 @@ Flr recommends the following flutter resource structure:
       #
 
       r_dart_file.puts("\n")
-      g__R_Image_AssetResource_class_code = CodeUtil.generate__R_Image_AssetResource_class(non_svg_image_asset_array, package_name)
+      g__R_Image_AssetResource_class_code = CodeUtil.generate__R_Image_AssetResource_class(non_svg_image_asset_array, non_svg_image_asset_id_dict, package_name)
       r_dart_file.puts(g__R_Image_AssetResource_class_code)
 
       # ----- Step-13 End -----
@@ -543,7 +598,7 @@ Flr recommends the following flutter resource structure:
       #
 
       r_dart_file.puts("\n")
-      g__R_Svg_AssetResource_class_code = CodeUtil.generate__R_Svg_AssetResource_class(svg_image_asset_array, package_name)
+      g__R_Svg_AssetResource_class_code = CodeUtil.generate__R_Svg_AssetResource_class(svg_image_asset_array, svg_image_asset_id_dict,  package_name)
       r_dart_file.puts(g__R_Svg_AssetResource_class_code)
 
       # ----- Step-14 End -----
@@ -553,7 +608,7 @@ Flr recommends the following flutter resource structure:
       #
 
       r_dart_file.puts("\n")
-      g__R_Text_AssetResource_class_code = CodeUtil.generate__R_Text_AssetResource_class(text_asset_array, package_name)
+      g__R_Text_AssetResource_class_code = CodeUtil.generate__R_Text_AssetResource_class(text_asset_array, text_asset_id_dict, package_name)
       r_dart_file.puts(g__R_Text_AssetResource_class_code)
 
       # ----- Step-15 End -----
@@ -564,7 +619,7 @@ Flr recommends the following flutter resource structure:
       #
 
       r_dart_file.puts("\n")
-      g__R_Image_class_code = CodeUtil.generate__R_Image_class(non_svg_image_asset_array, package_name)
+      g__R_Image_class_code = CodeUtil.generate__R_Image_class(non_svg_image_asset_array, non_svg_image_asset_id_dict, package_name)
       r_dart_file.puts(g__R_Image_class_code)
 
       # ----- Step-16 End -----
@@ -574,7 +629,7 @@ Flr recommends the following flutter resource structure:
       #
 
       r_dart_file.puts("\n")
-      g__R_Svg_class_code = CodeUtil.generate__R_Svg_class(svg_image_asset_array, package_name)
+      g__R_Svg_class_code = CodeUtil.generate__R_Svg_class(svg_image_asset_array, svg_image_asset_id_dict, package_name)
       r_dart_file.puts(g__R_Svg_class_code)
 
       # ----- Step-17 End -----
@@ -584,7 +639,7 @@ Flr recommends the following flutter resource structure:
       #
 
       r_dart_file.puts("\n")
-      g__R_Text_class_code = CodeUtil.generate__R_Text_class(text_asset_array, package_name)
+      g__R_Text_class_code = CodeUtil.generate__R_Text_class(text_asset_array, text_asset_id_dict, package_name)
       r_dart_file.puts(g__R_Text_class_code)
 
       # ----- Step-18 End -----
@@ -679,7 +734,7 @@ Flr recommends the following flutter resource structure:
 
         flr_config = pubspec_config["flr"]
 
-        resource_dir_result_tuple = Checker.check_flr_assets_is_legal(flr_config)
+        resource_dir_result_tuple = Checker.check_flr_assets_is_legal(flutter_project_root_dir, flr_config)
 
       rescue Exception => e
         puts(e.message)

data/lib/flr/constant.rb

@@ -1,6 +1,10 @@
 module Flr
+  # Flr支持的非SVG类图片文件类型
+  NON_SVG_IMAGE_FILE_TYPES = %w(.png .jpg .jpeg .gif .webp .icon .bmp .wbmp)
+  # Flr支持的SVG类图片文件类型
+  SVG_IMAGE_FILE_TYPES = %w(.svg)
   # Flr支持的图片文件类型
-  IMAGE_FILE_TYPES = %w(.png .jpg .jpeg .gif .webp .icon .bmp .wbmp .svg)
+  IMAGE_FILE_TYPES = NON_SVG_IMAGE_FILE_TYPES + SVG_IMAGE_FILE_TYPES
   # Flr支持的文本文件类型
   TEXT_FILE_TYPES = %w(.txt .json .yaml .xml)
   # Flr支持的字体文件类型

data/lib/flr/util/asset_util.rb

@@ -6,87 +6,158 @@ module Flr
   # 资产相关的工具类方法
   class AssetUtil
 
-    # generate_image_assets(legal_image_file_array, resource_dir, package_name) -> image_asset_array
+    # is_asset_variant?(legal_resource_file) -> true or false
+    #
+    # 判断当前的资源文件是不是资产变体（asset_variant）类型
+    #
+    # 判断的核心算法是：
+    # - 获取资源文件的父目录；
+    # - 判断父目录是否符合资产变体目录的特征
+    #   资产变体映射的的资源文件要求存放在“与 main_asset 在同一个目录下的”、“符合指定特征的”子目录中；
+    #   截止目前，Flutter只支持一种变体类型：倍率变体；
+    #   倍率变体只适用于非SVG类图片资源；
+    #   倍率变体目录特征可使用此正则来判断：“^((0\.[0-9]+)|([1-9]+[0-9]*(\.[0-9]+)?))[x]$”；
+    #   倍率变体目录名称示例：“0.5x”、“1.5x”、“2.0x”、“3.0x”，“2x”、“3x”；
+    #
+    def self.is_asset_variant?(legal_resource_file)
+
+      if FileUtil.is_non_svg_image_resource_file?(legal_resource_file)
+        dirname = File.dirname(legal_resource_file)
+        parent_dir_name = File.basename(dirname)
+
+        ratio_regex = /^((0\.[0-9]+)|([1-9]+[0-9]*(\.[0-9]+)?))[x]$/
+        if parent_dir_name =~ ratio_regex
+          return true
+        end
+      end
+
+      return false
+    end
+
+    # generate_main_asset(flutter_dir, package_name, legal_resource_file) -> main_asset
+    #
+    # 为当前资源文件生成 main_asset
+    #
+    # === Examples
+    # flutter_dir = "~/path/to/flutter_r_demo"
+    # package_name = "flutter_r_demo"
+    #
+    # === Example-1
+    # legal_resource_file = "~/path/to/flutter_r_demo/lib/assets/images/test.png"
+    # main_asset = "packages/flutter_r_demo/assets/images/test.png"
+    #
+    # === Example-2
+    # legal_resource_file = "~/path/to/flutter_r_demo/lib/assets/images/3.0x/test.png"
+    # main_asset = "packages/flutter_r_demo/assets/images/test.png"
+    #
+    # === Example-3
+    # legal_resource_file = "~/path/to/flutter_r_demo/lib/assets/texts/3.0x/test.json"
+    # main_asset = "packages/flutter_r_demo/assets/texts/3.0x/test.json"
+    #
+    # === Example-3
+    # legal_resource_file = "~/path/to/flutter_r_demo/lib/assets/fonts/Amiri/Amiri-Regular.ttf"
+    # main_asset = "packages/flutter_r_demo/fonts/Amiri/Amiri-Regular.ttf"
+    #
+    def self.generate_main_asset(flutter_dir, package_name, legal_resource_file)
+      # legal_resource_file: ~/path/to/flutter_r_demo/lib/assets/images/3.0x/test.png
+      # to get main_resource_file: ~/path/to/flutter_r_demo/lib/assets/images/test.png
+      main_resource_file = legal_resource_file
+      if is_asset_variant?(legal_resource_file)
+        # test.png
+        file_basename = File.basename(legal_resource_file)
+        # ~/path/to/flutter_r_demo/lib/assets/images/3.0x
+        file_dir = File.dirname(legal_resource_file)
+        # ~/path/to/flutter_r_demo/lib/assets/images
+        main_resource_file_dir = File.dirname(file_dir)
+        # ~/path/to/flutter_r_demo/lib/assets/images/test.png
+        main_resource_file = main_resource_file_dir + "/" + file_basename
+      end
+
+      # main_resource_file:  ~/path/to/flutter_r_demo/lib/assets/images/test.png
+      # main_relative_resource_file: lib/assets/images/test.png
+      # to get main_implied_relative_resource_file: assets/images/test.png
+      flutter_dir_prefix = "#{flutter_dir}/"
+      main_relative_resource_file = main_resource_file
+      if main_relative_resource_file =~ /\A#{flutter_dir_prefix}/
+        main_relative_resource_file["#{flutter_dir_prefix}"] = ""
+      end
+      lib_prefix = "lib/"
+      main_implied_relative_resource_file = main_relative_resource_file;
+      if main_implied_relative_resource_file =~ /\A#{lib_prefix}/
+        main_implied_relative_resource_file[lib_prefix] = ""
+      end
+
+      main_asset = "packages/#{package_name}/#{main_implied_relative_resource_file}"
+      return main_asset
+    end
+
+    # generate_image_assets(flutter_dir, package_name, legal_image_file_array) -> image_asset_array
     #
     # 遍历指定资源目录下扫描找到的legal_image_file数组生成image_asset数组
     #
     # === Examples
-    # legal_image_file_array = ["lib/assets/images/test.png"]
-    # resource_dir = "lib/assets/images"
+    # flutter_dir = "~/path/to/flutter_r_demo"
     # package_name = "flutter_r_demo"
+    # legal_image_file_array = ["~/path/to/flutter_r_demo/lib/assets/images/test.png", "~/path/to/flutter_r_demo/lib/assets/images/3.0x/test.png"]
     # image_asset_array = ["packages/flutter_r_demo/assets/images/test.png"]
     #
-    def self.generate_image_assets(legal_image_file_array, resource_dir, package_name)
+    def self.generate_image_assets(flutter_dir, package_name, legal_image_file_array)
 
       image_asset_array = []
 
-      # implied_resource_dir = "assets/images"
-      implied_resource_dir = resource_dir
-      if resource_dir.include?("lib/")
-        implied_resource_dir = resource_dir.split("lib/")[1]
-      end
-
       legal_image_file_array.each do |legal_image_file|
-        file_basename = File.basename(legal_image_file)
-        image_asset = "packages/#{package_name}/#{implied_resource_dir}/#{file_basename}"
+        image_asset = generate_main_asset(flutter_dir, package_name, legal_image_file)
         image_asset_array.push(image_asset)
       end
 
+      image_asset_array.uniq!
       return image_asset_array
     end
 
-    # generate_text_assets(legal_text_file_array, resource_dir, package_name) -> text_asset_array
+    # generate_text_assets(flutter_dir, package_name, legal_text_file_array) -> text_asset_array
     #
     # 遍历指定资源目录下扫描找到的legal_text_file数组生成text_asset数组
     #
     # === Examples
-    # legal_text_file_array = ["lib/assets/jsons/test.json"]
-    # resource_dir = "lib/assets/jsons"
+    # flutter_dir = "~/path/to/flutter_r_demo"
     # package_name = "flutter_r_demo"
+    # legal_text_file_array = ["~path/to/flutter_r_demo/lib/assets/jsons/test.json"]
     # text_asset_array = ["packages/flutter_r_demo/assets/jsons/test.json"]
     #
-    def self.generate_text_assets(legal_text_file_array, resource_dir, package_name)
+    def self.generate_text_assets(flutter_dir, package_name, legal_text_file_array)
 
       text_asset_array = []
 
       legal_text_file_array.each do |legal_text_file|
-        # implied_resource_file = "assets/jsons/test.json"
-        implied_resource_file = legal_text_file
-        if legal_text_file.include?("lib/")
-          implied_resource_file = legal_text_file.split("lib/")[1]
-        end
-        text_asset = "packages/#{package_name}/#{implied_resource_file}"
+        text_asset = generate_main_asset(flutter_dir, package_name, legal_text_file)
         text_asset_array.push(text_asset)
       end
 
+      text_asset_array.uniq!
       return text_asset_array
     end
 
-    # generate_font_asset_configs(legal_font_file_array, resource_dir, package_name) -> font_asset_config_array
+    # generate_font_asset_configs(flutter_dir, package_name, legal_font_file_array) -> font_asset_config_array
     #
     # 遍历指定资源目录下扫描找到的legal_font_file数组生成font_asset_config数组
     #
     # === Examples
-    # legal_font_file_array = ["lib/assets/fonts/Amiri/Amiri-Regular.ttf"]
-    # resource_dir = "lib/assets/fonts/Amiri"
+    # flutter_dir = "~/path/to/flutter_r_demo"
     # package_name = "flutter_r_demo"
+    # legal_font_file_array = ["~path/to/flutter_r_demo/lib/assets/fonts/Amiri/Amiri-Regular.ttf"]
     # font_asset_config_array -> [{"asset": "packages/flutter_r_demo/assets/fonts/Amiri/Amiri-Regular.ttf"}]
     #
-    def self.generate_font_asset_configs(legal_font_file_array, resource_dir, package_name)
+    def self.generate_font_asset_configs(flutter_dir, package_name, legal_font_file_array)
 
       font_asset_config_array = []
 
       legal_font_file_array.each do |legal_font_file|
-        # implied_resource_file = "assets/fonts/Amiri/Amiri-Regular.ttf"
-        implied_resource_file = legal_font_file
-        if legal_font_file.include?("lib/")
-          implied_resource_file = legal_font_file.split("lib/")[1]
-        end
-        font_asset = "packages/#{package_name}/#{implied_resource_file}"
+        font_asset = generate_main_asset(flutter_dir, package_name, legal_font_file)
         font_asset_config = Hash["asset" => font_asset]
         font_asset_config_array.push(font_asset_config)
       end
 
+      font_asset_config_array.uniq!{|config| config["asset"]}
       return font_asset_config_array
     end
 

data/lib/flr/util/code_util.rb

@@ -116,7 +116,7 @@ class AssetResource {
       return code
     end
 
-    # generate_asset_id (asset, prior_asset_type) -> string
+    # generate_asset_id (asset, used_asset_id_array, prior_asset_type) -> string
     #
     # - prior_asset_type: 优先的资源类型；默认值为 ".*"，意味当前不存在任何优先的资源类型
     #                     对于优先的资源类型，其 asset_id 不会携带类型信息，详细见例子
@@ -126,26 +126,40 @@ class AssetResource {
     # - 处理非法字符：把除了字母（a-z, A-Z）、数字（0-9）、'_' 字符、'$' 字符之外的字符转换为 '_' 字符
     # - 首字母转化为小写
     # - 处理首字符异常情况：检测首字符是不是数字、'_'、'$'，若是则添加前缀字符"a"
+    # - 处理 asset_id 重名的情况
     #
     # === Examples
     #
     # ===== Example-1
-    # a_asset = "packages/flutter_r_demo/assets/images/test.png"
-    # b_asset = "packages/flutter_r_demo/assets/images/test.jpg"
+    # asset = "packages/flutter_r_demo/assets/images/test.png"
+    # asset = "packages/flutter_r_demo/assets/images/test.jpg"
+    # used_asset_id_array = []
     # prior_asset_type = ".png"
-    # a_asset_id = "test"
-    # b_asset_id = "test_jpg"
+    # asset_id = "test"
     #
     # ===== Example-2
-    # a_asset = "packages/flutter_r_demo/assets/texts/test.json"
-    # b_asset = "packages/flutter_r_demo/assets/texts/test.yaml"
+    # asset = "packages/flutter_r_demo/assets/images/test.jpg"
+    # used_asset_id_array = [test]
+    # prior_asset_type = ".png"
+    # asset_id = "test_jpg"
+    #
+    # ===== Example-3
+    # asset = "packages/flutter_r_demo/assets/home-images/test.jpg"
+    # used_asset_id_array = [test, test_jpg]
+    # prior_asset_type = ".png"
+    # asset_id = "test_jpg_1"
+    #
+    # ===== Example-4
+    # asset = "packages/flutter_r_demo/assets/texts/test.json"
+    # used_asset_id_array = []
     # prior_asset_type = ".*"
-    # a_asset_id = "test_json"
-    # b_asset_id = "test_yaml"
+    # asset_id = "test_json"
     #
-    def self.generate_asset_id(asset, prior_asset_type = ".*")
+    def self.generate_asset_id(asset, used_asset_id_array, prior_asset_type = ".*")
       file_extname = File.extname(asset).downcase
 
+      dirname = File.dirname(asset)
+      parent_dir_name = File.basename(dirname)
       file_basename = File.basename(asset)
 
       file_basename_no_extension = File.basename(asset, ".*")
@@ -168,6 +182,26 @@ class AssetResource {
         asset_id = "a" + asset_id
       end
 
+      # 处理 asset_id 重名的情况
+      if used_asset_id_array.include?(asset_id)
+        # 当前asset_id重名次数，初始值为1
+        repeat_count = 1
+
+        # 查找当前asset_id衍生出来的asset_id_brother（id兄弟）
+        # asset_id_brother = #{asset_id}$#{repeat_count}
+        # 其中，repeat_count >= 1
+        #
+        # Example：
+        # asset_id = test
+        # asset_id_brother = test$1
+        #
+        id_brother_regx = /^#{asset_id}\$[1-9][0-9]*$/
+        cur_asset_id_brothers = used_asset_id_array.select{ |id| id =~ id_brother_regx }
+
+        repeat_count += cur_asset_id_brothers.size
+        asset_id = "#{asset_id}$#{repeat_count}"
+      end
+
       return asset_id
     end
 
@@ -190,13 +224,13 @@ class AssetResource {
       return asset_comment
     end
 
-    # generate_AssetResource_property(asset, package_name, prior_asset_type) -> string
+    # generate_AssetResource_property(asset, asset_id_dict, package_name, prior_asset_type) -> string
     #
     # 为当前 asset 生成 AssetResource property 的代码
     #
-    def self.generate_AssetResource_property(asset, package_name, prior_asset_type = ".*")
+    def self.generate_AssetResource_property(asset, asset_id_dict, package_name, prior_asset_type = ".*")
 
-      asset_id = generate_asset_id(asset, prior_asset_type)
+      asset_id = asset_id_dict[asset]
       asset_comment = generate_asset_comment(asset, package_name)
 
       asset_name = asset.dup
@@ -213,17 +247,17 @@ class AssetResource {
       return code
     end
 
-    # generate__R_Image_AssetResource_class(non_svg_image_asset_array, package_name) -> string
+    # generate__R_Image_AssetResource_class(non_svg_image_asset_array, non_svg_image_asset_id_dict, package_name) -> string
     #
     # 根据模板，为 non_svg_image_asset_array（非svg类的图片资产数组）生成 _R_Image_AssetResource class 的代码
     #
-    def self.generate__R_Image_AssetResource_class(non_svg_image_asset_array, package_name)
+    def self.generate__R_Image_AssetResource_class(non_svg_image_asset_array, non_svg_image_asset_id_dict, package_name)
 
       all_g_AssetResource_property_code = ""
 
       non_svg_image_asset_array.each do |image_asset|
         all_g_AssetResource_property_code += "\n"
-        g_AssetResource_property_code = generate_AssetResource_property(image_asset, package_name, Flr::PRIOR_NON_SVG_IMAGE_FILE_TYPE)
+        g_AssetResource_property_code = generate_AssetResource_property(image_asset, non_svg_image_asset_id_dict, package_name, Flr::PRIOR_NON_SVG_IMAGE_FILE_TYPE)
         all_g_AssetResource_property_code += g_AssetResource_property_code
       end
 
@@ -238,17 +272,17 @@ class _R_Image_AssetResource {
       return code
     end
 
-    # generate__R_Svg_AssetResource_class(image_asset_array, package_name) -> string
+    # generate__R_Svg_AssetResource_class(svg_image_asset_array, svg_image_asset_id_dict, package_name) -> string
     #
     # 根据模板，为 svg_image_asset_array（svg类的图片资产数组）生成 _R_Svg_AssetResource class 的代码
     #
-    def self.generate__R_Svg_AssetResource_class(svg_image_asset_array, package_name)
+    def self.generate__R_Svg_AssetResource_class(svg_image_asset_array, svg_image_asset_id_dict, package_name)
 
       all_g_AssetResource_property_code = ""
 
       svg_image_asset_array.each do |image_asset|
         all_g_AssetResource_property_code += "\n"
-        g_AssetResource_property_code = generate_AssetResource_property(image_asset, package_name, Flr::PRIOR_SVG_IMAGE_FILE_TYPE)
+        g_AssetResource_property_code = generate_AssetResource_property(image_asset, svg_image_asset_id_dict, package_name, Flr::PRIOR_SVG_IMAGE_FILE_TYPE)
         all_g_AssetResource_property_code += g_AssetResource_property_code
       end
 
@@ -263,17 +297,17 @@ class _R_Svg_AssetResource {
       return code
     end
 
-    # generate__R_Text_AssetResource_class(text_asset_array, package_name) -> string
+    # generate__R_Text_AssetResource_class(text_asset_array, text_asset_id_dict, package_name) -> string
     #
     # 根据模板，为 text_asset_array（文本资产数组）生成 _R_Text_AssetResource class 的代码
     #
-    def self.generate__R_Text_AssetResource_class(text_asset_array, package_name)
+    def self.generate__R_Text_AssetResource_class(text_asset_array, text_asset_id_dict, package_name)
 
       all_g_AssetResource_property_code = ""
 
       text_asset_array.each do |text_asset|
         all_g_AssetResource_property_code += "\n"
-        g_AssetResource_property_code = generate_AssetResource_property(text_asset, package_name, Flr::PRIOR_TEXT_FILE_TYPE)
+        g_AssetResource_property_code = generate_AssetResource_property(text_asset, text_asset_id_dict, package_name, Flr::PRIOR_TEXT_FILE_TYPE)
         all_g_AssetResource_property_code += g_AssetResource_property_code
       end
 
@@ -288,18 +322,18 @@ class _R_Text_AssetResource {
       return code
     end
 
-    # generate__R_Image_class(non_svg_image_asset_array, package_name) -> string
+    # generate__R_Image_class(non_svg_image_asset_array, non_svg_image_asset_id_dict, package_name) -> string
     #
     # 根据模板，为 non_svg_image_asset_array（非svg类的图片资产数组）生成 _R_Image class 的代码
     #
-    def self.generate__R_Image_class(non_svg_image_asset_array, package_name)
+    def self.generate__R_Image_class(non_svg_image_asset_array, non_svg_image_asset_id_dict, package_name)
 
       all_g_Asset_method_code = ""
 
       non_svg_image_asset_array.each do |image_asset|
         all_g_Asset_method_code += "\n"
 
-        asset_id = generate_asset_id(image_asset, Flr::PRIOR_NON_SVG_IMAGE_FILE_TYPE)
+        asset_id = non_svg_image_asset_id_dict[image_asset]
         asset_comment = generate_asset_comment(image_asset, package_name)
 
         g_Asset_method_code = <<-CODE
@@ -327,18 +361,18 @@ class _R_Image {
       return code
     end
 
-    # generate__R_Svg_class(image_asset_array, package_name) -> string
+    # generate__R_Svg_class(svg_image_asset_array, svg_image_asset_id_dict, package_name) -> string
     #
     # 根据模板，为 svg_image_asset_array（svg类的图片资产数组）生成 _R_Svg class 的代码
     #
-    def self.generate__R_Svg_class(svg_image_asset_array, package_name)
+    def self.generate__R_Svg_class(svg_image_asset_array, svg_image_asset_id_dict, package_name)
 
       all_g_Asset_method_code = ""
 
       svg_image_asset_array.each do |image_asset|
         all_g_Asset_method_code += "\n"
 
-        asset_id = generate_asset_id(image_asset, Flr::PRIOR_SVG_IMAGE_FILE_TYPE)
+        asset_id = svg_image_asset_id_dict[image_asset]
         asset_comment = generate_asset_comment(image_asset, package_name)
 
         g_Asset_method_code = <<-CODE
@@ -367,18 +401,18 @@ class _R_Svg {
       return code
     end
 
-    # generate__R_Text_class(text_asset_array, package_name) -> string
+    # generate__R_Text_class(text_asset_array, text_asset_id_dict, package_name) -> string
     #
     # 根据模板，为 text_asset_array（文本资产数组）生成 _R_Text class 的代码
     #
-    def self.generate__R_Text_class(text_asset_array, package_name)
+    def self.generate__R_Text_class(text_asset_array, text_asset_id_dict, package_name)
 
       all_g_Asset_method_code = ""
 
       text_asset_array.each do |text_asset|
         all_g_Asset_method_code += "\n"
 
-        asset_id = generate_asset_id(text_asset, Flr::PRIOR_TEXT_FILE_TYPE)
+        asset_id = text_asset_id_dict[text_asset]
         asset_comment = generate_asset_comment(text_asset, package_name)
 
         g_Asset_method_code = <<-CODE

data/lib/flr/util/file_util.rb

@@ -79,6 +79,61 @@ module Flr
       return true
     end
 
+    # 判断当前文件是不是非SVG类图片资源文件
+    def self.is_non_svg_image_resource_file?(file)
+      file_extname = File.extname(file).downcase
+
+      if Flr::NON_SVG_IMAGE_FILE_TYPES.include?(file_extname)
+        return true;
+      end
+
+      return false
+    end
+
+    # 判断当前文件是不是SVG类图片资源文件
+    def self.is_svg_image_resource_file?(file)
+      file_extname = File.extname(file).downcase
+
+      if Flr::SVG_IMAGE_FILE_TYPES.include?(file_extname)
+        return true;
+      end
+
+      return false
+    end
+
+    # 判断当前文件是不是图片资源文件
+    def self.is_image_resource_file?(file)
+      file_extname = File.extname(file).downcase
+
+      if Flr::IMAGE_FILE_TYPES.include?(file_extname)
+        return true;
+      end
+
+      return false
+    end
+
+    # 判断当前文件是不是文本资源文件
+    def self.is_text_resource_file?(file)
+      file_extname = File.extname(file).downcase
+
+      if Flr::TEXT_FILE_TYPES.include?(file_extname)
+        return true;
+      end
+
+      return false
+    end
+
+    # 判断当前文件是不是字体资源文件
+    def self.is_font_resource_file?(file)
+      file_extname = File.extname(file).downcase
+
+      if Flr::FONT_FILE_TYPES.include?(file_extname)
+        return true;
+      end
+
+      return false
+    end
+
     # is_legal_resource_file??(file) -> true or false
     #
     # 判断当前资源文件是否合法
@@ -87,8 +142,8 @@ module Flr
     # 其file_basename_no_extension 由字母（a-z、A-Z）、数字（0-9）、其他合法字符（'_', '+', '-', '.', '·', '!', '@', '&', '$', '￥'）组成
     #
     # === Examples
-    # good_file = "lib/assets/images/test.png"
-    # bad_file = "lib/assets/images/~.png"
+    # good_file = "~/path/to/flutter_project/lib/assets/images/test.png"
+    # bad_file = "~/path/to/flutter_project/lib/assets/images/~.png"
     # is_legal_resource_file?(good_file) -> true
     # is_legal_resource_file?(bad_file) -> false
     #
@@ -105,26 +160,25 @@ module Flr
 
     # find_image_files(resource_dir)  ->  image_file_result_tuple
     #
-    # v1.0.0: 扫描指定的资源目录和其第1级子目录，查找所有图片文件
-    # v1.1.0: 放开图片资源扫描目录层级限制，以支持不标准的资源组织目录结构
+    # 扫描指定的资源目录和其所有层级的子目录，查找所有图片文件
     # 返回图片文件结果二元组 image_file_result_tuple
     # image_file_result_tuple = [legal_image_file_array, illegal_image_file_array]
     #
     # 判断文件合法的标准参考 self.is_legal_resource_file? 方法
     #
     # === Examples
-    # resource_dir = "lib/assets/images"
-    # legal_image_file_array = ["lib/assets/images/test.png", "lib/assets/images/2.0x/test.png"]
-    # illegal_image_file_array = ["lib/assets/images/~.png"]
+    # resource_dir = "~/path/to/flutter_project/lib/assets/images"
+    # legal_image_file_array = ["~/path/to/flutter_project/lib/assets/images/test.png", "~/path/to/flutter_project/lib/assets/images/2.0x/test.png"]
+    # illegal_image_file_array = ["~/path/to/flutter_project/lib/assets/images/~.png"]
     #
     def self.find_image_files(resource_dir)
       legal_image_file_array = []
       illegal_image_file_array = []
 
       pattern_file_types = Flr::IMAGE_FILE_TYPES.join(",")
-      # dir/*{.png.,.jpg} : 查找当前目录的指定类型文件
-      # dir/*/*{.png.,.jpg}: 查找当前目录的第1级子目录的指定类型文件
-      # dir/**/*{.png.,.jpg}:  查找当前目录和其所有子目录的指定类型文件
+      # dir/*{.png,.jpg} : 查找当前目录的指定类型文件
+      # dir/*/*{.png,.jpg}: 查找当前目录的第1级子目录的指定类型文件
+      # dir/**/*{.png,.jpg}:  查找当前目录和其所有子目录的指定类型文件
       Dir.glob(["#{resource_dir}/**/*{#{pattern_file_types}}"]).each do |file|
         if is_legal_resource_file?(file)
           legal_image_file_array.push(file)
@@ -146,9 +200,9 @@ module Flr
     # 判断文件合法的标准参考 self.is_legal_resource_file? 方法
     #
     # === Examples
-    # resource_dir = "lib/assets/jsons"
-    # legal_text_file_array = ["lib/assets/jsons/city.json", "lib/assets/jsons/mock/city.json"]
-    # illegal_text_file_array = ["lib/assets/jsons/~.json"]
+    # resource_dir = "~/path/to/flutter_project/lib/assets/jsons"
+    # legal_text_file_array = ["~/path/to/flutter_project/lib/assets/jsons/city.json", "~/path/to/flutter_project/lib/assets/jsons/mock/city.json"]
+    # illegal_text_file_array = ["~/path/to/flutter_project/lib/assets/jsons/~.json"]
     #
     def self.find_text_files(resource_dir)
       legal_text_file_array = []
@@ -173,7 +227,8 @@ module Flr
     # 扫描指定的资源目录，返回其所有第一级子目录
     #
     # === Examples
-    # top_child_dir_array = ["lib/assets/fonts/Amiri", "lib/assets/fonts/Open_Sans"]
+    # resource_dir = "~/path/to/flutter_project/lib/assets/fonts"
+    # top_child_dir_array = ["~/path/to/flutter_project/lib/assets/fonts/Amiri", "~/path/to/flutter_project/lib/assets/fonts/Open_Sans"]
     #
     def self.find_top_child_dirs(resource_dir)
       top_child_dir_array = []
@@ -196,9 +251,9 @@ module Flr
     # 判断文件合法的标准参考 self.is_legal_resource_file? 方法
     #
     # === Examples
-    # font_family_dir = "lib/assets/fonts/Amiri"
-    # legal_font_file_array = ["lib/assets/fonts/Amiri/Amiri-Regular.ttf", "lib/assets/fonts/Amiri/Amiri-Bold.ttf"]
-    # illegal_font_file_array = ["lib/assets/fonts/Amiri/~.ttf"]
+    # font_family_dir = "~/path/to/flutter_project/lib/assets/fonts/Amiri"
+    # legal_font_file_array = ["~/path/to/flutter_project/lib/assets/fonts/Amiri/Amiri-Regular.ttf", "~/path/to/flutter_project/lib/assets/fonts/Amiri/Amiri-Bold.ttf"]
+    # illegal_font_file_array = ["~/path/to/flutter_project/lib/assets/fonts/Amiri/~.ttf"]
     #
     def self.find_font_files_in_font_family_dir(font_family_dir)
       legal_font_file_array = []

data/lib/flr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - York
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler