cocoapods-aqara-localzedLoader 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65fde2314089ca7c92e7e54a8d14aa5187814c88910dd32253c68a9c88e39b50
-  data.tar.gz: 1d473cf4218ccece175364fc75d5163dcf3b79269af71892cd1af2e3144626a9
+  metadata.gz: 61f24b941b12ed539578952171873577a5856cf36e4f301a0275988eeb887e21
+  data.tar.gz: 6c00a48fe4b8f0f0377af8211fabd668f301b6ff5cd49bcf91df9dfd506cf4bc
 SHA512:
-  metadata.gz: 110d8909dcd64309485e7f598e1cf16d9e421caae29cbdc37f78b511ef641ebeac17981da07657e647a511b59ba8648689bfd8307e0438e6323b16aa03186e62
-  data.tar.gz: 0a164564d635693b193270ea003121ce67d44f5dd4749711fbe6dc32a14fa0c8170cfbeb591001e6d0f2b57341b92157db2b77a397a54a1e7e59a17253f86af5
+  metadata.gz: d6819a5c6016508558b75d5f2ffc7256c624421ec678bb2967b98970833daef17e0f9fb5ff29ed178112d92926e4aea590511615040174ef7ad148774556cd39
+  data.tar.gz: 96093c5cce53e157fbbf8ecbd72b4e9d571c957c67a42d9e089481b215b2e38487d925a586236486b6e3eb5497d17d5e0ef7e8bcfef64dcad5caf4e6a66b2060

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-aqara-localzedLoader (0.0.4)
+    cocoapods-aqara-localzedLoader (0.0.6)
       claide (>= 1.0.2, < 2.0)
       colored2
       fileutils

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

@@ -48,6 +48,7 @@ def MakeHeader(headerText):
     return s
 
 def DownLatestLocalizableSource(downloadPath):
+    print("开始发送下载请求...")
     iam_service = IamService()
     ak123 = 'AKLTMjQ5NzU0YWY0ODU1NGVjOGIwMmVlYzk3ZGVhMjgzZmM'
     sk = 'TkRZeE9UazRNVEl4TW1JNU5HSTRZV0U0TUdRNU1HTmxNMk5pWVRJMU1EYw=='
@@ -77,6 +78,7 @@ def DownLatestLocalizableSource(downloadPath):
             code.write(resp.content)
             code.close()
     else:
+        print(resp.text)
         raise Exception(resp.text)
 
 

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

@@ -1,3 +1,3 @@
 module Localzedloader
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

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

@@ -8,13 +8,32 @@ class BundleGenerater
 
   # INFO_PLIST_ARRAY = [NSAppleMusicUsageDescription","NSLocalNetworkUsageDescription"]
   INFO_PLIST_MAP = {:common_app_name=>["CFBundleDisplayName"],other_perm_camera_permission_description:["NSCameraUsageDescription"],other_perm_location_permission_description:["NSLocationAlwaysAndWhenInUseUsageDescription","NSLocationWhenInUseUsageDescription","NSLocationAlwaysUsageDescription"],other_perm_bluetooth_permission_description:["NSBluetoothPeripheralUsageDescription","NSBluetoothAlwaysUsageDescription"],access_content_permssion_storage:["NSPhotoLibraryUsageDescription"],other_perm_mic_permission_description:["NSMicrophoneUsageDescription"],other_set_permissions_homedata_desc:["NSHomeKitUsageDescription"],other_set_permissions_asr_text:["NSSpeechRecognitionUsageDescription"],device_add_device:["Add_Device_Title"],automation_add:["Add_Automation_Title"],device_create_scene:["Add_Scene_Title"]}
+
+  #定义类变量记录下载次数
+
+  @@download_Count = 1
+
+  def self.downloadxls(project_path)
+    if @@download_Count > 1
+      sleep 10
+    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
+
   def self.generate(project_path)
     # 下载excel
     puts "开始下载多语言文件...".green
-    Open3.capture3("cd #{File.dirname(__FILE__)};python3 DownloadNewLanguage.py #{project_path}")
-    # system "cd #{File.dirname(__FILE__)};python3 DownloadNewLanguage.py #{project_path}"
+
+
     f_path = "#{project_path}/download.xlsx"
-    print(f_path)
+    printf(f_path)
+
+    until File.exist?(f_path)
+      self.downloadxls(project_path)
+    end
 
     # 读取excel到内存
     file_til = File_util.new
@@ -139,6 +158,7 @@ class BundleGenerater
   #对多语言的value进行处理
   def self.handleValue(value='',stringElement = nil)
     #替换{=}
+    value = self.replace_placeholders value
     value = value.gsub(/{#}/,"%@")
     value = value.gsub(/""/,'"')
     value = value.gsub(/\\"/,'"')
@@ -154,6 +174,10 @@ class BundleGenerater
     value
   end
 
+  def self.replace_placeholders(str='')
+    return str.gsub(/%(\d+)\$s/, '%\1$@')
+  end
+
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aqara-localzedLoader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - zhaoxifan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler