cocoapods-aqara-localzedLoader 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4cfe3b8655489f905a84c91c571b067d9751be203a11ccd923a54696db9d2b
-  data.tar.gz: 63dc9542c9ed8f33b533513c4d65c4020f6f0124f33282e981f4f8b8c7206352
+  metadata.gz: 70f7cdf4029ec8ec4a7a1b0f49700e141507fa80073509d21835b0c82e71ff94
+  data.tar.gz: 7d0dc878df2a7e977e0555adcb1a6b8e130f7b477c5cb984cc1d4ccc2221b8e8
 SHA512:
-  metadata.gz: 82b82152b80545354bd58f8179672d6e4849de7b5d279dc490f01caa1055df9c66ad8a26e4137f8c1760488b3ff9010f6d8712aa7c1007e775251fb84686b11c
-  data.tar.gz: 16e8ba489b6c4d4b685ccef6b714ad5742addb385eb30182f563af2d345d56b89a6667b5999dd944998fc9c2dc8b528667994709dbb2f15de69b8999b2e2d89a
+  metadata.gz: be02d3c670ea91b1883c6b2b4f45f2006d5abed9e867eeaa15fca706f56d997ae029e6f8d016996d2e8df57f172299fb8e0b60eb54832af6976ca52afdd57018
+  data.tar.gz: cb182f9cbc60eb5810d6736f8e34923b0f2dcb950c6d305f5bea1474af33e15775379d2c502107811d216a15bc83305006b42bbc60bc3be5d0bd3c71143038b6

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

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

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

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

@@ -52,11 +52,17 @@ class BundleGenerater
   @@download_Count = 1
 
   def self.downloadxls(project_path)
+    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}"
     @@download_Count = @@download_Count + 1
   end
@@ -72,7 +78,6 @@ class BundleGenerater
     until File.exist?(f_path)
       self.downloadxls(project_path)
     end
-
     # 读取excel到内存
     file_til = File_util.new
     hash = file_til.read_excel f_path
@@ -93,18 +98,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 +151,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"

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.9
 platform: ruby
 authors:
 - zhaoxifan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler