cocoapods-aqara-localzedLoader 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4cfe3b8655489f905a84c91c571b067d9751be203a11ccd923a54696db9d2b
-  data.tar.gz: 63dc9542c9ed8f33b533513c4d65c4020f6f0124f33282e981f4f8b8c7206352
+  metadata.gz: ca66c069a60268e820de61841a1822c4b0dd5451d3d11722737b6fd07a8ee7f7
+  data.tar.gz: 91b69746652c5f93f4ef4f15da3f6b9e5dc4caf5d614b599292de9c474248db8
 SHA512:
-  metadata.gz: 82b82152b80545354bd58f8179672d6e4849de7b5d279dc490f01caa1055df9c66ad8a26e4137f8c1760488b3ff9010f6d8712aa7c1007e775251fb84686b11c
-  data.tar.gz: 16e8ba489b6c4d4b685ccef6b714ad5742addb385eb30182f563af2d345d56b89a6667b5999dd944998fc9c2dc8b528667994709dbb2f15de69b8999b2e2d89a
+  metadata.gz: 10e9b060a91aed917cbfc26d792d6848b447973c2589183a3f02c47eefa2ee8a559a949a1233e96b18856ebfcf211939772a28b4a9840b34736922323c6548c0
+  data.tar.gz: fdf67d56ffd37644df469557c9da0452ce446f7c9058aeea23b41de231d0d057ce2ab48b087a7b243c55e2d9d3acd41ae1c78e5ddeb91c58026fafd10e37e19b

data/Gemfile

@@ -16,4 +16,5 @@ group :development do
   gem 'httparty'
   gem 'rubyXL'
   gem 'open3'
+  gem 'ruby-lsp'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-aqara-localzedLoader (0.0.8)
+    cocoapods-aqara-localzedLoader (0.0.9)
       claide (>= 1.0.2, < 2.0)
       colored2
       fileutils
