fastlane-plugin-zhuixi_build_app 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f642b9d438e5188b35f0dac96c00f7bae915df38c3dea2557fdc756d39b86ad3
-  data.tar.gz: 0b68e9d63611c6952aef0fa4e05d2abd786765d75c260329620dbbbc17b1e634
+  metadata.gz: e0f34b6bcfccf78451954690a761669d3be0715cfd2bab6789c4887a61362436
+  data.tar.gz: 934901b3247745591c0c8338df2b232a266fe3793992a5577431413930a48535
 SHA512:
-  metadata.gz: 12ee114b51e73ea8e3180c02676c73ad99217428c3f27cbe6fe763762d2155ba6a9f20bfcaae3f02af2ccf99ee3c1b7ecbde98280582a71f222a9973bcd80e2f
-  data.tar.gz: 91c85c902962c0d0189403f195f1a796fd5c57208258593bed887876d55def9120261f41fe4a8697781c4f79843ed1b8bec0a26fa8fb0c96a2f72b704004ed03
+  metadata.gz: 85b9e8e2e0af33e25cd886c1180babbaa525421717d0b1bc2e815ece3b2ae8b189198ad52deca8329067a18671d3df78fd37a7dccf313cdaaa7b073aae434644
+  data.tar.gz: fa32530a18643952328dd317b49c35af414f94b27231df770880ef6cda23a216b3e837d7a60fa12378c630455d39e9d9641d02eb83debab026c12da063480daf

data/lib/fastlane/plugin/zhuixi_build_app/actions/download_resources_action.rb

@@ -5,21 +5,25 @@ module Fastlane
   module Actions
     class DownloadResourcesAction < BaseAction
       def self.run(params)
-        #下载渠道资源
-        download_resource(params[:resourcesUrl])
-      end
-
-      def self.download_resource(resourcesUrl)
 
         #创建zhuixi
         parent_path = File.dirname(lane_context[:ori_xcodeproj_path])
         lane_context[:zhuixi_path] = File.join(parent_path, "zhuixi", lane_context[:platform_id].to_s)
-
+        channel_resources_folder = File.join(lane_context[:zhuixi_path], "resources")
+        filepath = File.join(channel_resources_folder, "ConfigInfo.plist")
         if File.exist?(lane_context[:zhuixi_path].to_s)
+          return
           FileUtils.rm_rf(lane_context[:zhuixi_path])
+          # if get_info_plist_value(path: filepath, key: "channelVersion")
+          # end
+          FileUtils.mkdir_p(lane_context[:zhuixi_path])
         end
-        FileUtils.mkdir_p(lane_context[:zhuixi_path])
+        #下载渠道资源
+        download_resource(params[:resourcesUrl], parent_path)
+      end
 
+      def self.download_resource(resourcesUrl, parent_path)
+        FileUtils.mkdir_p(lane_context[:zhuixi_path])
         # 下载资源包到root_folder下
         destination_path = File.join(parent_path, "resource.zip")
         File.open(destination_path, "wb") do |file|

data/lib/fastlane/plugin/zhuixi_build_app/actions/xcodeproj_merge_action.rb

@@ -1,5 +1,7 @@
 require "fastlane/action"
 require_relative "../actions/base_action"
+require_relative "../helper/zhuixi_build_app_helper"
+require "mini_magick"
 
 module Fastlane
   module Actions
@@ -15,7 +17,7 @@ module Fastlane
         lane_context[:group] = lane_context[:project].main_group.find_subpath(File.join("zhuixi"), true)
         lane_context[:group].set_source_tree("SOURCE_ROOT") # 把group的source_tree设置成 'SOURCE_ROOT'
         getDesgroup(lane_context[:project].main_group)
-        FileUtils.rm_rf(Dir.glob(File.join(lane_context[:cha_resources_path], "*")))
+        # FileUtils.rm_rf(Dir.glob(File.join(lane_context[:cha_resources_path], "*")))
         add_channel_sdk_resources()
       end
 
