fastlane-plugin-zhuixi_build_app 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a786dd65817d36b83f169b33f472a9bdac63ec885089d589d08340fbd2466f8
-  data.tar.gz: ba724d3d1e71d302f95215f9d83931b41f6a250c04e39aac49ac7637aeb64b94
+  metadata.gz: fad17718d37d5da627587c4f30db77319e462e117c4d7b6adda774f968a1a155
+  data.tar.gz: aca9ce718068c91998b268dc0492f184b4fbe5cdd42baae3e963b836d1ce4bd2
 SHA512:
-  metadata.gz: 1c3b280d54cec8742a626a78a10e52738bd023368109734054281372477ce3b51c7965461aebef303b24ac595bbc328742f6a3edfe4805493f18c210d6485adc
-  data.tar.gz: 460e93533173ec11e9dce116543fd872c8d8cf4a4ecb8fc57f76318669d04135d5c1888fa555d649aaa24ba475b7a31551ddb3b3812c4c4a0852f331e5f481a2
+  metadata.gz: aa066d37d2be2e5b9c077d693b093463f99c66e9e0b678d4a34b9a24923a3c25e5184d148eb069499c61f0d59297f92fd9072fc2358c7832d152070fd5778aca
+  data.tar.gz: 18a1d97b4b6ac191f791a73a9f41e90c22cf03ab705b5579b60e743d1e4ee8b4bb62d837b8a80e56130ee3094094f27f3547bdf29da550d044cd6e7b8b134ce5

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

@@ -20,20 +20,23 @@ module Fastlane
           "platform_id" => lane_context[:platform_id],
           "game_id" => game_id,
         })
-
         response = Net::HTTP.start(uri.hostname, uri.port) do |http|
+          puts request.body
           http.request(request)
         end
 
         if response.code == "200"
           result = JSON.parse(response.body)
-          puts result
           if result["code"] == 200
             data = result["data"]
             lane_context[:configParams] = data["config"]
             resourcesUrl = data["resources_url"]
             return resourcesUrl.to_s
+          else
+            puts "获取打包配置失败:\n#{result}"
           end
+        else
+          puts "获取打包配置失败:HTTP\n #{response}"
         end
       end
 

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

@@ -210,42 +210,52 @@ module Fastlane
           File.open(vconfig_json, "w") do |f|
             f.puts JSON.pretty_generate(json)
           end
+        elsif lane_context[:selectPlatformName] == "奇界"
+          other_action.update_plist(
+            plist_path: lane_context[:zhuixi_path] + "/resources/SDKs/BRSDK.plist",
+            block: proc do |plist|
+              plist["direction"] = lane_context[:configParams][:channel_orientation.to_s] == "landscape" ? "2" : "1"
+            end,
+          )
+        elsif lane_context[:selectPlatformName] == "527"
+          other_action.update_plist(
+            plist_path: lane_context[:zhuixi_path] + "/resources/SDKs/QnAggSdkRes.bundle/Params.plist",
+            block: proc do |plist|
+              plist["appID"] = lane_context[:configParams][:channel_appid.to_s]
+              plist["appKey"] = lane_context[:configParams][:channel_appkey.to_s]
+            end,
+          )
         end
       end
-
       # 是否在动态库集合
       def self.isEmbedFramework(filename)
         framework_path = filename.to_s
         framework_name = File.basename(framework_path, ".*") # 提取 .framework 文件的名称
-        platform_id = [59, 61, 62]
-        if platform_id.include?(lane_context[:platform_id])
-          # 在 .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
+        # 在 .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
 
-          # 使用 file 命令查看文件类型
-          file_output = sh("file #{file_path}")
+        # 使用 file 命令查看文件类型
+        file_output = sh("file #{file_path}")
 
-          # 检查文件类型中是否包含 "dynamic" 或 "shared"，表示动态库
-          is_dynamic_library = file_output.include?("dynamic") || file_output.include?("shared")
+        # 检查文件类型中是否包含 "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
+        if is_dynamic_library
+          # 文件是动态库
+          # 执行相应的操作
+          # ...
+          puts "文件是动态库 #{framework_name}"
+          return true
+        else
+          # 文件是静态库
+          # 执行其他操作
+          # ...
+          puts "文件是静态库 #{framework_name}"
+          return false
         end
         return false
       end
@@ -310,20 +320,30 @@ module Fastlane
             #项目中可能有多个copy files build phases，找到刚刚创建的那个，然后把xx.framework引入
 
             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
-                  item.add_file_reference(file_ref)
-                  #设置copy file buldphase中的Destination选项，使用枚举值表示的。"10"表示Frameworks
-                  #这个值我是通过对比设置前后的两个文件找出来的
-                  item.dst_subfolder_spec = "10"
-                  #勾上code sign on copy选项（默认是没勾上的）
-                  item.files.each do |e|
-                    e.settings = Hash.new
-                    e.settings["ATTRIBUTES"] = ["CodeSignOnCopy", "RemoveHeadersOnCopy"]
+              has_embed_frameworks = false
+              lane_context[:target].copy_files_build_phases.each do |phase|
+                if phase.name == "Embed Frameworks"
+                  has_embed_frameworks = true
+
+                  phase.add_file_reference(file_ref)
+                  phase.dst_subfolder_spec = "10"
+
+                  phase.files.each do |file|
+                    file.settings = { "ATTRIBUTES" => ["CodeSignOnCopy", "RemoveHeadersOnCopy"] }
                   end
                 end
               end
+
+              unless has_embed_frameworks
+                embed_phase = lane_context[:target].new_copy_files_build_phase("Embed Frameworks")
+                embed_phase.dst_subfolder_spec = "10"
+
+                embed_phase.add_file_reference(file_ref)
+
+                embed_phase.files.each do |file|
+                  file.settings = { "ATTRIBUTES" => ["CodeSignOnCopy", "RemoveHeadersOnCopy"] }
+                end
+              end
             end
             lane_context[:target].frameworks_build_phase.add_file_reference(file_ref, true)
           elsif filename.to_s.end_with?(".plist", ".bundle", ".png", ".storyboard", ".json")

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

@@ -1,5 +1,5 @@
 module Fastlane
   module ZhuixiBuildApp
-    VERSION = "1.1.6"
+    VERSION = "1.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-zhuixi_build_app
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - RedSevenMale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler