flr 1.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edfe0b5dab4b4dda94c17168b8178f80a0903ccb989f498253dca53041b4d751
-  data.tar.gz: 9e83742e89792aeba9f52a0b68e793afa633c0bc84261a1deb3aff8741ed08c2
+  metadata.gz: 316ebc8040b9907879cfd70d48163feb0804aba01ee376b21a7cb2c3dfa84347
+  data.tar.gz: a45282c1106560d8d4b0c7acb35a0f221a2e0e3fe057977aa339d78f80af43f1
 SHA512:
-  metadata.gz: 722245bb8985fe6c2d29116d4cc8b3f8434a21aea05af0acbfcf6e2c62cf9ed1236a2ceea57c389a74f54b39c6f9699bddd631701bb45eff7d6e6a13a186c705
-  data.tar.gz: a8a4136d3e6146eca5f81488ae8adbb3a6307f2bbfa7d952ddebd8ed81f9358ed81d5b87cd652445676bfa47fbfd89305c483b0cccd5c1e6ebb9ee8ee7a079ca
+  metadata.gz: ff1cd35e4be19a8b82af8c27c996ab67e7d37106fd3fcc2f843ea04cb01d89a6b5a65c437308d16cf79d02c9d9b171e6e6d994393ccd05fbf2fdb735b7b9b2c4
+  data.tar.gz: be14c260f62e3421587569ec97f091278e98443474f3e074e7ccb1efcb6ee95d36c6293269c95c593472522859a88b487a43bac23bf77111b29d3f0200189b53

data/.gitignore

@@ -7,6 +7,7 @@
 .rbenv-version
 .rbx/
 /concatenated.*
+build/
 
 # Yardoc
 /.yardoc
@@ -36,4 +37,5 @@
 # Local Pubspec Tests
 pubspec.yaml
 pubspec.lock
-.packages
+.packages
+.dart_tool/

data/CHANGELOG.md

@@ -1,4 +1,41 @@
+## 3.2.0
+
+- Support for nullsafety-feature of Dart 2.12
+
+## 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
+
+   > - non-implied resource file:  the resource file which is outside of `lib/` directory, for example:
+   >    - `~/path/to/flutter_r_demo/assets/images/test.png` 
+   >    - `~/path/to/flutter_r_demo/assets/images/3.0x/test.png`
+   > - implied resource file:  the resource file which is inside of  `lib/` directory, for example:
+   >    - `~/path/to/flutter_r_demo/lib/assets/images/hot_foot_N.png` 
+   >    - `~/path/to/flutter_r_demo/lib/assets/images/3.0x/hot_foot_N.png`
+
+- New recommended flutter resource structure
+
+## 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
+- Add recommend-capability to display the recommended flutter resource structure
+
 ## 1.0.0
+
 - Support for processing font assets ( `.ttf`, `.otf`, `.ttc`) 
 - Improve robustness
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flr (1.0.0)
+    flr (3.2.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,10 +62,18 @@ 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
 
+    desc "recommend", "Display the recommended flutter resource structure"
+    long_desc <<-LONGDESC
+      Display the good flutter resource structure which is recommended by Flr.
+
+    LONGDESC
+    def recommend
+      Command.display_recommended_flutter_resource_structure
+    end
+
   end
 end

data/lib/flr/checker.rb

@@ -4,7 +4,7 @@ module Flr
   # 条件检测器，提供检测各种条件是否合法的方法
   class Checker
 
-    # check_pubspec_file_is_existed(flutter_dir)  ->  true
+    # check_pubspec_file_is_existed(flutter_project_dir)  ->  true
     #
     # 检测当前flutter工程目录是否存在pubspec.yaml文件
     # 若存在，返回true
@@ -12,16 +12,16 @@ module Flr
     #
     # === Examples
     #
-    # flutter_dir = "~/path/to/flutter_project/pubspec.yaml"
-    # Checker.check_pubspec_file_is_existed(flutter_dir)
+    # flutter_project_dir = "~path/to/flutter_r_demo"
+    # Checker.check_pubspec_file_is_existed(flutter_project_dir)
     #
-    def self.check_pubspec_file_is_existed(flutter_dir)
-      pubspec_file_path = flutter_dir + "/pubspec.yaml"
+    def self.check_pubspec_file_is_existed(flutter_project_dir)
+      pubspec_file_path = flutter_project_dir + "/pubspec.yaml"
 
       if File.exist?(pubspec_file_path) == false
         message = <<-MESSAGE
 #{"[x]: #{pubspec_file_path} not found".error_style}
-#{"[*]: please make sure pubspec.yaml is existed in #{flutter_dir}".tips_style}
+#{"[*]: please make sure pubspec.yaml is existed in #{flutter_project_dir}".tips_style}
         MESSAGE
 
         raise(message)
@@ -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_project_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_project_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_project_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_project_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_project_dir + "/" + relative_resource_dir
         if File.exist?(resource_dir) == true
           fonts_legal_resource_dir_array.push(resource_dir)
         else

data/lib/flr/command.rb

@@ -27,12 +27,118 @@ module Flr
     # Listen Class Instance
     @@listener = nil
 
-    # show the version of flr
+    # display the version of flr
     def self.version
       version_desc = "Flr version #{Flr::VERSION}\nCoreLogic version #{Flr::CORE_VERSION}"
       puts(version_desc)
     end
 
+    # display recommended flutter resource structure
+    def self.display_recommended_flutter_resource_structure
+      message = <<-MESSAGE
+Flr recommends the following flutter resource structure schemes:
+
+#{"------------------------------ scheme 1 ------------------------------".bold.bg_red}
+
+  flutter_project_root_dir
+  ├── build
+  │   ├── ..
+  ├── lib
+  │   ├── assets
+  │   │   ├── 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
+  │   │   │   │   ├── 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 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 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/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}
+
+#{"------------------------------ scheme 2 ------------------------------".bold.bg_red}
+
+  flutter_project_root_dir
+  ├── build
+  │   ├── ..
+  ├── lib
+  │   ├── ..
+  ├── assets
+  │   ├── 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
+  │   │   │   ├── 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 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 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}
+      #{"- assets/images".tips_style}
+      #{"- assets/texts".tips_style}
+    #{"# config the font resource directories that need to be scanned".tips_style}
+    #{"fonts:".tips_style}
+      #{"- assets/fonts".tips_style}
+      MESSAGE
+
+      puts(message)
+    end
+
     # get the right version of r_dart_library package based on flutter's version
     # to get more detail, see https://github.com/YK-Unit/r_dart_library#dependency-relationship-table
     def self.get_r_dart_library_version
@@ -48,48 +154,115 @@ module Flr
         return r_dart_library_version
       end
 
-      version_with_hotfix_str = flutter_version_result.split(" ")[1]
-      version_without_hotfix_str = version_with_hotfix_str.split("+")[0]
+      flutter_version_with_hotfix_str = flutter_version_result.split(" ")[1]
+      flutter_version_without_hotfix_str = flutter_version_with_hotfix_str.split("+")[0]
+
+      dart_version_str = flutter_version_result.split("Dart")[1]
+      dart_version_str.strip!
 
-      if Version.new(version_with_hotfix_str) >= Version.new("1.10.15")
+      puts("the flutter development environment is:")
+      puts("  - Flutter SDK Version: #{flutter_version_with_hotfix_str}")
+      puts("  - Dart SDK Version: #{dart_version_str}")
+
+      if Version.new(flutter_version_with_hotfix_str) >= Version.new("1.10.15")
         r_dart_library_version = "0.2.1"
+        if Version.new(dart_version_str) >= Version.new("2.12.0")
+          r_dart_library_version = "0.4.0-nullsafety.0"
+        end
       end
 
       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
+      # ----- 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
       #
 
       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
@@ -99,7 +272,33 @@ module Flr
       #  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）的依赖声明
@@ -108,14 +307,10 @@ module Flr
       #
       # r_dart_library的依赖声明：
       # ```yaml
-      # r_dart_library:
-      #  git:
-      #    url: "https://github.com/YK-Unit/r_dart_library.git"
-      #    ref: 0.1.1
+      # r_dart_library: 0.1.1
       # ```
       r_dart_library_version = get_r_dart_library_version
-      r_dart_library_config = Hash["git" => Hash["url" => "https://github.com/YK-Unit/r_dart_library.git", "ref" => r_dart_library_version]]
-      dependencies_config["r_dart_library"] = r_dart_library_config
+      dependencies_config["r_dart_library"] = r_dart_library_version
       pubspec_config["dependencies"] = dependencies_config
 
       puts("add flr configuration into pubspec.yaml done!")
@@ -130,6 +325,9 @@ module Flr
       #
 
       flutter_config = pubspec_config["flutter"]
+      if flutter_config.nil?
+        flutter_config = {}
+      end
 
       flutter_assets = flutter_config["assets"]
       should_rm_flutter_assets_Key = true
@@ -156,25 +354,67 @@ module Flr
       # 保存 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
