pindo 5.20.1 → 5.20.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 13ff08700f045507c1ef6bd4e615cce3a7f11968aaa4b9fba5bcedeeff535333
|
|
4
|
+
data.tar.gz: 78b2e1c891cf74286a424056a284a70062b20914800d80a2538132b2e4349faf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1967be55691c9fbd56f7be224ed3fa8c1bb2b9156fb4b4f5ce5dd723d6b970c4e82199a25c1088c2d6e8cb76c9739ca1269567749769fb99f8488a148a56d0a2
|
|
7
|
+
data.tar.gz: 03a8172270a79b1dff600dd0d087faa32570e70f0d84e0ca286cc23fb043c08f32a93692a4019a97306777975811ddf21b672ba8f58fa48ee8121b3e1fc844d3
|
|
@@ -82,15 +82,21 @@ module Pindo
|
|
|
82
82
|
workflow_packname: workflow_packname
|
|
83
83
|
)
|
|
84
84
|
|
|
85
|
-
# 下载并替换 Icon
|
|
86
|
-
|
|
85
|
+
# 下载并替换 Icon，优先使用 packageProjectIcon，为空则回退到 projectIcon
|
|
86
|
+
icon_url = nil
|
|
87
|
+
if @app_info_obj
|
|
88
|
+
icon_url = @app_info_obj["packageProjectIcon"] unless @app_info_obj["packageProjectIcon"].to_s.strip.empty?
|
|
89
|
+
icon_url ||= @app_info_obj["projectIcon"] unless @app_info_obj["projectIcon"].to_s.strip.empty?
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
if icon_url
|
|
87
93
|
icon_replace_success = Pindo::AndroidConfigHelper.download_and_replace_icon_from_url(
|
|
88
94
|
project_dir: @project_path,
|
|
89
|
-
icon_url:
|
|
95
|
+
icon_url: icon_url
|
|
90
96
|
)
|
|
91
97
|
|
|
92
98
|
unless icon_replace_success
|
|
93
|
-
raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{
|
|
99
|
+
raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{icon_url}"
|
|
94
100
|
end
|
|
95
101
|
else
|
|
96
102
|
Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
|
|
@@ -142,15 +142,21 @@ module Pindo
|
|
|
142
142
|
project_id: project_id
|
|
143
143
|
)
|
|
144
144
|
|
|
145
|
-
# 下载并替换 Icon
|
|
146
|
-
|
|
145
|
+
# 下载并替换 Icon，优先使用 packageProjectIcon，为空则回退到 projectIcon
|
|
146
|
+
icon_url = nil
|
|
147
|
+
if @app_info_obj
|
|
148
|
+
icon_url = @app_info_obj["packageProjectIcon"] unless @app_info_obj["packageProjectIcon"].to_s.strip.empty?
|
|
149
|
+
icon_url ||= @app_info_obj["projectIcon"] unless @app_info_obj["projectIcon"].to_s.strip.empty?
|
|
150
|
+
end
|
|
151
|
+
|
|
152
|
+
if icon_url
|
|
147
153
|
icon_replace_success = Pindo::XcodeBuildConfig.download_and_replace_icon_from_url(
|
|
148
154
|
project_dir: @project_path,
|
|
149
|
-
icon_url:
|
|
155
|
+
icon_url: icon_url
|
|
150
156
|
)
|
|
151
157
|
|
|
152
158
|
unless icon_replace_success
|
|
153
|
-
raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{
|
|
159
|
+
raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{icon_url}"
|
|
154
160
|
end
|
|
155
161
|
else
|
|
156
162
|
Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
|
data/lib/pindo/version.rb
CHANGED