fastlane-plugin-zhuixi_build_app 1.0.2 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fe2a794f18890b8fee8f284b2f82f6be269c081344d7b8a9dbefcca4f972a78
-  data.tar.gz: f0f5896d4e538b9ddf31b65eea1af660c85c59b89196ecbcdbaaf272eff48f3e
+  metadata.gz: 75d72ab6ff7891ce8c66de90fd0ec51ba2ad3b4d5972386cf17273e1e027d1e1
+  data.tar.gz: c9335d5f0abf8b0774cf2babae44c69f19912a97b8b303c071ee86d6d42bcf01
 SHA512:
-  metadata.gz: 2daaf3a7c685c50e2ed8cbb08c74f15fe399a732dfb63e119c8af5ef36f3c00e31927a9fb06fac2d8b115b3dd790bb69bf81f4cb3ee1949220f20fb891443e7b
-  data.tar.gz: 79507ad983ab650ae583dc1f4f93cc2d6e5d1f3813fb43a6df9261bf63dfc3fa9406b0d81ebc81456e332acc18525de380162727e4ca1af3c07a5c075727b920
+  metadata.gz: b7452f8f39189e844ec28f367ce0caae3bad2cca4e605073f942651f61e6b24819705aa2dab631ae6e254ad3fb54a76844f78c64bfd4fa212f7eb08a43dc4b29
+  data.tar.gz: 02ba6a04716fe7b0eb0c9c0cc97db85e11d5d3effc1a8dd081e8a9daaa2e035cf128bab765ccce1ba7564274360c2a7b00a4387f5856c81f4f3ad7f8b7313f36

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

@@ -108,15 +108,20 @@ 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"))
 
-        # 添加 TempInfo.plist 中不存在的 LSApplicationQueriesSchemes 配置到 info.plist 文件
-        temp_info_plist_data["LSApplicationQueriesSchemes"].each do |scheme|
-          info_plist_data["LSApplicationQueriesSchemes"] << scheme unless info_plist_data["LSApplicationQueriesSchemes"].include?(scheme)
-        end
+        # # 添加 TempInfo.plist 中不存在的 LSApplicationQueriesSchemes 配置到 info.plist 文件
+        # temp_info_plist_data["LSApplicationQueriesSchemes"].each do |scheme|
+        #   info_plist_data["LSApplicationQueriesSchemes"] << scheme unless info_plist_data["LSApplicationQueriesSchemes"].include?(scheme)
+        # end
 
+        temp_info_plist_data.each do |key, value|
+          info_plist_data[key] = value
+        end
         # 5. 写入 info.plist 文件
         File.write(info_plist_absolute_path, info_plist_data.to_plist)
 
@@ -160,21 +165,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()
@@ -235,7 +258,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
@@ -245,10 +268,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
@@ -303,22 +324,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/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module ZhuixiBuildApp
-    VERSION = "1.0.2"
+    VERSION = "1.0.6"
   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.2
+  version: 1.0.6
 platform: ruby
 authors:
 - RedSevenMale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,7 +169,7 @@ files:
 - lib/fastlane/plugin/zhuixi_build_app/actions/zhuixi_build_app_action.rb
 - lib/fastlane/plugin/zhuixi_build_app/helper/zhuixi_build_app_helper.rb
 - lib/fastlane/plugin/zhuixi_build_app/version.rb
-homepage: 
+homepage: https://github.com/RedSevenMale/fastlane-plugin-zhuixi_build_app
 licenses:
 - MIT
 metadata: {}