flr 1.0.0 → 3.2.0

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,89 +6,382 @@ 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
+
+    # 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
+    #
+    # === Examples
+    # flutter_project_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"
+    #
+    # === Example-4
+    # legal_resource_file = "~/path/to/flutter_r_demo/assets/images/test.png"
+    # main_asset = "assets/images/test.png"
+    #
+    # === Example-5
+    # legal_resource_file = "~/path/to/flutter_r_demo/assets/images/3.0x/test.png"
+    # main_asset = "assets/images/test.png"
+    #
+    def self.generate_main_asset(flutter_project_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
+      # to get main_relative_resource_file: lib/assets/images/test.png
+      flutter_project_dir_prefix = "#{flutter_project_dir}/"
+      main_relative_resource_file = main_resource_file
+      if main_relative_resource_file =~ /\A#{flutter_project_dir_prefix}/
+        main_relative_resource_file["#{flutter_project_dir_prefix}"] = ""
+      end
+
+      # 判断 main_relative_resource_file 是不是 implied_resource_file 类型
+      # implied_resource_file 的定义是：放置在 "lib/" 目录内 resource_file
+      # 具体实现是：main_relative_resource_file 的前缀若是 "lib/" ，则其是 implied_resource_file 类型；
+      #
+      # implied_relative_resource_file 生成 main_asset 的算法是： main_asset = "packages/#{package_name}/#{asset_name}"
+      # non-implied_relative_resource_file 生成 main_asset 的算法是： main_asset = "#{asset_name}"
+      #
+      lib_prefix = "lib/"
+      if main_relative_resource_file =~ /\A#{lib_prefix}/
+        # main_relative_resource_file: lib/assets/images/test.png
+        # to get asset_name: assets/images/test.png
+        asset_name = main_relative_resource_file
+        asset_name[lib_prefix] = ""
+
+        main_asset = "packages/#{package_name}/#{asset_name}"
+        return main_asset
+      else
+        # main_relative_resource_file: assets/images/test.png
+        # to get asset_name: assets/images/test.png
+        asset_name = main_relative_resource_file
+
+        main_asset = asset_name
+        return main_asset
+      end
+    end
+
+    # generate_image_assets(flutter_project_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_project_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_project_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_project_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_project_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_project_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_project_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_project_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_project_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_project_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_project_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_project_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
 
+    # 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/code_util.rb

@@ -5,6 +5,36 @@ module Flr
   # 代码生成相关的工具类方法
   class CodeUtil
 
+    @@should_support_nullsafety = nil
+
+    def self.should_support_nullsafety
+      if @@should_support_nullsafety != nil
+        return @@should_support_nullsafety
+      end
+
+      # $ flutter --version
+      # Flutter 1.12.13+hotfix.5 • channel stable • https://github.com/flutter/flutter.git
+      # Framework • revision 27321ebbad (5 weeks ago) • 2019-12-10 18:15:01 -0800
+      # Engine • revision 2994f7e1e6
+      # Tools • Dart 2.7.0
+      flutter_version_result = `flutter --version`
+      if (flutter_version_result.nil? == true || flutter_version_result.empty? == true)
+        @@should_support_nullsafety = false
+        return @@should_support_nullsafety
+      end
+
+      dart_version_str = flutter_version_result.split("Dart")[1]
+      dart_version_str.strip!
+
+      if Version.new(dart_version_str) >= Version.new("2.12.0")
+        @@should_support_nullsafety = true
+        return @@should_support_nullsafety
+      end
+
+      @@should_support_nullsafety = false
+      return @@should_support_nullsafety
+    end
+
     # generate_R_class(package_name) -> string
     #
     # 根据模板生成 R class 的代码
@@ -66,6 +96,58 @@ class R {
 /// - fileBasename：example.png
 /// - fileBasenameNoExtension：example
 /// - fileExtname：.png
+      CODE
+
+      if should_support_nullsafety
+        code += <<-CODE
+class AssetResource {
+  /// Creates an object to hold the asset resource’s metadata.
+  const AssetResource(this.assetName, {this.packageName});
+
+  /// The name of the main asset from the set of asset resources to choose from.
+  final String assetName;
+
+  /// The name of the package from which the asset resource is included.
+  final String? packageName;
+
+  /// The name used to generate the key to obtain the asset resource. For local assets
+  /// this is [assetName], and for assets from packages the [assetName] is
+  /// prefixed 'packages/<package_name>/'.
+  String get keyName => packageName == null ? assetName : "packages/$packageName/$assetName";
+
+  /// The file basename of the asset resource.
+  String get fileBasename {
+    final basename = path.basename(assetName);
+    return basename;
+  }
+
+  /// The no extension file basename of the asset resource.
+  String get fileBasenameNoExtension {
+    final basenameWithoutExtension = path.basenameWithoutExtension(assetName);
+    return basenameWithoutExtension;
+  }
+
+  /// The file extension name of the asset resource.
+  String get fileExtname {
+    final extension = path.extension(assetName);
+    return extension;
+  }
+
+  /// The directory path name of the asset resource.
+  String get fileDirname {
+    var dirname = assetName;
+    if (packageName != null) {
+      final packageStr = "packages/$packageName/";
+      dirname = dirname.replaceAll(packageStr, "");
+    }
+    final filenameStr = "$fileBasename/";
+    dirname = dirname.replaceAll(filenameStr, "");
+    return dirname;
+  }
+}
+        CODE
+      else
+        code += <<-CODE
 class AssetResource {
   /// Creates an object to hold the asset resource’s metadata.
   const AssetResource(this.assetName, {this.packageName}) : assert(assetName != null);
@@ -111,12 +193,13 @@ class AssetResource {
     return dirname;
   }
 }
-      CODE
+        CODE
+      end
 
       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 +209,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 +265,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
 
@@ -176,54 +293,105 @@ class AssetResource {
     # 为当前asset生成注释
     #
     # === Examples
-    # asset = "packages/flutter_r_demo/assets/images/test.png"
     # package_name = "flutter_r_demo"
+    #
+    # === Example-1
+    # asset = "packages/flutter_r_demo/assets/images/test.png"
+    # asset_comment = "asset: lib/assets/images/test.png"
+    #
+    # === Example-2
+    # asset = "assets/images/test.png"
     # asset_comment = "asset: assets/images/test.png"
     #
     def self.generate_asset_comment (asset, package_name)
+      packages_prefix = "packages/#{package_name}/"
+
+      if asset =~ /\A#{packages_prefix}/
+        # asset: packages/flutter_r_demo/assets/images/test.png
+        # to get assetName: assets/images/test.png
+        asset_name = asset.dup
+        asset_name[packages_prefix] = ""
+
+        asset_comment = "asset: lib/#{asset_name}"
+        return asset_comment
+      else
+        # asset: assets/images/test.png
+        # to get assetName: assets/images/test.png
+        asset_name = asset.dup
+
+        asset_comment = "asset: #{asset_name}"
+        return asset_comment
+      end
 
-      asset_name = asset.dup
-      asset_name["packages/#{package_name}/"] = ""
-
-      asset_comment = "asset: #{asset_name}"
-
-      return asset_comment
     end
 
-    # generate_AssetResource_property(asset, package_name, prior_asset_type) -> string
+    # generate_AssetResource_property(asset, asset_id_dict, package_name, is_package_project_type, prior_asset_type) -> string
     #
     # 为当前 asset 生成 AssetResource property 的代码
     #
-    def self.generate_AssetResource_property(asset, package_name, prior_asset_type = ".*")
-
-      asset_id = generate_asset_id(asset, prior_asset_type)
+    def self.generate_AssetResource_property(asset, asset_id_dict, package_name, is_package_project_type, prior_asset_type = ".*")
+      asset_id = asset_id_dict[asset]
       asset_comment = generate_asset_comment(asset, package_name)
 
-      asset_name = asset.dup
-      asset_name["packages/#{package_name}/"] = ""
+      asset_name = ""
+      needPackage = false
+
+      packages_prefix = "packages/#{package_name}/"
+      if asset =~ /\A#{packages_prefix}/
+        # asset: packages/flutter_r_demo/assets/images/test.png
+        # to get asset_name: assets/images/test.png
+        asset_name = asset.dup
+        asset_name[packages_prefix] = ""
+
+        needPackage = true
+      else
+        # asset: assets/images/test.png
+        # to get asset_name: assets/images/test.png
+        asset_name = asset.dup
+
+        if is_package_project_type
+          needPackage = true
+        else
+          needPackage = false
+        end
+
+      end
+
       # 对字符串中的 '$' 进行转义处理：'$' -> '\$'
+      # asset_name: assets/images/test$.png
+      # to get escaped_asset_name: assets/images/test\$.png
       escaped_asset_name = asset_name.gsub(/[$]/, "\\$")
 
-      code = <<-CODE
+      if needPackage
+        code = <<-CODE
   /// #{asset_comment}
   // ignore: non_constant_identifier_names
   final #{asset_id} = const AssetResource("#{escaped_asset_name}", packageName: R.package);
-      CODE
+        CODE
 
-      return code
+        return code
+      else
+        code = <<-CODE
+  /// #{asset_comment}
+  // ignore: non_constant_identifier_names
+  final #{asset_id} = const AssetResource("#{escaped_asset_name}", packageName: null);
+        CODE
+
+        return code
+      end
     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, is_package_project_type) -> 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, is_package_project_type)
 
       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, is_package_project_type, Flr::PRIOR_NON_SVG_IMAGE_FILE_TYPE)
         all_g_AssetResource_property_code += g_AssetResource_property_code
       end
 
