Merge branch 'xiezhaolin' into develop

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

@@ -30,6 +30,7 @@ class YHHomeCollectionViewCell: UICollectionViewCell {
     lazy var titleImageView:UIImageView = {
         let imageV = UIImageView(image: UIImage(named: "home_banner_default_icon"))
         imageV.contentMode = .scaleAspectFill
+        imageV.isUserInteractionEnabled = true
         return imageV
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewControllerHoldViewController.swift

@@ -112,14 +112,14 @@ class YHPreviewControllerHoldViewController: UIViewController {
         super.viewWillAppear(animated)
 
         //处于第一个item的时候，才允许屏幕边缘手势返回
-        navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
+//        navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
 
         //离开页面的时候，需要恢复屏幕边缘手势，不能影响其他页面
-        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+//        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
     }
     
     override func viewDidLayoutSubviews() {