+
+    def self.generate_all
+      flutter_main_project_root_dir = FileUtil.get_flutter_main_project_root_dir
+
+      # ----- 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-1 End -----
+
+      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("")
+      generate_one(flutter_main_project_root_dir)
+
+      flutter_sub_project_root_dir_array.each do |flutter_project_root_dir|
+        puts("")
+        generate_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 dependency \"r_dart_library\" done !!!")
-
-      # ----- Step-4 End -----
+      puts("[√]: get dependencies for all flutter projects done !!!")
 
-      puts("[√]: init done !!!")
+      # ----- Step-3 End -----
+      puts("")
+      puts("[√]: generate for all flutter projects done !!!")
     end
 
-    # 扫描资源目录，自动为资源添加声明到 pubspec.yaml 和生成 r.g.dart
-    def self.generate
-
-      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 = []
@@ -190,7 +430,7 @@ module Flr
       begin
         Checker.check_pubspec_file_is_existed(flutter_project_root_dir)
 
-        pubspec_file_path = FileUtil.get_pubspec_file_path
+        pubspec_file_path = FileUtil.get_pubspec_file_path(flutter_project_root_dir)
 
         pubspec_config = FileUtil.load_pubspec_config_from_file(pubspec_file_path)
 
@@ -198,20 +438,26 @@ module Flr
 
         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)
+        puts("[x]: generate for #{flutter_project_root_dir} failed".error_style)
+        puts("--------------------------------------------------------------------------------------")
         return
       end
 
+      is_package_project_type = FileUtil.is_package_project_type?(flutter_project_root_dir)
       package_name = pubspec_config["name"]
 
       # ----- Step-1 End -----
 
       # ----- Step-2 Begin -----
       # 进行核心逻辑版本检测：
-      # 检测Flr配置中的核心逻辑版本号和当前工具的核心逻辑版本号是否一致；若不一致，则生成“核心逻辑版本不一致”的警告日志，存放到警告日志数组
+      # 检测flr_config中的core_version和当前工具的core_version是否一致；若不一致，则按照以下规则处理：
+      #  - 更新flr_config中的core_version的值为当前工具的core_version；
+      #  - 生成“核心逻辑版本不一致”的警告日志，存放到警告日志数组。
+      #
 
       flr_core_version = flr_config["core_version"]
 
@@ -220,9 +466,13 @@ module Flr
       end
 
       if flr_core_version != Flr::CORE_VERSION
+        flr_config["core_version"] = Flr::CORE_VERSION
+
         message = <<-MESSAGE
-#{"[!]: warning, the core logic version of the configured Flr tool is #{flr_core_version}, while the core logic 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}
+#{"[!]: 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
 
         warning_messages.push(message)
@@ -257,16 +507,18 @@ module Flr
       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 = []
@@ -278,13 +530,28 @@ module Flr
 
         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 -----
@@ -309,7 +576,7 @@ module Flr
 
         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
 
@@ -353,7 +620,7 @@ module Flr
             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]
@@ -389,23 +656,36 @@ module Flr
 
       # ----- 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 -----
@@ -413,26 +693,31 @@ module Flr
       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 -----
 
@@ -471,7 +756,7 @@ module Flr
       #
 
       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, is_package_project_type)
       r_dart_file.puts(g__R_Image_AssetResource_class_code)
 
       # ----- Step-13 End -----
@@ -481,7 +766,7 @@ module Flr
       #
 
       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, is_package_project_type)
       r_dart_file.puts(g__R_Svg_AssetResource_class_code)
 
       # ----- Step-14 End -----
@@ -491,7 +776,7 @@ module Flr
       #
 
       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, is_package_project_type)
       r_dart_file.puts(g__R_Text_AssetResource_class_code)
 
       # ----- Step-15 End -----
@@ -502,7 +787,7 @@ module Flr
       #
 
       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 -----
@@ -512,7 +797,7 @@ module Flr
       #
 
       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 -----
@@ -522,7 +807,7 @@ module Flr
       #
 
       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 -----
@@ -566,19 +851,6 @@ module Flr
       # ----- 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 -----
       # 判断警告日志数组是否为空，若不为空，输出所有警告日志
       #
 
@@ -589,87 +861,125 @@ module Flr
         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
-
-        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(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
@@ -686,7 +996,7 @@ module Flr
           puts("  - #{resource_dir}".warning_style)
         end
       end
-      puts("---------------------------------------------------------------------------------")
+      puts("--------------------------------------------------------------------------------------")
       puts("\n")
 
       # Allow array of directories as input #92
@@ -694,16 +1004,16 @@ module Flr
       @@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)