Commit 8535fad8 authored by pete谢兆麟's avatar pete谢兆麟

Merge commit 'a4322112' into xiezhaolin

parents 1c2881a3 a4322112
source "https://rubygems.org" source "https://rubygems.org"
gem "fastlane" gem "fastlane"
gem "bundle" gem "cocoapods"
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path) eval_gemfile(plugins_path) if File.exist?(plugins_path)
...@@ -5,12 +5,25 @@ GEM ...@@ -5,12 +5,25 @@ GEM
base64 base64
nkf nkf
rexml rexml
activesupport (7.1.3.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6) addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0) public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
artifactory (3.0.17) artifactory (3.0.17)
atomos (0.1.3) atomos (0.1.3)
aws-eventstream (1.3.0) aws-eventstream (1.3.0)
aws-partitions (1.918.0) aws-partitions (1.919.0)
aws-sdk-core (3.192.1) aws-sdk-core (3.192.1)
aws-eventstream (~> 1, >= 1.3.0) aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0) aws-partitions (~> 1, >= 1.651.0)
...@@ -27,19 +40,61 @@ GEM ...@@ -27,19 +40,61 @@ GEM
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4) babosa (1.0.4)
base64 (0.2.0) base64 (0.2.0)
bundle (0.0.1) bigdecimal (3.1.7)
bundler
claide (1.1.0) claide (1.1.0)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
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)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored (1.2) colored (1.2)
colored2 (3.1.2) colored2 (3.1.2)
commander (4.6.0) commander (4.6.0)
highline (~> 2.0.0) highline (~> 2.0.0)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
declarative (0.0.20) declarative (0.0.20)
digest-crc (0.6.5) digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0) rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107) domain_name (0.6.20240107)
dotenv (2.8.1) dotenv (2.8.1)
drb (2.2.1)
emoji_regex (3.2.3) emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.110.0) excon (0.110.0)
faraday (1.10.3) faraday (1.10.3)
faraday-em_http (~> 1.0) faraday-em_http (~> 1.0)
...@@ -112,6 +167,9 @@ GEM ...@@ -112,6 +167,9 @@ GEM
xcpretty (~> 0.3.0) xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-plugin-pgyer (0.2.8) fastlane-plugin-pgyer (0.2.8)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3) gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0) google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a) google-apis-core (>= 0.11.0, < 2.a)
...@@ -153,21 +211,28 @@ GEM ...@@ -153,21 +211,28 @@ GEM
http-cookie (1.0.5) http-cookie (1.0.5)
domain_name (~> 0.5) domain_name (~> 0.5)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
jmespath (1.6.2) jmespath (1.6.2)
json (2.7.2) json (2.7.2)
jwt (2.8.1) jwt (2.8.1)
base64 base64
mini_magick (4.12.0) mini_magick (4.12.0)
mini_mime (1.1.5) mini_mime (1.1.5)
minitest (5.22.3)
molinillo (0.8.0)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.4.0) multipart-post (2.4.0)
mutex_m (0.2.0)
nanaimo (0.3.0) nanaimo (0.3.0)
nap (1.1.0)
naturally (2.2.1) naturally (2.2.1)
netrc (0.11.0)
nkf (0.2.0) nkf (0.2.0)
optparse (0.5.0) optparse (0.5.0)
os (1.1.4) os (1.1.4)
plist (3.7.1) plist (3.7.1)
public_suffix (5.0.5) public_suffix (4.0.7)
rake (13.2.1) rake (13.2.1)
representable (3.2.0) representable (3.2.0)
declarative (< 0.1.0) declarative (< 0.1.0)
...@@ -176,6 +241,7 @@ GEM ...@@ -176,6 +241,7 @@ GEM
retriable (3.1.2) retriable (3.1.2)
rexml (3.2.6) rexml (3.2.6)
rouge (2.0.7) rouge (2.0.7)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
rubyzip (2.3.2) rubyzip (2.3.2)
security (0.1.5) security (0.1.5)
...@@ -195,6 +261,10 @@ GEM ...@@ -195,6 +261,10 @@ GEM
tty-screen (0.8.2) tty-screen (0.8.2)
tty-spinner (0.9.3) tty-spinner (0.9.3)
tty-cursor (~> 0.7) tty-cursor (~> 0.7)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0) uber (0.1.0)
unicode-display_width (2.5.0) unicode-display_width (2.5.0)
word_wrap (1.0.0) word_wrap (1.0.0)
...@@ -215,7 +285,7 @@ PLATFORMS ...@@ -215,7 +285,7 @@ PLATFORMS
x86_64-darwin-23 x86_64-darwin-23
DEPENDENCIES DEPENDENCIES
bundle cocoapods
fastlane fastlane
fastlane-plugin-pgyer fastlane-plugin-pgyer
......
...@@ -3,18 +3,27 @@ default_platform(:ios) ...@@ -3,18 +3,27 @@ default_platform(:ios)
platform :ios do platform :ios do
desc "Description of what the lane does" desc "Description of what the lane does"
# 打包时候用的名称 例如 fastlane app # 打包时候用的名称 例如 fastlane app
bundle_id = "com.intelligence.galaxy"
adhoc_profile_name = "com.adhoc.profile"
release_profile_name = "dis.intelligence.com"
adhoc_pgyer_api_key = "ba79f62a052072f2486ad29632fefd46"
release_pgyer_api_key = "ac973522a8c357596c3dd58d311d10d8"
# 打adhoc包 执行命令 fastlane galaxyTest before_all do
# 拉取最新代码
develop_branch = "develop"
sh "git checkout #{develop_branch}"
sh "git pull origin #{develop_branch}"
cocoapods(use_bundle_exec: false)
end
# 打adhoc包 执行命令 fastlane galaxyTest
lane :galaxyTest do lane :galaxyTest do
# add actions here: https://docs.fastlane.tools/actions # add actions here: https://docs.fastlane.tools/actions
# 拉取最新代码
develop_branch = "develop"
sh "git checkout #{develop_branch}"
sh "git pull origin #{develop_branch}"
# sh "pod install --no-repo-update"
gym( gym(
workspace: 'galaxy.xcworkspace', workspace: 'galaxy.xcworkspace',
# 每次打包之前clean一下 # 每次打包之前clean一下
...@@ -40,7 +49,7 @@ platform :ios do ...@@ -40,7 +49,7 @@ platform :ios do
export_options: { export_options: {
signingStyle: "manual", signingStyle: "manual",
provisioningProfiles: { provisioningProfiles: {
"com.intelligence.galaxy" => "com.adhoc.profile", "#{bundle_id}" => "#{adhoc_profile_name}",
} }
} }
) )
...@@ -49,10 +58,10 @@ platform :ios do ...@@ -49,10 +58,10 @@ platform :ios do
# mac上的通知弹窗,通知打包完毕 # mac上的通知弹窗,通知打包完毕
notification(app_icon: "./fastlane/icon.png", title: "manager", subtitle: "打包成功,已导出安装包", message: "准备发布到蒲公英中……") notification(app_icon: "./fastlane/icon.png", title: "manager", subtitle: "打包成功,已导出安装包", message: "准备发布到蒲公英中……")
#配置上传蒲公英账号 蒲公英的 api_key和 user_key 用自己蒲公英账号的,别用我的!!!如果没有可删除 #配置上传蒲公英账号 蒲公英的 api_key
pgyer( pgyer(
# 蒲公英 API Key # 蒲公英 API Key
api_key: "ba79f62a052072f2486ad29632fefd46" api_key: "#{adhoc_pgyer_api_key}"
) )
end end
...@@ -62,12 +71,7 @@ platform :ios do ...@@ -62,12 +71,7 @@ platform :ios do
lane :galaxyRelease do lane :galaxyRelease do
# add actions here: https://docs.fastlane.tools/actions # add actions here: https://docs.fastlane.tools/actions
# 拉取最新代码
develop_branch = "develop"
sh "git checkout #{develop_branch}"
sh "git pull origin #{develop_branch}"
# sh "pod install --no-repo-update"
gym( gym(
workspace: 'galaxy.xcworkspace', workspace: 'galaxy.xcworkspace',
# 每次打包之前clean一下 # 每次打包之前clean一下
...@@ -93,7 +97,7 @@ platform :ios do ...@@ -93,7 +97,7 @@ platform :ios do
export_options: { export_options: {
signingStyle: "manual", signingStyle: "manual",
provisioningProfiles: { provisioningProfiles: {
"com.intelligence.galaxy" => "dis.intelligence.com", "#{bundle_id}" => "#{release_profile_name}",
} }
} }
) )
...@@ -105,7 +109,7 @@ platform :ios do ...@@ -105,7 +109,7 @@ platform :ios do
#配置上传蒲公英账号 蒲公英的 api_key和 user_key 用自己蒲公英账号的,别用我的!!!如果没有可删除 #配置上传蒲公英账号 蒲公英的 api_key和 user_key 用自己蒲公英账号的,别用我的!!!如果没有可删除
pgyer( pgyer(
# 蒲公英 API Key # 蒲公英 API Key
api_key: "ac973522a8c357596c3dd58d311d10d8" api_key: "#{release_pgyer_api_key}"
) )
end end
end end
\ No newline at end of file
This diff is collapsed.
...@@ -117,7 +117,7 @@ private extension YHStartPageViewController { ...@@ -117,7 +117,7 @@ private extension YHStartPageViewController {
agreeAlertView.cancelBlock = { agreeAlertView.cancelBlock = {
//点击了取消按钮 //点击了取消按钮
YHCommonAlertView.show("", "确认退出智汇银河App?", "退出", "继续使用") { YHCommonAlertView.show("", "确认退出银河港生活App?", "退出", "继续使用") {
//退出 //退出
exit(0) exit(0)
} callBack: { } callBack: {
......
...@@ -58,7 +58,7 @@ class YHAgreementAlertView: UIView { ...@@ -58,7 +58,7 @@ class YHAgreementAlertView: UIView {
label.textColor = UIColor.mainTextColor label.textColor = UIColor.mainTextColor
label.font = UIFont.PFSC_M(ofSize: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.numberOfLines = 0 label.numberOfLines = 0
label.text = "欢迎使用智汇银河App" label.text = "欢迎使用银河港生活App"
return label return label
}() }()
...@@ -143,9 +143,9 @@ class YHAgreementAlertView: UIView { ...@@ -143,9 +143,9 @@ class YHAgreementAlertView: UIView {
let a: ASAttributedString = .init("感谢您信任并使用智汇银河App,我们将通过", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor)) let a: ASAttributedString = .init("感谢您信任并使用银河港生活App,我们将通过", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor))
let aa: ASAttributedString = .init("《智汇银河App隐私协议》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action { let aa: ASAttributedString = .init("《银河港生活App隐私协议》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
if let block = self.urlBlock { if let block = self.urlBlock {
block(YHBaseUrlManager.shared.curPrivacyAgreementUrl()) block(YHBaseUrlManager.shared.curPrivacyAgreementUrl())
} }
...@@ -155,7 +155,7 @@ class YHAgreementAlertView: UIView { ...@@ -155,7 +155,7 @@ class YHAgreementAlertView: UIView {
let and: ASAttributedString = .init("和", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor)) let and: ASAttributedString = .init("和", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor))
let aab: ASAttributedString = .init("《智汇银河App用户条款》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action { let aab: ASAttributedString = .init("《银河港生活App用户条款》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
if let block = self.urlBlock { if let block = self.urlBlock {
block(YHBaseUrlManager.shared.curUserItemsUrl()) block(YHBaseUrlManager.shared.curUserItemsUrl())
} }
......
...@@ -188,9 +188,6 @@ extension YHServiceCenterMainViewModel { ...@@ -188,9 +188,6 @@ extension YHServiceCenterMainViewModel {
arrContactStausItmes.append(model2) arrContactStausItmes.append(model2)
} }
if resultModel.my_document { if resultModel.my_document {
//我的文书 //我的文书
let model4 = YHContactMainItemStatusModel() let model4 = YHContactMainItemStatusModel()
...@@ -200,7 +197,6 @@ extension YHServiceCenterMainViewModel { ...@@ -200,7 +197,6 @@ extension YHServiceCenterMainViewModel {
} }
if resultModel.my_signature { if resultModel.my_signature {
//我的签字 //我的签字
let model5 = YHContactMainItemStatusModel() let model5 = YHContactMainItemStatusModel()
model5.type = 5 model5.type = 5
......
智汇银河APP-iOS 银河港生活APP-iOS
================= =================
工程文件说明 工程文件说明
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "Group 2033194487@2x.png", "filename" : "Group 2033194490@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "Group 2033194487@3x.png", "filename" : "Group 2033194490@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment