fastlane-plugin-zhuixi_build_app 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21314eed70a4f3ef64d41643999a871250f86f45bdefd2d86f6a7f563f97936a
-  data.tar.gz: 629d4031ebefb1c51c8625da6dfc8d3b3189df8325ff8fa689353d3f624b5d4b
+  metadata.gz: 1ed82fabd117eb842bdfcbfb1418d0d418799c10227e34f9ca92f60471fc9ee2
+  data.tar.gz: f2a9685986d37b8b21f4cc23fa6d05d07ae76dc646bb6fa0c266ec7a7947265b
 SHA512:
-  metadata.gz: 167ea3c5647944f52b26a75fd2e50cb0e0c5418d96cb1c840a1c8476c7bae6de945684de335e50eb2476c6243dd044d167120cfca342d92ff0fa69874ea0c318
-  data.tar.gz: 9b89a5d6141f9bb52c81a9f4b0499b8c1dce71d06d83e1a03e3daa2c9fd261626e077cced30e00524fa53e7be465b6d979dc414774cc6f60a1754696d96b293e
+  metadata.gz: 0a05523cfe5087b00e9ef4adfa747f423820dde113cacbedb09d714b94c4193f9506fdbb0cd9cd6b3913023c67c5ef0bc82fd55e19bcc05eaa3c53f63215f5b7
+  data.tar.gz: 071d3dff11119c500f50cc149769bcc6adb981074273d23520f49b04fafbe15873609924bfa44c6f7b30da62c4324468c4d20f28f91bc0a6c5e862585e154e88

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

@@ -27,6 +27,7 @@ module Fastlane
 
         if response.code == "200"
           result = JSON.parse(response.body)
+          puts result
           if result["code"] == 200
             data = result["data"]
             lane_context[:configParams] = data["config"]

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

@@ -15,6 +15,8 @@ module Fastlane
         lane_context[:selectGameName] = app_file_config[:selectGameName]
         lane_context[:selectPlatformName] = app_file_config[:platform]
         lane_context[:ori_xcodeproj_path] = app_file_config[:ori_xcodeproj_path]
+        lane_context[:export_method] = app_file_config[:export_method]
+        lane_context[:provisioning_profile_name] = app_file_config[:provisioning_profile_name]
         UI.message("ZHUIXI---读取配置成功！app_file_path:\n#{app_file_path}")
         # 返回 account 和 password
         return { account: account, password: password }

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

@@ -89,6 +89,10 @@ module Fastlane
 
       def self.add_channel_sdk_resources()
 
+        # 设置DEBUG_INFORMATION_FORMAT
+        lane_context[:target].build_configuration_list.build_configurations.each do |config|
+          config.build_settings["DEBUG_INFORMATION_FORMAT"] = "dwarf"
+        end
         # 获取 Info.plist 文件的 Build Setting
         info_plist_build_setting = lane_context[:target].build_configuration_list.get_setting("INFOPLIST_FILE")
 
@@ -104,7 +108,9 @@ module Fastlane
 
         # 如果 info_plist_data 没有 LSApplicationQueriesSchemes 配置，先创建一个空数组
         info_plist_data["LSApplicationQueriesSchemes"] ||= []
-
+        # 修改 Bundle Identifier 和 Display Name
+        info_plist_data["CFBundleIdentifier"] = lane_context[:configParams]["gamePackageName"]
+        info_plist_data["CFBundleDisplayName"] = lane_context[:configParams]["gamename"]
         # 3. 读取 TempInfo.plist 文件
         temp_info_plist_data = Plist.parse_xml(File.join(lane_context[:zhuixi_path], "TempInfo.plist"))
 
@@ -156,21 +162,39 @@ module Fastlane
         add_channel_sdk_library()
       end
       # 是否在动态库集合