@@ -238,17 +406,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, is_package_project_type) -> 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, is_package_project_type)
 
       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, is_package_project_type, Flr::PRIOR_SVG_IMAGE_FILE_TYPE)
         all_g_AssetResource_property_code += g_AssetResource_property_code
       end
 
@@ -263,17 +431,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, is_package_project_typ) -> 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, is_package_project_type)
 
       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, is_package_project_type, Flr::PRIOR_TEXT_FILE_TYPE)
         all_g_AssetResource_property_code += g_AssetResource_property_code
       end
 
@@ -288,18 +456,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,28 +495,39 @@ 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
+        if should_support_nullsafety
+          g_Asset_method_code = <<-CODE
+  /// #{asset_comment}
+  // ignore: non_constant_identifier_names
+  AssetSvg #{asset_id}({required double width, required double height}) {
+    final imageProvider = AssetSvg(asset.#{asset_id}.keyName, width: width, height: height);
+    return imageProvider;
+  }
+          CODE
+        else
+          g_Asset_method_code = <<-CODE
   /// #{asset_comment}
   // ignore: non_constant_identifier_names
   AssetSvg #{asset_id}({@required double width, @required double height}) {
     final imageProvider = AssetSvg(asset.#{asset_id}.keyName, width: width, height: height);
     return imageProvider;
   }
-        CODE
+          CODE
+        end
 
         all_g_Asset_method_code += g_Asset_method_code
       end
@@ -367,18 +546,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