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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  banner 默认
  登录逻辑
  bug修复

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

@@ -21,7 +21,7 @@ class YHHomePageViewController: YHBaseViewController {
         let flowLayout = YHHomeCollectionLayout()
         flowLayout.minimumInteritemSpacing = 7.0
         flowLayout.minimumColumnSpacing = 10.0
-        flowLayout.sectionInset = UIEdgeInsets(top: 0, left: 20, bottom: 20, right: 20)
+        flowLayout.sectionInset = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20)
         
         let collectinoView = UICollectionView(frame: .zero, collectionViewLayout: flowLayout)
         collectinoView.backgroundColor = .white
@@ -30,7 +30,6 @@ class YHHomePageViewController: YHBaseViewController {
         collectinoView.dataSource = self
         collectinoView.translatesAutoresizingMaskIntoConstraints = false
         collectinoView.alwaysBounceVertical = true
-        collectinoView.isPagingEnabled = false
         return collectinoView
     }()
     
@@ -85,7 +84,6 @@ private extension YHHomePageViewController {
             if self.viewModel.hasMoreForHomeNews == false {
                 homeCollectView.es.noticeNoMoreData()
             }
-//            self.homeCollectView.reloadData()
             self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
 
         }
@@ -95,13 +93,11 @@ private extension YHHomePageViewController {
         viewModel.getHomeNewsList(firstPageFlag : true) {[weak self] success, error in
             guard let self = self else { return }
             homeCollectView.es.stopPullToRefresh()
-            
+
             if self.viewModel.hasMoreForHomeNews == false {
                 homeCollectView.es.noticeNoMoreData()
             }
             self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
-
-//            self.homeCollectView.reloadData()
         }
     }
     
@@ -126,7 +122,7 @@ private extension YHHomePageViewController {
         
         homeHeaderView.frame = CGRect(x: 20, y: -YHHomeHeadView.viewH, width: KScreenWidth - 40, height: YHHomeHeadView.viewH)
         homeCollectView.addSubview(homeHeaderView)
-        homeCollectView.contentInset = UIEdgeInsets(top: YHHomeHeadView.viewH, left: 0, bottom: 20, right: 0)
+        homeCollectView.contentInset = UIEdgeInsets(top: YHHomeHeadView.viewH, left: 0, bottom: 0, right: 0)
         
         let tmpHeadView = homeCollectView.es.addPullToRefresh {
             self.loadFirstData()
@@ -216,6 +212,11 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
                 let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
                 vc.modalPresentationStyle = .custom
                 UIViewController.current?.navigationController?.present(vc, animated: true)
+                YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in
+                    guard let self = self else { return }
+                    tabBarController.selectedIndex = 1
+                    YHLoginManager.shared.loginSuccessActionBlock = nil
+                }
                 return false
             }
         }

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

@@ -67,7 +67,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
                         guard let self = self else { return }
                         if success {
                             operationFlag = true
-                            YHHUD.flash(message: "已点赞")
                             self.getData()
                         } else {
                             operationFlag = false
@@ -78,7 +77,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
                         guard let self = self else { return }
                         if success {
                             operationFlag = true
-                            YHHUD.flash(message: "已取消点赞")
                             self.getData()
                         } else {
                             operationFlag = false
@@ -100,7 +98,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
                         guard let self = self else { return }
                         if success {
                             operationFlag = true
-                            YHHUD.flash(message: "已收藏")
+                            YHHUD.flash(message: "已加入收藏")
                             self.getData()
                         } else {
                             operationFlag = false
@@ -111,7 +109,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
                         guard let self = self else { return }
                         if success {
                             operationFlag = true
-                            YHHUD.flash(message: "已取消收藏")
                             self.getData()
                         } else {
                             operationFlag = false

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

@@ -56,7 +56,7 @@ class YHHomeWebBottomView: UIView {
         }()
         addSubview(likeButton)
         likeButton.snp.makeConstraints { make in
-            make.right.equalTo(-31)
+            make.right.equalTo(-79)
             make.top.equalTo(10)
             make.height.equalTo(39)
             make.width.equalTo(24)
@@ -70,7 +70,7 @@ class YHHomeWebBottomView: UIView {
         }()
         addSubview(starButton)
         starButton.snp.makeConstraints { make in
-            make.right.equalTo(-79)
+            make.right.equalTo(-31)
             make.top.equalTo(10)
             make.height.equalTo(39)
             make.width.equalTo(24)

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

@@ -118,12 +118,14 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
     
     public func pagerView(_ pagerView: FSPagerView, cellForItemAt index: Int) -> FSPagerViewCell {
         let cell = pagerView.dequeueReusableCell(withReuseIdentifier: "cell", at: index)
-        let image = UIImage(named: "default_placeholder_image")?.bs_scaled(toWidth: UIDevice.kScreenW - 16*2, opaque: false)
-        cell.imageView?.image = image
         if index < dataArr.count {
             let model = dataArr[index]
-            if let url = URL(string: model.img_url) {
-                cell.imageView?.kf.setImage(with: url)
+            if model.id != 0 {
+                if let url = URL(string: model.img_url) {
+                    cell.imageView?.kf.setImage(with: url)
+                }
+            } else {
+                cell.imageView?.image = UIImage(named: model.img_url)
             }
 //            cell.textLabel?.text = model.name
         }

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

@@ -32,7 +32,6 @@ extension YHMyLikeViewModel {
             params = ["page": curPageIndex + 1,
                       "page_size": page_Size,
                       "operate_type": type]
-            curPageIndex = curPageIndex + 1
         }
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.user
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
@@ -55,10 +54,11 @@ extension YHMyLikeViewModel {
                     self.arrHomeNewsData = result.data
                 } else {
                     self.arrHomeNewsData?.append(contentsOf: result.data)
+                    curPageIndex = curPageIndex + 1
                 }
                 
                 if let count = self.arrHomeNewsData?.count {
-                    if count == self.totalCount {
+                    if count >= self.totalCount {
                         self.hasMoreForHomeNews = false
                     } else {
                         self.hasMoreForHomeNews = true
@@ -87,7 +87,6 @@ extension YHMyLikeViewModel {
         } else {
             params = ["page": curPageIndex + 1,
                       "page_size": page_Size]
-            curPageIndex = curPageIndex + 1
         }
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.userLook
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
@@ -110,10 +109,11 @@ extension YHMyLikeViewModel {
                     self.arrHomeNewsData = result.data
                 } else {
                     self.arrHomeNewsData?.append(contentsOf: result.data)
+                    curPageIndex = curPageIndex + 1
                 }
                 
                 if let count = self.arrHomeNewsData?.count {
-                    if count == self.totalCount {
+                    if count >= self.totalCount {
                         self.hasMoreForHomeNews = false
                     } else {
                         self.hasMoreForHomeNews = true