pindo 5.18.9 → 5.18.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b74ddb66022968993f331b407f3a50a41d94a827e15e75f75dac1b8d5aadc1
-  data.tar.gz: '08c5e2e855359f4369e02cb6cab841d38e3344794a7d4e8f9b0f2695683d1da2'
+  metadata.gz: 2f12654249c9833d657aadadbc44e7e7b749dbd590018855ddc196776dd21d85
+  data.tar.gz: 0bc9ef08ddfaefeeca63cb52380eace72853a9201e1abd828e5100b5de12cba0
 SHA512:
-  metadata.gz: 6c1c36ddcf83fcff151bdd21e8e3104eec862b5c72aa15303a8fe3cae4f9be0dd36f37e2cee24d293e6ace76f895c72f057a18f12485c6d4a08905bb49350e21
-  data.tar.gz: 1f3a484ff340bd398d150960753bb541103aca2b5a8ba30e712733c029e209c9fdfcb7db6c2d80b7c1bb1e1c8202d3319600ab12d23c4cb928c3f55c2390e74c
+  metadata.gz: 3a70f8ef90da1b660e40c0c1d84a56c2701fc541e8c932ac5facf224f3df59b4902cb45e5af246dfa492b311e3aa65d9cd9265d741fd2e514933a97c3dffe125
+  data.tar.gz: 6b867becf5698dcfec5b87c4cf5cb302b3c3292a0abe8d5bd890f69e15dd00abb2c63de3d461d5ca9e2cc1cb953050a0bb37f1558c7b01de25793764dbea22c2

data/lib/pindo/command/android/install.rb

@@ -0,0 +1,277 @@
+module Pindo
+    class Command
+        class Android < Command
+            class Install < Android
+
+                self.summary = '安装 APK 到已连接的 Android 设备'
+
+                self.description = <<-DESC
+                    自动检测已连接的 Android 设备，将 APK 安装到设备上。
+
+                    支持三种方式指定 APK 文件：
+                    1. 命令行参数直接传入文件路径
+                    2. --apk 选项指定文件路径
+                    3. 不指定时自动搜索当前项目中最新的 APK 文件
+
+                    如果检测到多台可用设备，会列出设备列表让用户选择。
+
+                    示例:
+                        $ pindo and install                              # 自动搜索 APK 并安装
+                        $ pindo and install path/to/app.apk              # 指定 APK 文件安装
+                        $ pindo and install --apk=path/to/app.apk        # 通过选项指定 APK 文件
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/demo.apk', false),
+                ]
+
+                def self.option_items
+                  @option_items ||= Pindo::Options::OptionGroup.merge(
+                    Pindo::Options::ToolOptions.select(:apk)
+                  )
+                end
+
+                def self.options
+                  option_items.map(&:to_claide_option).concat(super)
+                end
+
+                def initialize(argv)
+                    @args_apk_file = argv.shift_argument
+                    @options = initialize_options(argv)
+
+                    apk_option = @options[:apk] rescue nil
+                    if !apk_option.nil?
+                        @args_apk_file = apk_option
+                    end
+                    if @args_apk_file && !@args_apk_file.empty?
+                        @args_apk_file = @args_apk_file.strip.gsub(/\"/, '')
+                    end
+
+                    super(argv)
+                end
+
+                def validate!
+                    super
+                end
+
+                def run
+                    # 1. 查找 adb
+                    @adb_path = find_adb
+                    puts "ADB: #{@adb_path}"
+
+                    # 2. 查找 APK 文件
+                    apk_file = find_apk_file
+                    puts "APK 文件: #{apk_file}"
+
+                    # 3. 检测可用设备
+                    devices = detect_available_devices
+                    if devices.empty?
+                        raise Informative, "未检测到可用的 Android 设备，请确认设备已连接并开启 USB 调试"
+                    end
+
+                    # 4. 选择设备
+                    device = select_device(devices)
+                    puts "目标设备: #{device[:brand]} #{device[:model]} (#{device[:serial]})"
+
+                    # 5. 安装 APK
+                    install_apk_to_device(apk_file, device)
+                end
+
+                private
+
+                # 查找 adb 路径
+                def find_adb
+                    # 1. PATH 中查找
+                    adb_in_path = `which adb 2>/dev/null`.strip
+                    return adb_in_path unless adb_in_path.empty?
+
+                    # 2. 通过 SDK 路径查找（复用 android_project_helper 的逻辑）
+                    sdk_dir = find_android_sdk_dir
+                    if sdk_dir
+                        adb = File.join(sdk_dir, "platform-tools", "adb")
+                        return adb if File.executable?(adb)
+                    end
+
+                    raise Informative, "未找到 adb，请确认已安装 Android SDK 并配置 ANDROID_HOME 环境变量"
+                end
+
+                # 查找 Android SDK 目录
+                def find_android_sdk_dir
+                    # Android Studio 默认路径
+                    default_sdk = File.expand_path("~/Library/Android/sdk")
+                    return default_sdk if File.directory?(default_sdk)
+
+                    # 环境变量
+                    sdk_dir = ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT']
+                    return sdk_dir if sdk_dir && File.directory?(sdk_dir)
+
+                    # 从当前项目的 local.properties 读取
+                    project_dir = Dir.pwd
+                    ["local.properties", "Unity/local.properties"].each do |props_file|
+                        props_path = File.join(project_dir, props_file)
+                        if File.exist?(props_path)
+                            content = File.read(props_path)
+                            if content =~ /sdk\.dir\s*=\s*(.+)/
+                                dir = $1.strip
+                                return dir if File.directory?(dir)
+                            end
+                        end
+                    end
+
+                    nil
+                end
+
+                # 查找 APK 文件
+                def find_apk_file
+                    # 优先使用用户指定的文件
+                    if @args_apk_file && !@args_apk_file.empty?
+                        apk_path = File.expand_path(@args_apk_file)
+                        unless File.exist?(apk_path)
+                            raise Informative, "APK 文件不存在: #{apk_path}"
+                        end
+                        return apk_path
+                    end
+
+                    # 自动搜索
+                    project_dir = Dir.pwd
+                    apk_file = nil
+
+                    require 'pindo/module/build/build_helper'
+                    build_helper = Pindo::BuildHelper.share_instance
+                    project_type = build_helper.project_type(project_dir)
+
+                    case project_type
+                    when :android
+                        apk_file = find_android_apk(project_dir)
+                    when :unity
+                        apk_file = find_unity_android_apk(project_dir)
+                    end
+
+                    # 兜底搜索
+                    if apk_file.nil?
+                        search_paths = [
+                            File.join(project_dir, "build", "**", "*.apk"),
+                            File.join(project_dir, "*.apk")
+                        ]
+                        search_paths.each do |pattern|
+                            found = Dir.glob(pattern).max_by { |f| File.mtime(f) }
+                            if found
+                                apk_file = found
+                                break
+                            end
+                        end
+                    end
+
+                    if apk_file.nil?
+                        raise Informative, "未找到 APK 文件，请指定文件路径: pindo and install path/to/app.apk"
+                    end
+
+                    apk_file
+                end
+
+                # 在 Android 工程中查找最新 APK
+                def find_android_apk(project_dir)
+                    build_path = File.join(project_dir, "build", "**", "*.apk")
+                    Dir.glob(build_path).max_by { |f| File.mtime(f) }
+                end
+
+                # 在 Unity 工程中查找最新 Android APK
+                def find_unity_android_apk(project_dir)
+                    apk_files = []
+                    ["GoodPlatform/BaseAndroid/build", "GoodPlatform/Android/build"].each do |sub_dir|
+                        dir = File.join(project_dir, sub_dir)
+                        if File.exist?(dir)
+                            apk_files.concat(Dir.glob(File.join(dir, "**", "*.apk")))
+                        end
+                    end
+                    apk_files.max_by { |f| File.mtime(f) } if apk_files.any?
+                end
+
+                # 检测已连接的 Android 设备
+                def detect_available_devices
+                    output = `"#{@adb_path}" devices 2>/dev/null`.to_s
+                    devices = []
+
+                    output.split("\n").each do |line|
+                        next if line.start_with?("List of devices")
+                        next if line.strip.empty?
+                        next if line.start_with?("*")
+
+                        parts = line.strip.split(/\s+/)
+                        next if parts.size < 2
+
+                        serial = parts[0]
+                        state = parts[1]
+
+                        # 只保留 device 状态（排除 offline、unauthorized、no permissions 等）
+                        next unless state == "device"
+
+                        brand = get_device_prop(serial, "ro.product.brand")
+                        model = get_device_prop(serial, "ro.product.model")
+                        android_version = get_device_prop(serial, "ro.build.version.release")
+
+                        devices << {
+                            serial: serial,
+                            brand: brand.capitalize,
+                            model: model,
+                            android_version: android_version
+                        }
+                    end
+
+                    devices
+                end
+
+                # 获取设备属性
+                def get_device_prop(serial, prop)
+                    `"#{@adb_path}" -s #{serial} shell getprop #{prop} 2>/dev/null`.strip
+                end
+
+                # 选择设备
+                def select_device(devices)
+                    if devices.size == 1
+                        return devices.first
+                    end
+
+                    puts "\n检测到 #{devices.size} 台可用设备:"
+                    devices.each_with_index do |device, index|
+                        puts "  [#{index + 1}] #{device[:brand]} #{device[:model]} (Android #{device[:android_version]}) - #{device[:serial]}"
+                    end
+
+                    selection = nil
+                    loop do
+                        print "\n请选择设备 [1-#{devices.size}]: "
+                        input = $stdin.gets
+                        if input.nil?
+                            raise Informative, "用户取消操作"
+                        end
+                        input = input.strip
+                        num = input.to_i
+                        if num >= 1 && num <= devices.size
+                            selection = num - 1
+                            break
+                        end
+                        puts "无效输入，请输入 1-#{devices.size} 之间的数字"
+                    end
+
+                    devices[selection]
+                end
+
+                # 安装 APK 到设备
+                def install_apk_to_device(apk_file, device)
+                    puts "\n正在安装到 #{device[:brand]} #{device[:model]}..."
+
+                    output = `"#{@adb_path}" -s #{device[:serial]} install -r "#{apk_file}" 2>&1`
+                    exit_code = $?.exitstatus
+
+                    if exit_code == 0 && output.include?("Success")
+                        puts "安装成功!"
+                    else
+                        puts output unless output.strip.empty?
+                        raise Informative, "安装失败"
+                    end
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/android.rb

@@ -2,6 +2,7 @@
 require 'pindo/command/android/autobuild'
 require 'pindo/command/android/autoresign'
 require 'pindo/command/android/keystore'
+require 'pindo/command/android/install'
 
 
 module Pindo

data/lib/pindo/command/ios/install.rb

@@ -0,0 +1,241 @@
+module Pindo
+    class Command
+        class Ios < Command
+            class Install < Ios
+
+                self.summary = '安装 IPA 到已连接的 iOS 真机设备'
+
+                self.description = <<-DESC
+                    自动检测已连接的 iPhone/iPad 设备，将 IPA 安装到设备上。
+
+                    支持三种方式指定 IPA 文件：
+                    1. 命令行参数直接传入文件路径
+                    2. --ipa 选项指定文件路径
+                    3. 不指定时自动搜索当前项目中最新的 IPA 文件
+
+                    如果检测到多台可用设备，会列出设备列表让用户选择。
+
+                    示例:
+                        $ pindo ios install                              # 自动搜索 IPA 并安装
+                        $ pindo ios install path/to/app.ipa              # 指定 IPA 文件安装
+                        $ pindo ios install --ipa=path/to/app.ipa        # 通过选项指定 IPA 文件
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/demo.ipa', false),
+                ]
+
+                def self.option_items
+                  @option_items ||= Pindo::Options::OptionGroup.merge(
+                    Pindo::Options::ToolOptions.select(:ipa)
+                  )
+                end
+
+                def self.options
+                  option_items.map(&:to_claide_option).concat(super)
+                end
+
+                def initialize(argv)
+                    @args_ipa_file = argv.shift_argument
+                    @options = initialize_options(argv)
+
+                    ipa_option = @options[:ipa]
+                    if !ipa_option.nil?
+                        @args_ipa_file = ipa_option
+                    end
+                    if @args_ipa_file && !@args_ipa_file.empty?
+                        @args_ipa_file = @args_ipa_file.strip.gsub(/\"/, '')
+                    end
+
+                    super(argv)
+                end
+
+                def validate!
+                    super
+                end
+
+                def run
+                    # 1. 查找 IPA 文件
+                    ipa_file = find_ipa_file
+                    puts "IPA 文件: #{ipa_file}"
+
+                    # 2. 检测可用设备
+                    devices = detect_available_devices
+                    if devices.empty?
+                        raise Informative, "未检测到可用的 iPhone/iPad 设备，请确认设备已连接并信任此电脑"
+                    end
+
+                    # 3. 选择设备
+                    device = select_device(devices)
+                    puts "目标设备: #{device[:name]} (#{device[:model]})"
+
+                    # 4. 安装 IPA
+                    install_ipa_to_device(ipa_file, device)
+                end
+
+                private
+
+                # 查找 IPA 文件
+                def find_ipa_file
+                    # 优先使用用户指定的文件
+                    if @args_ipa_file && !@args_ipa_file.empty?
+                        ipa_path = File.expand_path(@args_ipa_file)
+                        unless File.exist?(ipa_path)
+                            raise Informative, "IPA 文件不存在: #{ipa_path}"
+                        end
+                        return ipa_path
+                    end
+
+                    # 自动搜索
+                    project_dir = Dir.pwd
+                    ipa_file = nil
+
+                    # 检测项目类型并搜索
+                    require 'pindo/module/build/build_helper'
+                    build_helper = Pindo::BuildHelper.share_instance
+                    project_type = build_helper.project_type(project_dir)
+
+                    case project_type
+                    when :ios
+                        ipa_file = find_ios_ipa(project_dir)
+                    when :unity
+                        ipa_file = find_unity_ios_ipa(project_dir)
+                    end
+
+                    # 兜底：在当前目录和 build 目录查找
+                    if ipa_file.nil?
+                        search_paths = [
+                            File.join(project_dir, "build", "*.ipa"),
+                            File.join(project_dir, "*.ipa")
+                        ]
+                        search_paths.each do |pattern|
+                            found = Dir.glob(pattern).max_by { |f| File.mtime(f) }
+                            if found
+                                ipa_file = found
+                                break
+                            end
+                        end
+                    end
+
+                    if ipa_file.nil?
+                        raise Informative, "未找到 IPA 文件，请指定文件路径: pindo ios install path/to/app.ipa"
+                    end
+
+                    ipa_file
+                end
+
+                # 在 iOS 工程中查找最新 IPA
+                def find_ios_ipa(project_dir)
+                    build_path = File.join(project_dir, "build", "*.ipa")
+                    Dir.glob(build_path).max_by { |f| File.mtime(f) }
+                end
+
+                # 在 Unity 工程中查找最新 iOS IPA
+                def find_unity_ios_ipa(project_dir)
+                    ipa_files = []
+                    ["GoodPlatform/BaseiOS/build", "GoodPlatform/iOS/build"].each do |sub_dir|
+                        dir = File.join(project_dir, sub_dir)
+                        if File.exist?(dir)
+                            ipa_files.concat(Dir.glob(File.join(dir, "*.ipa")))
+                        end
+                    end
+                    ipa_files.max_by { |f| File.mtime(f) } if ipa_files.any?
+                end
+
+                # 检测可用的 iPhone/iPad 设备
+                def detect_available_devices
+                    require 'json'
+                    require 'tempfile'
+
+                    # 使用 JSON 输出避免文本解析对齐问题
+                    json_tmpfile = Tempfile.new(['devicectl', '.json'])
+                    json_path = json_tmpfile.path
+                    json_tmpfile.close
+
+                    system("xcrun devicectl list devices --json-output \"#{json_path}\" >/dev/null 2>&1")
+
+                    unless File.exist?(json_path) && File.size(json_path) > 0
+                        json_tmpfile.unlink rescue nil
+                        raise Informative, "无法执行 xcrun devicectl，请确认 Xcode 已安装"
+                    end
+
+                    json_data = JSON.parse(File.read(json_path))
+                    json_tmpfile.unlink rescue nil
+
+                    devices = []
+                    device_list = json_data.dig('result', 'devices') || []
+
+                    device_list.each do |device|
+                        tunnel_state = device.dig('connectionProperties', 'tunnelState') || ''
+                        device_type = device.dig('hardwareProperties', 'deviceType') || ''
+                        name = device.dig('deviceProperties', 'name') || ''
+                        identifier = device['identifier'] || ''
+                        model = device.dig('hardwareProperties', 'marketingName') || ''
+                        product_type = device.dig('hardwareProperties', 'productType') || ''
+
+                        # 只保留 available（tunnelState 不是 unavailable）的 iPhone/iPad
+                        next if tunnel_state == 'unavailable'
+                        next unless device_type == 'iPhone' || device_type == 'iPad'
+
+                        devices << {
+                            name: name,
+                            identifier: identifier,
+                            model: "#{model} (#{product_type})",
+                            device_type: device_type
+                        }
+                    end
+
+                    devices
+                end
+
+                # 选择设备
+                def select_device(devices)
+                    if devices.size == 1
+                        return devices.first
+                    end
+
+                    # 多台设备，让用户选择
+                    puts "\n检测到 #{devices.size} 台可用设备:"
+                    devices.each_with_index do |device, index|
+                        puts "  [#{index + 1}] #{device[:name]} - #{device[:model]}"
+                    end
+
+                    selection = nil
+                    loop do
+                        print "\n请选择设备 [1-#{devices.size}]: "
+                        input = $stdin.gets
+                        if input.nil?
+                            raise Informative, "用户取消操作"
+                        end
+                        input = input.strip
+                        num = input.to_i
+                        if num >= 1 && num <= devices.size
+                            selection = num - 1
+                            break
+                        end
+                        puts "无效输入，请输入 1-#{devices.size} 之间的数字"
+                    end
+
+                    devices[selection]
+                end
+
+                # 安装 IPA 到设备
+                def install_ipa_to_device(ipa_file, device)
+                    puts "\n正在安装到 #{device[:name]}..."
+
+                    cmd = "xcrun devicectl device install app --device #{device[:identifier]} \"#{ipa_file}\" 2>&1"
+                    output = `#{cmd}`
+                    exit_code = $?.exitstatus
+
+                    if exit_code == 0
+                        puts "安装成功!"
+                    else
+                        puts output unless output.strip.empty?
+                        raise Informative, "安装失败 (exit code: #{exit_code})"
+                    end
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/ios.rb

@@ -8,6 +8,7 @@ require 'pindo/command/ios/podlint'
 require 'pindo/command/ios/podpush'
 require 'pindo/command/ios/podupdate'
 require 'pindo/command/ios/fixproj'
+require 'pindo/command/ios/install'
 
 module Pindo
   class Command

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

@@ -35,6 +35,7 @@ module Pindo
         puts "处理独立的 Unity 导出工程..."
         Pindo::GradleHelper.update_build_gradle(project_dir)
         Pindo::AndroidProjectHelper.add_unity_namespace(project_dir)
+        Pindo::AndroidProjectHelper.ensure_unity_il2cpp_jni_merge_depends_on!(project_dir)
         Pindo::AndroidProjectHelper.modify_il2cpp_config(project_dir)
         Pindo::AndroidProjectHelper.remove_desktop_google_service(project_dir)
 
@@ -61,6 +62,7 @@ module Pindo
 
             # Unity 特有的处理
             Pindo::AndroidProjectHelper.add_unity_namespace(unity_dir)
+            Pindo::AndroidProjectHelper.ensure_unity_il2cpp_jni_merge_depends_on!(unity_dir)
             Pindo::AndroidProjectHelper.modify_il2cpp_config(unity_dir)
             Pindo::AndroidProjectHelper.remove_desktop_google_service(unity_dir)
           end