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

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -156,11 +156,14 @@ extension YHHomePageViewController: UICollectionViewDelegate, UICollectionViewDa
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         guard let model = self.viewModel.arrHomeNewsData?[indexPath.row] else { return }
-        
+        if model.type == 2 {
             let vc = YHHomeWebViewController()
             vc.url = YHConfigManager.shared.h5Url + "?id=\(model.id)"
             vc.id = model.id
             self.navigationController?.pushViewController(vc)
+        } else if model.type == 1 {
+            printLog("直接播放视频")
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHHomeCollectionViewCell.swift

@@ -178,9 +178,15 @@ extension YHHomeCollectionViewCell {
         heartImageViewBtn.isSelected = listModel.is_like
         
         if listModel.type == 1 {
+            //视频
             playButton.isHidden = false
+            
+            let tap = UITapGestureRecognizer(target: self, action: #selector(tapView(gestureRecognizer:)))
+            contentView.addGestureRecognizer(tap)
         } else {
+            //资讯
             playButton.isHidden = true
+            contentView.removeGestureRecognizers()
         }
     }
     
@@ -215,4 +221,9 @@ extension YHHomeCollectionViewCell {
             self.parentViewController?.navigationController?.present(vc, animated: true)
         }
     }
+    
+    
+    @objc func tapView(gestureRecognizer:UITapGestureRecognizer) {
+        clickPlayButton()
+    }
 }