Merge branch 'swiftLint-develop' of...

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

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHTalentProgramEvaluationView.swift

@@ -61,9 +61,9 @@ class YHTalentProgramEvaluationView: UIView {
         }
         if !retUrl.contains("navigationH=") {
             if retUrl.contains("?") {
-                retUrl = retUrl + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+                retUrl += "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
             } else {
-                retUrl = retUrl + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+                retUrl += "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
             }
         }
         vc.url = retUrl

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLiveAppointmentViewController.swift

@@ -269,9 +269,9 @@ class YHLiveAppointmentViewController: YHBaseViewController {
                     let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码
                     var oldUrl = liveInfo.live_h5_url
                     if oldUrl.contains("?") {
-                        oldUrl = oldUrl + "&appDeepLink=\(tmpT)"
+                        oldUrl += "&appDeepLink=\(tmpT)"
                     } else {
-                        oldUrl = oldUrl + "?appDeepLink=\(tmpT)"
+                        oldUrl += "?appDeepLink=\(tmpT)"
                     }
                     
                     DispatchQueue.main.async {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift

@@ -537,9 +537,9 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
                     let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码
                     var oldUrl = liveModel.live_h5_url
                     if oldUrl.contains("?") {
-                        oldUrl = oldUrl + "&appDeepLink=\(tmpT)"
+                        oldUrl += "&appDeepLink=\(tmpT)"
                     } 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)

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHVODPlayerViewController.swift

@@ -181,9 +181,9 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
                     let tmpT = url.base64Encoded ?? ""// 对deepLink使用 base64编码
                     var oldUrl = recordedDetailModel.recorded_h5_url
                     if oldUrl.contains("?") {
-                        oldUrl = oldUrl + "&appDeepLink=\(tmpT)"
+                        oldUrl += "&appDeepLink=\(tmpT)"
                     } else {
-                        oldUrl = oldUrl + "?appDeepLink=\(tmpT)"
+                        oldUrl += "?appDeepLink=\(tmpT)"
                     }
                     
                     DispatchQueue.main.async {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHVideoProgressControl.swift

@@ -299,7 +299,9 @@ extension YHVideoProgressControl: UICollectionViewDataSource, UICollectionViewDe
     }
     
     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)
         return cell
     }

galaxy/galaxy/Classes/Modules/Mine（我的）/ViewModel/YHMemberCenterViewModel.swift

@@ -14,8 +14,7 @@ class YHMemberCenterViewModel: YHBaseViewModel {
     func getMemberInfo(_ callBack: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Member.memberBenefits
-        _ = YHNetRequest.getRequest(url: strUrl) {
-            [weak self] json, _ in
+        _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, _ in
             // 1. json字符串 转 对象
             guard let self = self else { return }