pindo 5.0.4 → 5.0.6

data/lib/pindo/module/android/base_helper.rb

@@ -0,0 +1,293 @@
+module Pindo
+  module BaseAndroidHelper
+
+    def get_build_tools
+      # 获取 gem 资源文件路径
+      
+      pindo_dir ||= File.expand_path(ENV['PINDO_DIR'] || '~/.pindo')
+      pindo_common_configdir ||= File.join(pindo_dir, "pindo_common_config")
+      tools_dir = File.join(pindo_common_configdir, 'android_tools')
+
+      # 如果开发环境找不到，尝试在 gem 安装目录找
+      unless File.directory?(tools_dir)
+        raise "缺少必要的构建工具: #{tools_dir}，请执行pindo setup更新pindo配置"
+      end
+
+      # 检查必要的工具是否存在
+      required_tools = {
+        bundle_tool: 'bundletool.jar',
+        gradlew: 'gradlew',
+        gradle_wrapper: 'gradle-wrapper.jar'
+      }
+
+      tools = {}
+      required_tools.each do |key, filename|
+        path = File.join(tools_dir, filename)
+        unless File.exist?(path)
+          raise "缺少必要的构建工具: #{filename}，请执行pindo setup更新pindo配置"
+        end
+        tools[key] = path
+      end
+
+      tools
+    end
+
+    def modify_il2cpp_config(project_path)
+      # 设置Il2CppOutputProject可执行权限
+      system("chmod", "-R", "777",
+      File.join(project_path, "unityLibrary/src/main/Il2CppOutputProject"))
+
+      il2cpp_config_path = File.join(project_path, "unityLibrary/src/main/Il2CppOutputProject/IL2CPP/libil2cpp/il2cpp-config.h")
+      content = File.read(il2cpp_config_path)
+      content.gsub!("il2cpp::vm::Exception::Raise", "//il2cpp::vm::Exception::Raise")
+      File.write(il2cpp_config_path, content)
+    end
+
+    def remove_desktop_google_service(project_path)
+      # 删除google-services-desktop.json
+      desktop_google_service_path = File.join(project_path,
+        "unityLibrary/src/main/assets/google-services-desktop.json")
+      File.delete(desktop_google_service_path) if File.exist?(desktop_google_service_path)
+    end
+
+    # def get_app_name(project_path)
+    #   strings_xml_path = File.join(project_path, "app/src/main/res/values/strings.xml")
+
+    #   unless File.exist?(strings_xml_path)
+    #     strings_xml_path = File.join(project_path, "unityLibrary/src/main/res/values/strings.xml")
+    #     unless File.exist?(strings_xml_path)
+    #       return nil
+    #     end
+    #   end
+
+    #   xml_content = File.read(strings_xml_path)
+    #   doc = Nokogiri::XML(xml_content)
+    #   doc.at_xpath("//string[@name='app_name']")&.text
+    # end
+
+    def get_main_module(project_path)
+      settings_gradle_path = File.join(project_path, "settings.gradle")
+      return nil unless File.exist?(settings_gradle_path)
+
+      content = File.read(settings_gradle_path)
+      modules = content.scan(/include\s+['"]([^'"]+)['"]/).flatten
+
+      main_module = modules.find do |m|
+        module_name = m.split(':').last
+        gradle_path = File.join(project_path, module_name, "build.gradle")
+        if File.exist?(gradle_path)
+          File.read(gradle_path).include?("apply plugin: 'com.android.application'") ||
+            File.read(gradle_path).include?("id 'com.android.application'")
+        end
+      end
+      return nil unless main_module
+
+      module_name = main_module.split(':').last
+      File.join(project_path, module_name)
+    end
+
+    def get_keystore_config(project_path, debug = false)
+      main_module = get_main_module(project_path)
+      return nil unless main_module
+
+      gradle_path = File.join(main_module, "build.gradle")
+      return nil unless File.exist?(gradle_path)
+
+      content = File.read(gradle_path)
+
+      # 直接读取整个文件内容，不使用正则表达式截取 android 块
+      puts "读取 build.gradle 文件"
+
+      # 查找 signingConfigs 块的开始和结束位置
+      signing_configs_start = content.index(/signingConfigs\s*\{/)
+      return nil unless signing_configs_start
+
+      # 从开始位置查找匹配的闭合大括号
+      open_braces = 0
+      signing_configs_end = nil
+
+      content[signing_configs_start..-1].each_char.with_index do |char, i|
+        if char == '{'
+          open_braces += 1
+        elsif char == '}'
+          open_braces -= 1
+          if open_braces == 0
+            signing_configs_end = signing_configs_start + i
+            break
+          end
+        end
+      end
+
+      return nil unless signing_configs_end
+
+      # 提取完整的 signingConfigs 块
+      signing_configs_block = content[signing_configs_start..signing_configs_end]
+
+
+      # 查找配置名称，如 Android_Sign
+      config_name_match = signing_configs_block.match(/signingConfigs\s*\{\s*(\w+)\s*\{/)
+      config_name = config_name_match ? config_name_match[1] : nil
+      return nil unless config_name
+
+      # 检查 buildTypes 中使用的签名配置
+      config_type = debug ? 'debug' : 'release'
+      build_type_match = content.match(/buildTypes\s*\{.*?#{config_type}\s*\{(.*?)}/m)
+      if build_type_match && build_type_match[1] =~ /signingConfig\s+signingConfigs\.(\w+)/
+        config_name = $1
+      end
+
+      # 提取特定配置块的内容
+      config_start = signing_configs_block.index(/#{config_name}\s*\{/)
+      return nil unless config_start
+
+      # 从配置开始位置查找匹配的闭合大括号
+      open_braces = 0
+      config_end = nil
+
+      signing_configs_block[config_start..-1].each_char.with_index do |char, i|
+        if char == '{'
+          open_braces += 1
+        elsif char == '}'
+          open_braces -= 1
+          if open_braces == 0
+            config_end = config_start + i
+            break
+          end
+        end
+      end
+
+      return nil unless config_end
+
+      # 提取完整的配置块
+      config_block = signing_configs_block[config_start..config_end]
+
+      puts "解析 signing config:"
+      puts "=" * 50
+      puts config_block
+      puts "=" * 50
+
+      # 从配置块中提取各项参数
+      store_file_match = config_block.match(/storeFile\s+file\(["']?\${([^}]+)}["']?\)/m)
+      store_password_match = config_block.match(/storePassword\s+["']?\${([^}]+)}["']?/m)
+      key_alias_match = config_block.match(/keyAlias\s+["']?\${([^}]+)}["']?/m)
+      key_password_match = config_block.match(/keyPassword\s+["']?\${([^}]+)}["']?/m)
+
+      # 如果使用了外部变量，尝试从 ext_signing.gradle 或其他配置文件中获取实际值
+      if store_file_match || store_password_match || key_alias_match || key_password_match
+        ext_values = get_ext_values(project_path)
+        puts "尝试从 ext values 中获取"
+
+        # 获取 store_file 并处理 $rootDir 路径
+        store_file = store_file_match ? ext_values[store_file_match[1]] : nil
+        if store_file && store_file.include?('$rootDir')
+          # 替换 $rootDir 为项目根目录的绝对路径
+          # 查找项目根目录（包含settings.gradle的目录）
+          root_dir = project_path
+          while root_dir && !File.exist?(File.join(root_dir, "settings.gradle"))
+            parent_dir = File.dirname(root_dir)
+            # 防止无限循环
+            break if parent_dir == root_dir
+            root_dir = parent_dir
+          end
+
+          store_file = store_file.gsub('$rootDir', root_dir)
+          puts "处理后的 store_file 路径: #{store_file}"
+        end
+
+        keystore_config = {
+          store_file: store_file,
+          store_password: store_password_match ? ext_values[store_password_match[1]] : nil,
+          key_alias: key_alias_match ? ext_values[key_alias_match[1]] : nil,
+          key_password: key_password_match ? ext_values[key_password_match[1]] : nil
+        }
+
+        # 确保所有值都不为 nil
+        if keystore_config.values.any?(&:nil?)
+          puts "警告: 部分 keystore 配置为 nil: #{keystore_config}"
+        end
+
+        return keystore_config
+      else
+        # 直接从配置块中提取硬编码的值
+        store_file = config_block.match(/storeFile\s+file\(['"]([^'"]+)['"]\)/m)&.[](1)
+        store_password = config_block.match(/storePassword\s+['"]([^'"]+)['"]/m)&.[](1)
+        key_alias = config_block.match(/keyAlias\s+['"]([^'"]+)['"]/m)&.[](1)
+        key_password = config_block.match(/keyPassword\s+['"]([^'"]+)['"]/m)&.[](1)
+
+        keystore_config = {
+          store_file: store_file,
+          store_password: store_password,
+          key_alias: key_alias,
+          key_password: key_password
+        }
+
+        # 确保所有值都不为 nil
+        if keystore_config.values.any?(&:nil?)
+          puts "警告: 部分 keystore 配置为 nil: #{keystore_config}"
+        end
+
+        return keystore_config
+      end
+    end
+
+    # 新增方法：从 ext 配置文件中获取变量值
+    def get_ext_values(project_path)
+      ext_values = {}
+
+      # 查找可能的 ext 配置文件
+      ext_files = [
+        File.join(project_path, "buildScripts/cfg/ext_signing.gradle"),
+        File.join(project_path, "gradle.properties"),
+        File.join(project_path, "local.properties")
+      ]
+
+      ext_files.each do |file_path|
+        next unless File.exist?(file_path)
+
+        content = File.read(file_path)
+
+        # 解析 ext.KEY = "VALUE" 格式
+        content.scan(/ext\.(\w+)\s*=\s*["']([^"']+)["']/m).each do |key, value|
+          ext_values[key] = value
+        end
+
+        # 解析 KEY=VALUE 格式
+        content.scan(/^(\w+)\s*=\s*["']?([^"'\n]+)["']?/m).each do |key, value|
+          ext_values[key] = value
+        end
+      end
+
+      ext_values
+    end
+
+    def unity_android_project?(project_path)
+      # 检查 unityLibrary 模块是否存在
+      unity_library_path = File.join(project_path, "unityLibrary")
+      return false unless File.directory?(unity_library_path)
+
+      # 检查 unityLibrary 的 build.gradle 是否存在
+      unity_gradle_path = File.join(unity_library_path, "build.gradle")
+      return false unless File.exist?(unity_gradle_path)
+
+      # 检查 build.gradle 中是否包含 Unity 特有的配置
+      content = File.read(unity_gradle_path)
+      content.include?("com.android.library") && content.include?("BuildIl2Cpp")
+    end
+
+    def find_android_subproject(project_path)
+      android_dir = File.join(project_path, "Unity")
+      return nil unless File.directory?(android_dir)
+
+      main_module = get_main_module(android_dir)
+      return nil unless main_module
+
+      src_main = File.join(main_module, "src/main")
+      return nil unless File.directory?(src_main)
+
+      manifest = File.join(src_main, "AndroidManifest.xml")
+      return nil unless File.exist?(manifest)
+
+      android_dir
+    end
+  end
+end

data/lib/pindo/module/android/build_helper.rb

@@ -0,0 +1,112 @@
+require 'singleton'
+require_relative 'base_helper'
+require_relative 'gradle_helper'
+require_relative 'so_helper'
+require_relative 'apk_helper'
+
+module Pindo
+  class AndroidBuildHelper
+    include BaseAndroidHelper
+    include GradleHelper
+    include SoHelper
+    include ApkHelper
+    include Singleton
+
+    class << self
+      def share_instance
+        instance
+      end
+    end
+
+    def auto_build_apk(project_dir, debug = false, ignore_sub = false)
+      # 检查 gradle.properties 中是否设置了 Java Home
+      gradle_properties_path = File.join(project_dir, "gradle.properties")
+      if File.exist?(gradle_properties_path)
+        puts "检查 gradle.properties 中的 Java Home 设置..."
+        content = File.read(gradle_properties_path)
+        java_home_match = content.match(/org\.gradle\.java\.home\s*=\s*(.+)/)
+        if java_home_match && !java_home_match[1].empty?
+          java_home_path = java_home_match[1].strip
+          puts "找到 Java Home 路径: #{java_home_path}"
+          # 设置环境变量
+          ENV['JAVA_HOME'] = java_home_path
+          ENV['PATH'] = "#{java_home_path}/bin:#{ENV['PATH']}"
+          puts "已设置 JAVA_HOME 环境变量为: #{java_home_path}"
+          puts "Java 版本信息："
+          system("java -version")
+        end
+      end
+
+      # 检查
+      if !ignore_sub
+        sub_android_dir = find_android_subproject(project_dir)
+        if sub_android_dir
+          prepare_proj(sub_android_dir)
+          # 构建 AAB 文件
+          unless build_so_library(sub_android_dir)
+            raise RuntimeError, "编译SO库失败:"
+          end
+          copy_so_files(sub_android_dir, project_dir)
+        end
+      end
+
+      prepare_proj(project_dir)
+      build_apk(project_dir, debug)
+    end
+
+    def get_application_id(project_path)
+      main_module = get_main_module(project_path)
+      return nil unless main_module
+
+      # 尝试从 build.gradle 获取
+      gradle_path = File.join(main_module, "build.gradle")
+      if File.exist?(gradle_path)
+        content = File.read(gradle_path)
+        if content =~ /applicationId\s+['"]([^'"]+)['"]/
+          return $1
+        end
+      end
+
+      # 如果 build.gradle 中没有，尝试从 AndroidManifest.xml 获取
+      manifest_path = File.join(main_module, "src", "main", "AndroidManifest.xml")
+      if File.exist?(manifest_path)
+        require 'nokogiri'
+        doc = Nokogiri::XML(File.read(manifest_path))
+        package = doc.at_xpath('//manifest/@package')&.value
+        return package if package
+      end
+
+      nil
+    end
+
+    def dsign(project_path, debug)
+      keystore_config = get_keystore_config(project_path, debug)
+
+      ks = keystore_config[:store_file]
+      puts "读取 keystore path = #{ks}"
+      ks_pass = keystore_config[:store_password]
+      puts "读取 keystore pass = #{ks_pass}"
+      key_alias = keystore_config[:key_alias]
+      puts "读取 key alias = #{key_alias}"
+      key_pass = keystore_config[:key_password]
+      puts "读取 key pass = #{key_pass}"
+    end
+
+    private
+
+    def prepare_proj(project_dir)
+      raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+      raise ArgumentError, "项目目录不存在" unless File.directory?(project_dir)
+
+      check_gradle_files(project_dir)
+      if unity_android_project?(project_dir)
+        update_build_gradle(project_dir)
+        update_gradle_version(project_dir)
+        modify_il2cpp_config(project_dir)
+        remove_desktop_google_service(project_dir)
+      end
+    rescue StandardError => e
+      raise Informative, "准备项目失败: #{e.message}"
+    end
+  end
+end

data/lib/pindo/module/android/gradle_helper.rb

@@ -0,0 +1,48 @@
+require_relative 'base_helper'
+
+module Pindo
+  module GradleHelper
+    include BaseAndroidHelper
+
+    def check_gradle_files(project_path)
+      # 检查是否存在 gradlew 文件 如果没有则执行复制操作
+      gradlew_path = File.join(project_path, "gradlew")
+      if File.exist?(gradlew_path)
+        puts "gradlew file already exists, skip copying."
+      else
+         # 复制gradle相关文件
+        gradlew_content = File.read(get_build_tools[:gradlew])
+        File.write(gradlew_path, gradlew_content)
+      end
+      # 设置gradlew可执行权限
+      system("chmod", "777", gradlew_path)
+
+      wrapper_jar_path = File.join(project_path, "gradle/wrapper/gradle-wrapper.jar")
+      if File.exist?(wrapper_jar_path)
+        puts "gradle-wrapper.jar file already exists, skip copying."
+      else
+        FileUtils.mkdir_p(File.dirname(wrapper_jar_path))
+        gradle_wrapper_content = File.read(get_build_tools[:gradle_wrapper])
+        File.write(wrapper_jar_path, gradle_wrapper_content)
+      end
+    end
+
+    def update_build_gradle(project_path)
+      # 更新build.gradle
+      build_gradle_path = File.join(project_path, "build.gradle")
+      content = File.read(build_gradle_path)
+      content.gsub!("classpath 'com.android.tools.build:gradle:4.0.1'",
+                    "classpath 'com.android.tools.build:gradle:4.2.2'")
+      File.write(build_gradle_path, content)
+    end
+
+    def update_gradle_version(project_path)
+      # 更新gradle wrapper版本
+      wrapper_path = File.join(project_path, "gradle/wrapper/gradle-wrapper.properties")
+      content = File.read(wrapper_path)
+      content.gsub!("gradle-6.1.1-bin.zip", "gradle-7.2-bin.zip")
+      File.write(wrapper_path, content)
+    end
+
+  end
+end

data/lib/pindo/module/android/so_helper.rb

@@ -0,0 +1,18 @@
+module Pindo
+  module SoHelper
+
+    def build_so_library(project_path)
+      # 编译so库
+      Dir.chdir(project_path) do
+        system("./gradlew unityLibrary:BuildIl2CppTask")
+      end
+    end
+
+    def copy_so_files(source_path, target_path)
+      # 复制so文件到正确的目录
+      src_dir = File.join(source_path, "unityLibrary/src/main/assets")
+      dst_dir = File.join(target_path, "unityLibrary/src/main/assets")
+      FileUtils.cp_r(src_dir, dst_dir) if File.directory?(src_dir)
+    end
+  end
+end

data/lib/pindo/module/build/buildhelper.rb

@@ -1,11 +1,12 @@
 require 'singleton'
 require 'fileutils'
 require 'xcodeproj' # 用于iOS项目检查
-
+require_relative '../android/base_helper'
 module Pindo
 
       class BuildHelper
         include Singleton
+        include BaseAndroidHelper
         include Pindo::Githelper
 
         class << self
@@ -14,6 +15,23 @@ module Pindo
           end
         end
 
+        def delete_libtarget_firebase_shell(project_path)
+          if File.directory?(File.join(project_path, 'Unity')) && File.exist?(File.join(project_path, 'Unity', 'Unity-iPhone.xcodeproj'))
+            unity_project_path = File.join(project_path, 'Unity', 'Unity-iPhone.xcodeproj')
+            xcdoe_unitylib_project = Xcodeproj::Project::open(unity_project_path)
+            xcdoe_unitylib_project.targets.each do |target|
+              if target.name == 'Unity-iPhone'
+                target.shell_script_build_phases.each do |phase|
+                  if phase.name.eql?("Crashlytics Run Script")
+                    target.remove_build_phase(phase)
+                  end
+                end
+              end
+            end
+            xcdoe_unitylib_project.save()
+          end
+        end
+
         def check_check_and_install_cliff(project_path)
           if is_git_directory?(local_repo_dir: project_path)
             current_git_root_path = git_root_directory(local_repo_dir: project_path)
@@ -39,7 +57,7 @@ module Pindo
             build_ios.log
             feishu.json
             CHANGELOG.md
-            
+
             # Platform specific directories
             /GoodPlatform/iOS/config.json
             /GoodPlatform/iOS/*
@@ -81,7 +99,7 @@ module Pindo
             commit_message = "docs: 添加日志变更配置".encode('UTF-8')
             git!(%W(-C #{current_git_root_path} commit -m #{commit_message}))
             git!(%W(-C #{current_git_root_path} push origin #{current_branch}))
-            
+
           else
             Funlog.instance.fancyinfo_error("当前目录不是git仓库，请在git仓库根目录下执行此命令")
             raise Informative, "当前目录不是git仓库，请在git仓库根目录下执行此命令"
@@ -109,33 +127,33 @@ module Pindo
         def check_is_need_add_tag?(project_path)
           tag_action_parms = nil
           is_need_add_tag = false
-        
+
           if is_git_directory?(local_repo_dir: project_path)
             current_git_root_path = git_root_directory(local_repo_dir: project_path)
             latest_tag = get_latest_version_tag(project_dir: current_git_root_path)
-            
+
             unless is_tag_at_head?(git_root_dir: current_git_root_path, tag_name: latest_tag)
               cli = HighLine.new
               menu_options = {
-                "新增版本号,打新Tag" => -> { 
+                "新增版本号,打新Tag" => -> {
                   tag_action_parms = []
-                  :new_tag 
+                  :new_tag
                 },
-                "将上次的Tag删除重新打Tag" => -> { 
+                "将上次的Tag删除重新打Tag" => -> {
                   tag_action_parms = []
                   tag_action_parms << "--retag"
-                  :recreate_tag 
+                  :recreate_tag
                 },
-                "不需要Tag继续编译且上传，手动修改上传备注" => -> { 
+                "不需要Tag继续编译且上传，手动修改上传备注" => -> {
                   puts ""
-                  :continue_without_tag 
+                  :continue_without_tag
                 },
-                "终止退出编译" => -> { 
+                "终止退出编译" => -> {
                   raise Informative, "终止退出编译!"
-                  :exit 
+                  :exit
                 }
               }
-              
+
               result = cli.choose do |menu|
                 menu.header = "当前代码并没有打Tag,上传的Changelog需要Tag"
                 menu.prompt = "请选中打Tag的方式, 请输入选项(1/2/3...):"
@@ -143,11 +161,11 @@ module Pindo
                   menu.choice(option) { action.call }
                 end
               end
-              
+
               is_need_add_tag = !tag_action_parms.nil?
             end
           end
-        
+
           return [is_need_add_tag, tag_action_parms]
         end
 
@@ -156,10 +174,10 @@ module Pindo
           project_settings_path = File.join(project_path, "ProjectSettings")
           assets_path = File.join(project_path, "Assets")
           packages_path = File.join(project_path, "Packages")
-          
+
           # Unity工程必须包含这些目录和文件
-          File.directory?(project_settings_path) && 
-          File.directory?(assets_path) && 
+          File.directory?(project_settings_path) &&
+          File.directory?(assets_path) &&
           File.directory?(packages_path) &&
           File.exist?(File.join(project_settings_path, "ProjectSettings.asset"))
         end
@@ -168,22 +186,22 @@ module Pindo
           # 检查iOS工程的关键文件
           xcodeproj_files = Dir.glob(File.join(project_path, "*.xcodeproj"))
           workspace_files = Dir.glob(File.join(project_path, "*.xcworkspace"))
-          
+
           # 至少要有.xcodeproj文件或.xcworkspace文件
           return false if xcodeproj_files.empty? && workspace_files.empty?
-          
+
           if !xcodeproj_files.empty?
             # 检查.xcodeproj内部结构
             project_file = File.join(xcodeproj_files.first, "project.pbxproj")
             return true if File.exist?(project_file)
           end
-          
+
           if !workspace_files.empty?
             # 检查.xcworkspace内部结构
             contents_file = File.join(workspace_files.first, "contents.xcworkspacedata")
             return true if File.exist?(contents_file)
           end
-          
+
           false
         end
 
@@ -191,28 +209,23 @@ module Pindo
           # 检查Android工程的关键文件和目录
           gradle_file = File.exist?(File.join(project_path, "build.gradle"))
           settings_gradle = File.exist?(File.join(project_path, "settings.gradle"))
-          app_dir = File.directory?(File.join(project_path, "app"))
-          
+
+          main_module = get_main_module(project_path)
+
           # Android Studio项目结构
-          if gradle_file && settings_gradle && app_dir
-            app_gradle = File.exist?(File.join(project_path, "app", "build.gradle"))
-            app_manifest = File.exist?(File.join(project_path, "app", "src", "main", "AndroidManifest.xml"))
+          if gradle_file && settings_gradle && main_module
+            app_gradle = File.exist?(File.join(main_module, "build.gradle"))
+            app_manifest = File.exist?(File.join(main_module, "src", "main", "AndroidManifest.xml"))
             return true if app_gradle && app_manifest
           end
-          
-          # 传统Eclipse项目结构
-          if File.directory?(File.join(project_path, "src"))
-            manifest = File.join(project_path, "AndroidManifest.xml")
-            return true if File.exist?(manifest)
-          end
-          
+
           false
         end
 
         def project_type(project_path)
           raise ArgumentError, "项目路径不能为空" if project_path.nil? || project_path.empty?
           raise ArgumentError, "项目路径不存在: #{project_path}" unless File.directory?(project_path)
-          
+
           return :unity if unity_project?(project_path)
           return :ios if ios_project?(project_path)
           return :android if android_project?(project_path)
@@ -276,4 +289,4 @@ module Pindo
         end
       end
 
-end 
+end