-      def self.isEmbedFramework(filename, setting)
-        embedArc = ["boRanSDK.framework", "NyBugly.framework", "XHYSDK.framework"]
+      def self.isEmbedFramework(filename)
+        framework_path = filename.to_s
+        framework_name = File.basename(framework_path, ".*") # 提取 .framework 文件的名称
+        if lane_context[:platform_id] == 59 && framework_name == "boRanSDK"
+          # 在 .framework 目录中搜索与文件名相同的文件
+          file_path = Dir.glob("#{framework_path}/#{framework_name}").first
+
+          if file_path.nil?
+            UI.error("File not found for #{framework_name}.")
+            return false
+          end
 
-        if !setting
-          temp_name = filename.to_s
-        else
-          temp_name = filename.display_name
-        end
-        if !setting and temp_name.end_with?(embedArc[0], embedArc[1], embedArc[2])
-          return true
-        elsif setting and embedArc.include?(temp_name)
-          return true
-        else
-          return false
+          # 使用 file 命令查看文件类型
+          file_output = sh("file #{file_path}")
+
+          # 检查文件类型中是否包含 "dynamic" 或 "shared"，表示动态库
+          is_dynamic_library = file_output.include?("dynamic") || file_output.include?("shared")
+
+          if is_dynamic_library
+            # 文件是动态库
+            # 执行相应的操作
+            # ...
+            puts "文件是动态库 #{framework_name}"
+            return true
+          else
+            # 文件是静态库
+            # 执行其他操作
+            # ...
+            puts "文件是静态库 #{framework_name}"
+            return false
+          end
         end
+        return false
       end
 
       def self.add_channel_sdk_library()
@@ -231,7 +255,7 @@ module Fastlane
             end
             #项目中可能有多个copy files build phases，找到刚刚创建的那个，然后把xx.framework引入
 
-            if !"".eql? lib_real_path and isEmbedFramework(filename, false)
+            if !"".eql? lib_real_path and isEmbedFramework(filename)
               lane_context[:target].copy_files_build_phases.each do |item|
                 if item.name == "Embed Frameworks"
                   #引入xx.framework
@@ -241,10 +265,8 @@ module Fastlane
                   item.dst_subfolder_spec = "10"
                   #勾上code sign on copy选项（默认是没勾上的）
                   item.files.each do |e|
-                    if isEmbedFramework(e, true)
-                      e.settings = Hash.new
-                      e.settings["ATTRIBUTES"] = ["CodeSignOnCopy", "RemoveHeadersOnCopy"]
-                    end
+                    e.settings = Hash.new
+                    e.settings["ATTRIBUTES"] = ["CodeSignOnCopy", "RemoveHeadersOnCopy"]
                   end
                 end
               end
@@ -299,22 +321,33 @@ module Fastlane
             schemefile = File.basename(new_schemefilepath, ".xcscheme")
           end
         end
-        lane_context[:project].save()
+        # 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")
         output_name = lane_context[:configParams]["gamename"] + "_" + lane_context[:platform_id].to_s + "_" + lane_context[:selectPlatformName] + "_" + timestamp
         other_action.gym(
           project: lane_context[:cha_project_path],
-          silent: true,
           output_name: output_name,
-          include_symbols: false,
+          export_method: lane_context[:export_method],
+          export_options: {
+            provisioningProfiles: {
+              lane_context[:configParams]["gamePackageName"] => lane_context[:provisioning_profile_name],
+            },
+          },
         )
       end
     end

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

@@ -14,6 +14,8 @@ 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
@@ -28,6 +30,11 @@ module Fastlane
                                        type: String),
         ]
       end
+
+      def self.obfuscate_code(source_directory)
+        # 在这里添加源码混淆的命令
+        sh("ruby-minify --source-dir #{source_directory}")
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module ZhuixiBuildApp
-    VERSION = "1.0.1"
+    VERSION = "1.0.4"
   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.1
+  version: 1.0.4
 platform: ruby
 authors:
 - RedSevenMale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler