Commit 87fa4d4a authored by pete谢兆麟's avatar pete谢兆麟

Merge branch 'swiftLint-develop' of...

Merge branch 'swiftLint-develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into swiftLint-develop
parents a6f2fd26 1dbc22ef
...@@ -61,9 +61,9 @@ class YHTalentProgramEvaluationView: UIView { ...@@ -61,9 +61,9 @@ class YHTalentProgramEvaluationView: UIView {
} }
if !retUrl.contains("navigationH=") { if !retUrl.contains("navigationH=") {
if retUrl.contains("?") { if retUrl.contains("?") {
retUrl = retUrl + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)" retUrl += "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
} else { } else {
retUrl = retUrl + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)" retUrl += "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
} }
} }
vc.url = retUrl vc.url = retUrl
......
...@@ -269,9 +269,9 @@ class YHLiveAppointmentViewController: YHBaseViewController { ...@@ -269,9 +269,9 @@ class YHLiveAppointmentViewController: YHBaseViewController {
let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码 let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码
var oldUrl = liveInfo.live_h5_url var oldUrl = liveInfo.live_h5_url
if oldUrl.contains("?") { if oldUrl.contains("?") {
oldUrl = oldUrl + "&appDeepLink=\(tmpT)" oldUrl += "&appDeepLink=\(tmpT)"
} else { } else {
oldUrl = oldUrl + "?appDeepLink=\(tmpT)" oldUrl += "?appDeepLink=\(tmpT)"
} }
DispatchQueue.main.async { DispatchQueue.main.async {
......
...@@ -537,9 +537,9 @@ class YHLivePlayerViewController: YHBasePlayerViewController { ...@@ -537,9 +537,9 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码 let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码
var oldUrl = liveModel.live_h5_url var oldUrl = liveModel.live_h5_url
if oldUrl.contains("?") { if oldUrl.contains("?") {
oldUrl = oldUrl + "&appDeepLink=\(tmpT)" oldUrl += "&appDeepLink=\(tmpT)"
} else { } else {
oldUrl = oldUrl + "?appDeepLink=\(tmpT)" oldUrl += "?appDeepLink=\(tmpT)"
} }
YHShareAlertView.show(image: liveModel.live_image, title: "@" + liveModel.account, subMessage: liveModel.live_title, linkUrl: oldUrl, isLive: true, fromAiSale: true) YHShareAlertView.show(image: liveModel.live_image, title: "@" + liveModel.account, subMessage: liveModel.live_title, linkUrl: oldUrl, isLive: true, fromAiSale: true)
......
...@@ -181,9 +181,9 @@ class YHVODPlayerViewController: YHBasePlayerViewController { ...@@ -181,9 +181,9 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码 let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码
var oldUrl = recordedDetailModel.recorded_h5_url var oldUrl = recordedDetailModel.recorded_h5_url
if oldUrl.contains("?") { if oldUrl.contains("?") {
oldUrl = oldUrl + "&appDeepLink=\(tmpT)" oldUrl += "&appDeepLink=\(tmpT)"
} else { } else {
oldUrl = oldUrl + "?appDeepLink=\(tmpT)" oldUrl += "?appDeepLink=\(tmpT)"
} }
DispatchQueue.main.async { DispatchQueue.main.async {
......
...@@ -299,7 +299,9 @@ extension YHVideoProgressControl: UICollectionViewDataSource, UICollectionViewDe ...@@ -299,7 +299,9 @@ extension YHVideoProgressControl: UICollectionViewDataSource, UICollectionViewDe
} }
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "SegmentCell", for: indexPath) as! SegmentCell guard segments.count > indexPath.item, let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "SegmentCell", for: indexPath) as? SegmentCell else {
return UICollectionViewCell()
}
cell.configure(with: segments[indexPath.item], isSelected: indexPath.item == currentSegmentIndex) cell.configure(with: segments[indexPath.item], isSelected: indexPath.item == currentSegmentIndex)
return cell return cell
} }
......
...@@ -14,8 +14,7 @@ class YHMemberCenterViewModel: YHBaseViewModel { ...@@ -14,8 +14,7 @@ class YHMemberCenterViewModel: YHBaseViewModel {
func getMemberInfo(_ callBack: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) { func getMemberInfo(_ callBack: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Member.memberBenefits let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Member.memberBenefits
_ = YHNetRequest.getRequest(url: strUrl) { _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, _ in
[weak self] json, _ in
// 1. json字符串 转 对象 // 1. json字符串 转 对象
guard let self = self else { return } guard let self = self else { return }
......
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