pindo 5.10.9 → 5.11.2

data/lib/pindo/command.rb

@@ -38,14 +38,11 @@ module Pindo
         require 'pindo/module/appstore/appstore_metadata_connect_api_helper'
 
         require 'pindo/command/deploy'
-        require 'pindo/command/dev'
         require 'pindo/command/env'
-        require 'pindo/command/lib'
         require 'pindo/command/utils'
         require 'pindo/command/jps'
         require 'pindo/command/setup'
-        require 'pindo/command/repo'
-        require 'pindo/command/ipa'
+        # require 'pindo/command/repo'
         require 'pindo/command/appstore'
         require 'pindo/command/gplay'
         require 'pindo/command/unity'

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

@@ -23,7 +23,7 @@ module Pindo
             app_id_suffix = workflow_packname.gsub(/[^a-zA-Z0-9]/, '').downcase
             application_id = "com.heroneverdie101.#{app_id_suffix}"
             package_scheme = workflow_packname.gsub(/[^a-zA-Z0-9]/, '').downcase
-            bundle_scheme = application_id.gsub(/[^a-zA-Z0-9]/, '').downcase
+            # bundle_scheme 现在在 update_application_id 中处理
 
             # 1. 更新 App Name
             success_app_name = update_app_name_with_packagename(
@@ -46,16 +46,10 @@ module Pindo
                 puts "  ✓ 已添加Scheme: #{package_scheme} (基于 Package Name)"
             end
 
-            # 4. 添加基于 Application ID 的 Scheme
-            success_bundle_scheme = add_test_scheme(
-                project_dir: project_dir,
-                scheme_name: bundle_scheme
-            )
-            if success_bundle_scheme
-                puts "  ✓ 已添加Scheme: #{bundle_scheme} (基于 Application ID)"
-            end
+            # 注意：基于 Application ID 的 Scheme 将在 update_application_id 方法中添加
+            # 因为 Application ID 可能在后续流程中被覆盖
 
-            return success_app_name && success_app_id && success_package_scheme && success_bundle_scheme
+            return success_app_name && success_app_id && success_package_scheme
         end
 
         # 更新Android工程版本号
@@ -539,6 +533,85 @@ module Pindo
             end
         end
 
+        # 添加基于 Application ID 的 Scheme
+        # 读取当前项目的 Application ID 并添加对应的 Scheme
+        # @param project_dir [String] Android项目目录路径
+        # @return [Boolean] 是否成功添加
+        def self.add_application_id_based_scheme(project_dir: nil)
+            # 参数验证
+            if project_dir.nil? || !File.directory?(project_dir)
+                Funlog.instance.fancyinfo_error("项目路径无效: #{project_dir}")
+                return false
+            end
+
+            begin
+                # 获取主模块
+                main_module = Pindo::AndroidProjectHelper.get_main_module(project_dir)
+
+                # 支持多种项目结构
+                module_paths = []
+                module_paths << File.join(project_dir, main_module) if main_module
+                module_paths << File.join(project_dir, "app")
+                module_paths << File.join(project_dir, "unityLibrary/launcher")
+                module_paths << File.join(project_dir, "launcher")
+
+                gradle_file = nil
+                module_paths.each do |module_path|
+                    next unless File.exist?(module_path)
+
+                    if File.exist?(File.join(module_path, "build.gradle"))
+                        gradle_file = File.join(module_path, "build.gradle")
+                        break
+                    elsif File.exist?(File.join(module_path, "build.gradle.kts"))
+                        gradle_file = File.join(module_path, "build.gradle.kts")
+                        break
+                    end
+                end
+
+                if gradle_file.nil?
+                    Funlog.instance.fancyinfo_error("未找到build.gradle文件，无法读取 Application ID")
+                    return false
+                end
+
+                # 读取gradle文件，提取当前的 Application ID
+                content = File.read(gradle_file)
+                application_id = nil
+
+                # 匹配各种 applicationId 格式
+                if content =~ /applicationId\s+["']([^"']+)["']/
+                    application_id = $1
+                elsif content =~ /applicationId\s*=\s*["']([^"']+)["']/
+                    application_id = $1
+                end
+
+                if application_id.nil?
+                    Funlog.instance.fancyinfo_error("无法从 gradle 文件中读取 Application ID")
+                    return false
+                end
+
+                # 将 Application ID 转换为合法的 scheme 名称（只保留字母和数字）
+                bundle_scheme = application_id.gsub(/[^a-zA-Z0-9]/, '').downcase
+
+                # 添加 Scheme
+                success_scheme = add_test_scheme(
+                    project_dir: project_dir,
+                    scheme_name: bundle_scheme
+                )
+
+                if success_scheme
+                    puts "  ✓ 已添加Scheme: #{bundle_scheme} (基于 Application ID: #{application_id})"
+                    return true
+                else
+                    Funlog.instance.fancyinfo_error("添加 Scheme 失败: #{bundle_scheme}")
+                    return false
+                end
+
+            rescue StandardError => e
+                Funlog.instance.fancyinfo_error("添加基于 Application ID 的 Scheme 失败: #{e.message}")
+                return false
+            end
+        end
+
         # 添加测试scheme到Android工程
         # @param project_dir [String] Android项目目录路径
         # @param scheme_name [String] 要添加的scheme名称

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

@@ -240,6 +240,9 @@ module Pindo
                     update_manifest_to_standard(manifest_path: manifest_path)
                 end
 
+                # 3.5 更新所有 XML 文件中的图标引用
+                update_all_xml_icon_references(proj_dir: proj_dir)
+
                 # 4. 安装标准 icon 文件
                 success_count = 0
                 densities_installed = []
@@ -289,6 +292,53 @@ module Pindo
             end
         end
 
+        # 更新所有 XML 文件中的图标引用（从旧名称更新为标准名称）
+        # @param proj_dir [String] Android项目目录
+        # @return [Boolean] 是否成功更新
+        def self.update_all_xml_icon_references(proj_dir: nil)
+            return false unless proj_dir && File.directory?(proj_dir)
+
+            begin
+                updated_files = []
+
+                # 查找所有 XML 文件
+                xml_files = Dir.glob(File.join(proj_dir, "**/*.xml"))
+                    .reject { |f| f.include?("/build/") || f.include?("/.gradle/") }
+
+                xml_files.each do |xml_file|
+                    content = File.read(xml_file)
+                    original_content = content.dup
+
+                    # 替换所有旧的图标引用为标准名称
+                    # app_icon -> ic_launcher
+                    # app_icon_round -> ic_launcher_round
+                    content.gsub!('@mipmap/app_icon_round', '@mipmap/ic_launcher_round')
+                    content.gsub!('@mipmap/app_icon', '@mipmap/ic_launcher')
+                    content.gsub!('@drawable/app_icon_round', '@drawable/ic_launcher_round')
+                    content.gsub!('@drawable/app_icon', '@drawable/ic_launcher')
+
+                    # 如果内容有变化，保存文件
+                    if content != original_content
+                        File.write(xml_file, content)
+                        relative_path = xml_file.sub(proj_dir + '/', '')
+                        updated_files << relative_path
+                        puts "  ✓ 更新图标引用: #{relative_path}"
+                    end
+                end
+
+                if updated_files.empty?
+                    puts "  ✓ 所有 XML 文件的图标引用已是标准配置"
+                else
+                    puts "  ✓ 已更新 #{updated_files.length} 个文件的图标引用"
+                end
+
+                return true
+            rescue => e
+                Funlog.instance.fancyinfo_error("更新 XML 图标引用失败: #{e.message}")
+                return false
+            end
+        end
+
     end
 
 end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.10.9"
+  VERSION = "5.11.2"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.10.9
+  version: 5.11.2
 platform: ruby
 authors:
 - wade
@@ -314,10 +314,14 @@ files:
 - lib/pindo/command.rb
 - lib/pindo/command/android.rb
 - lib/pindo/command/android/autobuild.rb
+- lib/pindo/command/android/autoresign.rb
 - lib/pindo/command/android/build.rb
-- lib/pindo/command/android/debug.rb
+- lib/pindo/command/android/keystore.rb
 - lib/pindo/command/appstore.rb
+- lib/pindo/command/appstore/adhocbuild.rb
+- lib/pindo/command/appstore/autoresign.rb
 - lib/pindo/command/appstore/iap.rb
+- lib/pindo/command/appstore/import.rb
 - lib/pindo/command/appstore/itcapp.rb
 - lib/pindo/command/appstore/metadata.rb
 - lib/pindo/command/appstore/screenshots.rb
@@ -346,20 +350,14 @@ files:
 - lib/pindo/command/deploy/tag.rb
 - lib/pindo/command/deploy/updateconfig.rb
 - lib/pindo/command/deploy/uploadipa.rb
-- lib/pindo/command/dev.rb
 - lib/pindo/command/dev/autobuild.rb
 - lib/pindo/command/dev/build.rb
 - lib/pindo/command/dev/debug.rb
-- lib/pindo/command/dev/feishu.rb
-- lib/pindo/command/dev/repoinit.rb
-- lib/pindo/command/dev/tag.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb
 - lib/pindo/command/env/quarkenv.rb
 - lib/pindo/command/env/swarkenv.rb
 - lib/pindo/command/env/workhard.rb
-- lib/pindo/command/feishu.rb
-- lib/pindo/command/feishu/send_message.rb
 - lib/pindo/command/gplay.rb
 - lib/pindo/command/gplay/iap.rb
 - lib/pindo/command/gplay/itcapp.rb
@@ -368,16 +366,14 @@ files:
 - lib/pindo/command/gplay/screenshots.rb
 - lib/pindo/command/gplay/upload.rb
 - lib/pindo/command/ios.rb
-- lib/pindo/command/ios/adhoc.rb
 - lib/pindo/command/ios/applovin.rb
 - lib/pindo/command/ios/autobuild.rb
 - lib/pindo/command/ios/autoresign.rb
 - lib/pindo/command/ios/build.rb
-- lib/pindo/command/ios/debug.rb
-- lib/pindo/command/ipa.rb
-- lib/pindo/command/ipa/autoresign.rb
-- lib/pindo/command/ipa/import.rb
-- lib/pindo/command/ipa/output.rb
+- lib/pindo/command/ios/cert.rb
+- lib/pindo/command/ios/podlint.rb
+- lib/pindo/command/ios/podpush.rb
+- lib/pindo/command/ios/podupdate.rb
 - lib/pindo/command/jps.rb
 - lib/pindo/command/jps/apptest.rb
 - lib/pindo/command/jps/bind.rb
@@ -386,11 +382,6 @@ files:
 - lib/pindo/command/jps/login.rb
 - lib/pindo/command/jps/resign.rb
 - lib/pindo/command/jps/upload.rb
-- lib/pindo/command/lib.rb
-- lib/pindo/command/lib/forcepush.rb
-- lib/pindo/command/lib/lint.rb
-- lib/pindo/command/lib/push.rb
-- lib/pindo/command/lib/update.rb
 - lib/pindo/command/repo.rb
 - lib/pindo/command/repo/clone.rb
 - lib/pindo/command/repo/create.rb
@@ -400,18 +391,21 @@ files:
 - lib/pindo/command/unity.rb
 - lib/pindo/command/unity/apk.rb
 - lib/pindo/command/unity/autobuild.rb
-- lib/pindo/command/unity/initpack.rb
 - lib/pindo/command/unity/ipa.rb
-- lib/pindo/command/unity/pack.rb
-- lib/pindo/command/unity/upload.rb
+- lib/pindo/command/unity/packbuild.rb
+- lib/pindo/command/unity/packinit.rb
+- lib/pindo/command/unity/packpush.rb
 - lib/pindo/command/unity/web.rb
 - lib/pindo/command/utils.rb
 - lib/pindo/command/utils/boss.rb
 - lib/pindo/command/utils/clearcert.rb
 - lib/pindo/command/utils/device.rb
+- lib/pindo/command/utils/feishu.rb
 - lib/pindo/command/utils/icon.rb
 - lib/pindo/command/utils/renewcert.rb
 - lib/pindo/command/utils/renewproj.rb
+- lib/pindo/command/utils/repoinit.rb
+- lib/pindo/command/utils/tag.rb
 - lib/pindo/command/utils/tgate.rb
 - lib/pindo/command/utils/xcassets.rb
 - lib/pindo/command/utils/xcassets.sh

data/lib/pindo/command/dev.rb

@@ -1,21 +0,0 @@
-# require 'pindo/command/dev/create'
-
-
-require 'pindo/command/dev/tag'
-require 'pindo/command/dev/debug'
-require 'pindo/command/dev/autobuild'
-require 'pindo/command/dev/build'
-require 'pindo/command/dev/repoinit'
-require 'pindo/command/dev/feishu'
-
-module Pindo
-    class Command
-        
-        class Dev < Command
-            self.abstract_command = true
-            self.summary = '开发阶段使用的相关命令'
-
-        end
-        
-    end
-end

data/lib/pindo/command/feishu/send_message.rb

@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-require 'net/http'
-require 'uri'
-require 'pindo/client/httpclient'
-
-module Pindo
-  module Command
-    module Feishu
-      class SendMessage
-        def self.run(options)
-          new(options).run
-        end
-
-        def initialize(options)
-          @options = options
-          @webhook_url = options[:webhook_url]
-          @message = options[:message]
-          @title = options[:title] || "通知"
-          @at_all = options[:at_all] || false
-        end
-
-        def run
-          unless @webhook_url
-            puts "错误：未提供飞书 webhook URL"
-            return false
-          end
-
-          unless @message
-            puts "错误：未提供消息内容"
-            return false
-          end
-
-          send_message
-        end
-
-        private
-
-        def send_message
-          uri = URI(@webhook_url)
-          
-          # 构建消息内容
-          content = {
-            "msg_type": "post",
-            "content": {
-              "post": {
-                "zh_cn": {
-                  "title": @title,
-                  "content": [
-                    [
-                      {
-                        "tag": "text",
-                        "text": @message
-                      }
-                    ]
-                  ]
-                }
-              }
-            }
-          }
-
-          # 如果需要@所有人
-          if @at_all
-            content[:content][:post][:zh_cn][:content][0].unshift(
-              {
-                "tag": "at",
-                "user_id": "all"
-              }
-            )
-          end
-
-          # 发送请求
-          begin
-            con = HttpClient.create_instance_with_proxy
-            res = con.post do |req|
-              req.url uri
-              req.headers['Content-Type'] = 'application/json'
-              req.body = content.to_json
-            end
-
-            if res.status == 200
-              result = JSON.parse(res.body)
-              if result['code'] == 0
-                puts "消息发送成功！"
-                return true
-              else
-                puts "消息发送失败：#{result['msg']}"
-                return false
-              end
-            else
-              puts "消息发送失败：HTTP #{res.status}"
-              return false
-            end
-          rescue => e
-            puts "发送消息时出错：#{e.message}"
-            return false
-          end
-        end
-      end
-    end
-  end
-end 

data/lib/pindo/command/feishu.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'claide'
-require 'pindo/command/feishu/send_message'
-
-module Pindo
-  module Command
-    class Feishu < CLAide::Command
-      self.description = '飞书相关命令'
-      self.command = 'feishu'
-      self.abstract_command = true
-
-      def self.options
-        [
-          ['--webhook-url=URL', '飞书 webhook URL'],
-          ['--message=MESSAGE', '要发送的消息内容'],
-          ['--title=TITLE', '消息标题（可选）'],
-          ['--at-all', '是否@所有人（可选）']
-        ]
-      end
-
-      def initialize(argv)
-        super
-        @webhook_url = argv.option('webhook-url')
-        @message = argv.option('message')
-        @title = argv.option('title')
-        @at_all = argv.flag?('at-all')
-      end
-
-      def validate!
-        super
-        unless @webhook_url
-          help! '必须提供 webhook URL'
-        end
-        unless @message
-          help! '必须提供消息内容'
-        end
-      end
-
-      def run
-        Pindo::Command::Feishu::SendMessage.run(
-          webhook_url: @webhook_url,
-          message: @message,
-          title: @title,
-          at_all: @at_all
-        )
-      end
-    end
-  end
-end