Commit a415b91d authored by David黄金龙's avatar David黄金龙

Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  修改一处细节
  添加本地桶匹配逻辑
parents 67aaf214 cfb623b6
...@@ -159,7 +159,7 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -159,7 +159,7 @@ extension YHServiceOrderProgressTableViewCell {
} else { } else {
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8))) let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor)) let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("文书待确认哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8))) let aaa: ASAttributedString = .init("文书待返稿哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
messageLabel.attributed.text = a + aa + aaa messageLabel.attributed.text = a + aa + aaa
} }
......
...@@ -168,8 +168,14 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -168,8 +168,14 @@ class YHOSSManager: NSObject, URLSessionDelegate {
} }
func getBucket(_ url: String) -> String { func getBucket(_ url: String) -> String {
if url.contains(self.model.bucket) { if url.contains("test-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com") {
return self.model.bucket return "test-bucket-v1-pub"
}else if url.contains("prod-bucket-v1.oss-cn-shenzhen.aliyuncs.com") {
return "prod-bucket-v1"
}else if url.contains("prod-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com") {
return "prod-bucket-v1-pub"
} else if url.contains("test-bucket-v1.oss-cn-shenzhen.aliyuncs.com") {
return "test-bucket-v1"
} else if url.contains("test-cdn.galaxy-immi.com") { } else if url.contains("test-cdn.galaxy-immi.com") {
return "test-bucket-v1" return "test-bucket-v1"
} else if url.contains("test-cdn-pub.galaxy-immi.com") { } else if url.contains("test-cdn-pub.galaxy-immi.com") {
......
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