@@ -13,26 +13,38 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (6.1.7)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     bacon (1.2.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.16.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.16.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -46,8 +58,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -67,94 +79,111 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    csv (3.3.0)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
+    csv (3.3.5)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    drb (2.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.15.5)
-    fileutils (1.7.2)
+    ffi (1.17.2-arm64-darwin)
+    fileutils (1.7.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    httparty (0.22.0)
+    httparty (0.23.1)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
-    i18n (1.12.0)
+    httpclient (2.9.0)
+      mutex_m
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    logger (1.7.0)
     mini_mime (1.1.5)
-    minitest (5.16.3)
-    mocha (2.0.2)
+    minitest (5.25.5)
+    mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
     molinillo (0.8.0)
     multi_xml (0.6.0)
-    nanaimo (0.3.0)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nokogiri (1.14.0-arm64-darwin)
+    nkf (0.2.0)
+    nokogiri (1.17.2-arm64-darwin)
       racc (~> 1.4)
-    open3 (0.1.0)
+    open3 (0.2.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
+    prism (1.4.0)
     public_suffix (4.0.7)
-    racc (1.6.2)
-    rake (13.0.6)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    racc (1.8.1)
+    rake (13.3.0)
+    rbs (3.6.1)
+      logger
+    rexml (3.4.1)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.4)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    ruby-lsp (0.24.1)
+      language_server-protocol (~> 3.17.0)
+      prism (>= 1.2, < 2.0)
+      rbs (>= 3, < 5)
+      sorbet-runtime (>= 0.5.10782)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
-    rubyXL (3.4.12)
-      nokogiri (>= 1.4.4)
+    rubyXL (3.4.33)
+      nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
+    securerandom (0.3.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    sorbet-runtime (0.5.12167)
     sync (0.5.0)
-    term-ansicolor (1.7.1)
+    term-ansicolor (1.11.2)
       tins (~> 1.0)
-    thor (1.2.1)
-    tins (1.31.1)
+    thor (1.3.2)
+    tins (1.38.0)
+      bigdecimal
       sync
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    zeitwerk (2.6.6)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
 
 PLATFORMS
   arm64-darwin-21
@@ -174,6 +203,7 @@ DEPENDENCIES
   prettybacon
   rake (>= 10.0)
   rspec (>= 3.0)
+  ruby-lsp
   rubyXL
   rubyzip
 

data/lib/cocoapods-aqara-localzedLoader/DownloadNewLanguage.py

@@ -1,5 +1,6 @@
 import shutil
 import os, sys, stat
+import time
 import requests
 # import zipfile
 
@@ -40,7 +41,22 @@ timestamp: 1690280776221
 user-agent: Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Mobile Safari/537.36
 '''
 
+def get_ak_sk():
+    """从环境变量读取 AK/SK，未配置时回退到本地默认值。"""
+    ak_env = os.getenv("VOLC_ACCESSKEY") or os.getenv("VOLCENGINE_ACCESS_KEY")
+    sk_env = os.getenv("VOLC_SECRETKEY") or os.getenv("VOLCENGINE_SECRET_KEY")
 
+    # 兼容现有脚本中写死的 AK/SK（建议在外部通过环境变量配置）
+    default_ak = 'AKLTMjQ5NzU0YWY0ODU1NGVjOGIwMmVlYzk3ZGVhMjgzZmM'
+    default_sk = 'TkRZeE9UazRNVEl4TW1JNU5HSTRZV0U0TUdRNU1HTmxNMk5pWVRJMU1EYw=='
+
+    ak = ak_env or default_ak
+    sk = sk_env or default_sk
+
+    if not ak or not sk:
+        raise RuntimeError("未找到火山引擎 AK/SK，请配置 VOLC_ACCESSKEY / VOLC_SECRETKEY 环境变量")
+
+    return ak, sk
 
 def MakeHeader(headerText):
     s = headerText.strip().split('\n')
@@ -49,37 +65,77 @@ def MakeHeader(headerText):
 
 def DownLatestLocalizableSource(downloadPath):
     print("开始发送下载请求...")
+
+    # 确保下载目录存在
+    if not os.path.isdir(downloadPath):
+        os.makedirs(downloadPath, exist_ok=True)
+
+    # 加载 AK/SK
+    ak123, sk = get_ak_sk()
+
     iam_service = IamService()
-    ak123 = 'AKLTMjQ5NzU0YWY0ODU1NGVjOGIwMmVlYzk3ZGVhMjgzZmM'
-    sk = 'TkRZeE9UazRNVEl4TW1JNU5HSTRZV0U0TUdRNU1HTmxNMk5pWVRJMU1EYw=='
     iam_service.set_ak(ak123)
     iam_service.set_sk(sk)
 
-    api_info = ApiInfo("GET", "/", {"serviceName": "i18n_openapi", "Action": "ProjectNamespaceTextDownload",
-                                    "Version": "2021-05-21"}, {}, {})
-    service_info = ServiceInfo("iam.volcengineapi.com", {'Accept': 'application/json'},
-                               Credentials(ak123,sk, 'i18n_openapi', 'cn-north-1'),20,20)
+    # 使用 OpenAPI 网关域名，结合 serviceName = i18n_openapi
+    # 参考 Node SDK 的 OpenAPI 用法，统一走 open.volcengineapi.com
+    connection_timeout = 10      # 建连超时
+    socket_timeout = 300         # 读取超时（导出大项目时可能比较慢）
+
+    service_info = ServiceInfo(
+        "open.volcengineapi.com",
+        {'Accept': 'application/json'},
+        Credentials(ak123, sk, 'i18n_openapi', 'cn-north-1'),
+        connection_timeout,
+        socket_timeout
+    )
     iam_service.service_info = service_info
 
-    params = {'async': 0, 'projectId': 5788, 'namespaceId': 42835, 'format': 'xlsx'}
-
+    # OpenAPI 的 Action / Version / serviceName 与文档保持一致
+    api_info = ApiInfo(
+        "GET",
+        "/",
+        {"serviceName": "i18n_openapi", "Action": "ProjectNamespaceTextDownload", "Version": "2021-05-21"},
+        {},
+        {}
+    )
+
+    params = {
+        'async': 0,           # 同步导出；如仍然超时，可改为 1 走异步任务
+        'projectId': 5788,
+        'namespaceId': 42835,
+        'format': 'xlsx',
+    }
+
+    # 生成并签名请求
     r = iam_service.prepare_request(api_info, params, 0)
     SignerV4.sign(r, service_info.credentials)
     url = r.build(0)
-    # print(r.headers)
-    # res = iam_service.projectNamespaceTextDownload(params)
-
-    resp = iam_service.session.get(url, headers=r.headers,
-                            timeout=(service_info.connection_timeout,service_info.socket_timeout))
-    if resp.status_code == 200:
-        print('下载exccel成功')
-        with open(downloadPath+"/download.xlsx", "wb") as code:
-            # 将 response 保存成本地文件
-            code.write(resp.content)
-            code.close()
-    else:
-        print(resp.text)
-        raise Exception(resp.text)
+
+    # 使用流式下载 + 调大的超时，避免大文件导出导致总是超时
+    resp = iam_service.session.get(
+        url,
+        headers=r.headers,
+        timeout=(service_info.connection_timeout, service_info.socket_timeout),
+        stream=True,
+    )
+
+    if resp.status_code != 200:
+        # 打印部分响应文本，方便排查权限 / 参数问题
+        print('下载失败，HTTP 状态码:', resp.status_code)
+        try:
+            print('响应内容预览:', resp.text[:1000])
+        except Exception:
+            pass
+        raise Exception(f"下载失败，状态码 {resp.status_code}")
+
+    out_file = os.path.join(downloadPath, "download.xlsx")
+    with open(out_file, "wb") as code:
+        for chunk in resp.iter_content(chunk_size=1024 * 128):
+            if chunk:
+                code.write(chunk)
+
+    print('下载 excel 成功:', out_file)
 
 
 

data/lib/cocoapods-aqara-localzedLoader/File_util.rb

@@ -9,7 +9,7 @@ class File_util
 
   attr_accessor :keys_hash
     #读取excel 返回StringElement数组
-    def read_excel(filename)
+    def read_excel(filename, crowdin = false)
       unless filename != nil
         puts "读取的excel为空"
         return
@@ -17,6 +17,20 @@ class File_util
 
       workbook = RubyXL::Parser.parse filename
       worksheet = workbook[0]
+
+      if crowdin
+        last_col_index = worksheet[0].cells.size # 当前最后一列索引+1
+
+        # 遍历 B 列（索引 1）所有行
+        worksheet.each_with_index do |row, row_index|
+          b_value = row && row[1] ? row[1].value : nil
+          worksheet.add_cell(row_index, last_col_index, b_value)
+        end
+
+        worksheet[0].cells[last_col_index] = worksheet.add_cell(0, last_col_index, 'zh-CN')
+        workbook.write(filename)
+      end
+
       row1 = worksheet[0]
       @key_hash = getkeyHash(row1)
       lang_hash = {}

data/lib/cocoapods-aqara-localzedLoader/gem_version.rb

@@ -1,3 +1,3 @@
 module Localzedloader
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

data/lib/cocoapods-aqara-localzedLoader/ios_bundle_generate.rb

@@ -51,13 +51,23 @@ class BundleGenerater
 
   @@download_Count = 1
 
-  def self.downloadxls(project_path)
+  def self.downloadxls(project_path, crowdin=false)
+    if @@download_Count > 10
+      puts "当前无网络，程序即将退出。"
+      exit(1)
+    end
     if @@download_Count > 1
-      sleep 10
+      base = 2
+      sleep_time = base * (2 ** (@@download_Count - 2))
+      puts "等待#{sleep_time}秒后重试..."
+      sleep sleep_time
     end
     puts "当前进行第#{@@download_Count}次尝试下载多语言文件"
-    #Open3.capture3("cd #{File.dirname(__FILE__)};python3 DownloadNewLanguage.py #{project_path}")
-    system "cd #{File.dirname(__FILE__)};python3 DownloadNewLanguage.py #{project_path}"
+    if crowdin
+      system "crowdin download sources"
+    else
+      system "cd #{File.dirname(__FILE__)};python3 DownloadNewLanguage.py #{project_path}"
+    end
     @@download_Count = @@download_Count + 1
   end
 
@@ -65,19 +75,28 @@ class BundleGenerater
     # 下载excel
     puts "开始下载多语言文件...".green
 
+    crowdin = true if File.exist? "#{project_path}/crowdin.yml"
 
     f_path = "#{project_path}/download.xlsx"
-    printf(f_path)
+    if crowdin
+      f_path = "#{project_path}/APP/Aqara_Home_App.xlsx"
+    end
+
+    puts f_path
 
     until File.exist?(f_path)
-      self.downloadxls(project_path)
+      self.downloadxls(project_path, crowdin)
     end
-
     # 读取excel到内存
     file_til = File_util.new
-    hash = file_til.read_excel f_path
+    hash = file_til.read_excel(f_path, crowdin)
     if File.exist? f_path
-      FileUtils.rm_rf f_path
+      if crowdin
+        parent_dir = File.dirname(f_path)
+        FileUtils.rm_rf(parent_dir)
+      else
+        FileUtils.rm_rf f_path
+      end
     end
     puts "一共有 #{hash.keys.size} 条文案".green
 
@@ -93,18 +112,26 @@ class BundleGenerater
 
     end
 
+    errors = []
     #生成资源文件
     hash.each do |key, stringElement|
-      num = 0
+      expected_count = nil
       stringElement.langHash.each do |lang, value|
         # puts "#{lang}:#{value}"
         next if lang.downcase === "selfkey" or value === nil or value === " " or value === ""
         value = self.handleValue value,stringElement
-        value.scan(/%@/) do |match|
-          num = match.size  if num == 0
-          if num != match.size
-            puts "key:#{key}中%@ 数量不一致,请检查".red
-          end
+        current_count = value.scan(/%@/).size
+
+        if expected_count.nil?
+          expected_count = current_count
+        elsif current_count != expected_count
+          errors << {
+            key: key,
+            lang: lang,
+            expected: expected_count,
+            actual: current_count
+          }
+          next
         end
         str = %Q|"#{key}" = "#{value}";\n|
         localized_file = "./#{lang}.lproj/Localizable.strings"
@@ -138,6 +165,17 @@ class BundleGenerater
       end
     end
 
+    #判读是否有多语言出现不同语种%@数量不匹配,出现后中断打包
+    if errors.any?
+      puts "以下 key 的 %@ 在不同语种的数量存在不一致，让产品交互速度改后再打包：\n".red
+      errors.each do |err|
+        puts "key: #{err[:key]} | 语言: #{err[:lang]} | 实际: #{err[:actual]} | 应为: #{err[:expected]}".red
+      end
+      exit(1)
+    else
+      puts "✅ 所有 key 的 %@ 在不同语种保持数量一致".green
+    end
+
     #验证导出的多语言包格式是否正确
     puts '开始校验多语言包格式'.red
     # puts "\e[31m 开始校验多语言包格式\e[0m"
@@ -185,7 +223,7 @@ class BundleGenerater
         FileUtils.mkdir_p dest
         FileUtils.mv("#{info_plist_file}",dest,force:true)
       end
-      FileUtils.rm_rf (File.dirname(path))
+      # FileUtils.rm_rf (File.dirname(path))
     end
     puts "多语言拷贝到目录:#{bundPath}"
     if copy_info_plist

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aqara-localzedLoader
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - zhaoxifan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Aqara 多语言从云端多语言平台下载并处理解析成Xcode需要的多语言文件