@@ -31,6 +33,7 @@ module Fastlane
         Dir::mkdir(lane_context[:cha_project_path], mode = 0777)
         Dir.glob(File.join(lane_context[:ori_xcodeproj_path], "*")) do |file|
           unless File.basename(file) == "xcshareddata"
+            # 检查是否在 Copy Bundle Resources 目录中
             dest = File.join(lane_context[:cha_project_path], File.basename(file))
             FileUtils.cp_r(file, dest)
           end
@@ -80,6 +83,13 @@ module Fastlane
           if group.display_name == "resources"
             lane_context[:cha_resources_path] = group.real_path
             removeBuildPhaseFilesRecursively(group)
+
+            relative_path = group.real_path.to_s.sub(lane_context[:project].project_dir.to_s, "")
+            puts "ZHUIXI---relative_path: #{relative_path}"
+            # 调用
+            clean_search_paths("FRAMEWORK_SEARCH_PATHS", relative_path)
+            clean_search_paths("LIBRARY_SEARCH_PATHS", relative_path)
+            clean_search_paths("HEADER_SEARCH_PATHS", relative_path)
             group.clear
           else
             getDesgroup(group)
@@ -87,6 +97,24 @@ module Fastlane
         end
       end
 
+      # 封装通用处理逻辑
+      def self.clean_search_paths(setting_name, relative_path)
+        search_paths = lane_context[:target].build_configuration_list.get_setting(setting_name)
+
+        search_paths.each do |config, paths|
+          if paths.is_a?(String)
+            paths = [paths]
+          end
+
+          paths.delete_if { |path| path.include?(relative_path) }
+
+          # 保存设置
+          lane_context[:target].build_configuration_list.set_setting(setting_name, paths)
+
+          puts "Cleaned #{setting_name}: #{paths}"
+        end
+      end
+
       def self.add_channel_sdk_resources()
 
         # 设置DEBUG_INFORMATION_FORMAT
@@ -111,6 +139,7 @@ module Fastlane
         # 修改 Bundle Identifier 和 Display Name
         info_plist_data["CFBundleIdentifier"] = lane_context[:configParams]["gamePackageName"]
         info_plist_data["CFBundleDisplayName"] = lane_context[:configParams]["gamename"]
+        info_plist_data["UILaunchStoryboardName"] = "LaunchScreen"
         # 3. 读取 TempInfo.plist 文件
         temp_info_plist_data = Plist.parse_xml(File.join(lane_context[:zhuixi_path], "TempInfo.plist"))
 
@@ -202,25 +231,26 @@ module Fastlane
 
       def self.add_channel_sdk_library()
         channel_resources_folder = File.join(lane_context[:zhuixi_path], "resources")
-        # 获取需要的通道build settings
-        search_paths = lane_context[:target].build_configuration_list.get_setting("FRAMEWORK_SEARCH_PATHS")
-        library_search_paths = lane_context[:target].build_configuration_list.get_setting("LIBRARY_SEARCH_PATHS")
+        add_channel_badge(channel_resources_folder)
 
         merge_nygameinfo()
+        lane_context[:project].save
         getAllRes(channel_resources_folder)
-
         build_app_action()
       end
+
       # 查询所有文件
       def self.getAllRes(rootDir)
-        isfile = rootDir.to_s.end_with?(".framework", ".bundle")
+        isfile = rootDir.to_s.end_with?(".framework", ".bundle", ".png", ".storyboard")
+        launchimage_path = lane_context[:configParams]["channel_orientation"] == "portrait" ? "launchimage-landscape" : "launchimage-portrait"
         if File.directory?(rootDir) and !isfile
           Dir.foreach(rootDir) do |filepath|
-            if filepath != "." and filepath != ".." and filepath != ".DS_Store"
+            if filepath != "." and filepath != ".." and filepath != ".DS_Store" and filepath != launchimage_path
               getAllRes(rootDir + "/" + filepath)
             end
           end
         else
+          puts "ZHUIXI---文件路径:\n" + rootDir
           addFileToTarget(rootDir)
         end
       end
@@ -275,7 +305,7 @@ module Fastlane
               end
             end
             lane_context[:target].frameworks_build_phase.add_file_reference(file_ref, true)
-          elsif filename.to_s.end_with?(".plist", ".bundle")
+          elsif filename.to_s.end_with?(".plist", ".bundle", ".png", ".storyboard")
             lane_context[:target].resources_build_phase.add_file_reference(file_ref, true)
           elsif filename.to_s.end_with?(".m", ".mm", ".cpp")
             lane_context[:target].source_build_phase.add_file_reference(file_ref, true)
@@ -288,6 +318,8 @@ module Fastlane
       def self.merge_nygameinfo()
         channel_resources_folder = File.join(lane_context[:zhuixi_path], "resources")
         filepath = File.join(channel_resources_folder, "nygameinfo.plist")
+        # channel_storyboard_path = File.join(channel_resources_folder, "LaunchScreen.storyboard")
+        # Fastlane::Helper::ZhuixiBuildAppHelper.clean_storyboard_cache(channel_storyboard_path, lane_context[:selectPlatformName])
 
         puts lane_context[:configParams]
         other_action.update_plist(
@@ -314,6 +346,70 @@ module Fastlane
         )
       end
 
+      def self.add_channel_badge(folder_path)
+        xcassets_ref = nil
+        storyboard_ref = nil
+        appiconset_path = nil
+        channel_icon_path = nil
+        launch_image = nil
+        lane_context[:target].resources_build_phase.files.each do |item|
+          if item.file_ref.path.end_with?(".xcassets")
+            appiconset_path = File.join(item.file_ref.real_path.to_s)
+            puts "ZHUIXI---appiconset_path: #{appiconset_path}"
+            FileUtils.cp_r(appiconset_path, File.join(lane_context[:zhuixi_path]))
+            channel_icon_path = File.join(lane_context[:zhuixi_path], File.basename(appiconset_path))
+            xcassets_ref = item.file_ref
+          end
+          if item.file_ref.path.end_with?(".storyboard")
+            launch_screen_path = File.join(item.file_ref.real_path.to_s)
+            puts "ZHUIXI---launch_screen_path: #{launch_screen_path}"
+            storyboard_ref = item.file_ref
+          end
+          if item.file_ref.path.include?("LaunchImage.png")
+            puts "ZHUIXI---LaunchImage: #{item.file_ref.path}"
+            launch_image = item.file_ref
+          end
+        end
+        isLaunchImageIncluded = false
+        subfolders = Dir.glob("#{folder_path}/*").select { |f|
+          File.directory?(f)
+        }
+        is_launch_image_folder = subfolders.any? { |f|
+          if f.include?("launchimage")
+            isLaunchImageIncluded = true
+          end
+        }
+
+        # Fastlane::Helper::ZhuixiBuildAppHelper.clean_storyboard_cache(storyboard_ref.real_path.to_s, lane_context[:selectPlatformName])
+
+        lane_context[:target].resources_build_phase.remove_file_reference(xcassets_ref) if xcassets_ref
+        lane_context[:target].resources_build_phase.remove_file_reference(storyboard_ref) if storyboard_ref && isLaunchImageIncluded
+        lane_context[:target].resources_build_phase.remove_file_reference(launch_image) if launch_image && isLaunchImageIncluded
+        # 删除文件引用对应的文件
+        # xcassets_ref.remove_from_project if xcassets_ref
+        storyboard_ref.remove_from_project if storyboard_ref && isLaunchImageIncluded
+        launch_image.remove_from_project if launch_image && isLaunchImageIncluded
+
+        channel_icon_ref = lane_context[:group].new_file(channel_icon_path)
+        lane_context[:target].resources_build_phase.add_file_reference(channel_icon_ref) if channel_icon_ref
+
+        badge_path = Fastlane::Helper::ZhuixiBuildAppHelper.get_badge_path(lane_context[:selectPlatformName])
+        puts "ZHUIXI---角标路径:\n" + badge_path
+        badge = MiniMagick::Image.open(badge_path)
+        Dir.glob("#{channel_icon_path}/**/*.png").each do |image_path|
+          puts "image_path: #{image_path}"
+          image = MiniMagick::Image.open(image_path)
+          height = image.height
+          width = image.width
+          result = image.composite(badge) do |c|
+            c.compose "Over"
+            c.gravity "SouthEast"
+            c.resize "#{width}x#{height}" # 调整为原图大小
+          end
+          result.write(image_path)
+        end
+      end
+
       def self.build_app_action()
         other_action.recreate_schemes(project: lane_context[:cha_project_path])
         schemefile = ""
@@ -324,20 +420,7 @@ module Fastlane
             schemefile = File.basename(new_schemefilepath, ".xcscheme")
           end
         end
-        # lane_context[:project].save()
-        # Find.find(File.join(lane_context[:cha_project_path], "xcuserdata")) do |schemefilepath|
-        #   if schemefilepath.include? ".xcscheme"
-        #     schemefile = schemefilepath
-        #   end
-        # end
-        # 执行 fastlane gym
-        # other_action.update_plist( # Updates the CLIENT_ID and GOOGLE_APP_ID string entries in the plist-file
-        #   plist_path: File.join(lane_context[:zhuixi_path], "Info.plist"),
-        #   block: proc do |plist|
-        #     plist["CFBundleDisplayName"] = lane_context[:configParams]["gamename"]
-        #     plist["CFBundleIdentifier"] = lane_context[:configParams]["gamePackageName"]
-        #   end,
-        # )
+
         lane_context[:project].save()
         puts lane_context[:configParams]
         timestamp = Time.now.strftime("%Y%m%d%H%M%S")
@@ -346,6 +429,8 @@ module Fastlane
           project: lane_context[:cha_project_path],
           output_name: output_name,
           export_method: lane_context[:export_method],
+          # clean: true,
+          silent: true,
           export_options: {
             provisioningProfiles: {
               lane_context[:configParams]["gamePackageName"] => lane_context[:provisioning_profile_name],

data/lib/fastlane/plugin/zhuixi_build_app/actions/zhuixi_build_app_action.rb

@@ -14,8 +14,6 @@ module Fastlane
         resourcesUrl = other_action.get_pack_config(game_id: game_id.to_s)
         other_action.download_resources(resourcesUrl: resourcesUrl)
         other_action.xcodeproj_merge
-        current_directory = Dir.pwd
-        puts "当前工作目录：#{current_directory}"
       end
       def self.return_value
         # If your method provides a return value, you can describe here what it does

data/lib/fastlane/plugin/zhuixi_build_app/helper/zhuixi_build_app_helper.rb

@@ -1,4 +1,4 @@
-require 'fastlane_core/ui/ui'
+require "fastlane_core/ui/ui"
 
 module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
@@ -11,6 +11,21 @@ module Fastlane
       def self.show_message
         UI.message("Hello from the zhuixi_build_app plugin helper!")
       end
+      # 返回对应渠道的角标图片路径
+      def self.get_badge_path(channel)
+        root_path = Dir.pwd
+        File.join(root_path, "resources", "#{channel}_badge.png")
+      end
+
+      def self.clean_storyboard_cache(channel_storyboard_path, channel)
+        if File.exists?(channel_storyboard_path)
+          str = File.read(channel_storyboard_path)
+          File.write(channel_storyboard_path, str + "<!-- Channel: " + channel + " -->")
+          puts "LaunchScreen.storyboard file 已修改!"
+        else
+          puts "LaunchScreen.storyboard file not found!"
+        end
+      end
     end
   end
 end

data/lib/fastlane/plugin/zhuixi_build_app/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module ZhuixiBuildApp
-    VERSION = "1.0.7"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-zhuixi_build_app
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - RedSevenMale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler