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

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

@@ -93,7 +93,7 @@ private extension YHHomeBannerCollectionViewCell {
                     bannerImagV.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in
                         switch result {
                         case .success: break
-                        case .failure(let error):
+                        case .failure(_):
                             self.bannerImagV.kf.setImage(with: url, placeholder: UIImage(named: "global_default_image"))
                         }
                     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/C/YHOfficialApprovalResultVC.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import FSPagerView
 
 /*
  正式批 结果页
@@ -78,6 +79,61 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
         return imageV
     }()
     
+    
+    
+    //bottom
+    lazy var bottomContentView: UIView = {
+        let view  = UIView()
+        view.backgroundColor = .clear //for test hjl
+        return view
+    }()
+    
+    
+    lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hex: 0xffffff, alpha: 0.6)
+        label.textAlignment = .center
+        label.font = UIFont.PFSC_R(ofSize:12)
+        label.text = "左滑查看其他获批信，当前 1/5"
+        return label
+    }()
+    
+    
+    
+    private lazy var bannerView: FSPagerView = {
+        let view = FSPagerView()
+        view.delegate = self
+        view.dataSource = self
+        view.bounces = false
+        view.isInfinite = false
+//        view.automaticSlidingInterval = bannerSildingInterval
+        view.register(YHHomeBannerCollectionViewCell.self, forCellWithReuseIdentifier: "cell")
+        view.itemSize = CGSizeMake(268.0, 148)
+        return view
+    }()
+    
+    lazy var indicatorView : YHHomeBannerIndicatorView = {
+        let view = YHHomeBannerIndicatorView()
+        return view
+    }()
+    
+    var dataArr: [YHBannerModel] = [] {
+        didSet {
+            // 设置为0是先停掉自动滑动定时器
+//            bannerView.automaticSlidingInterval = 0
+            self.indicatorView.indicatorItems = self.dataArr.count
+            bannerView.reloadData()
+            // 指定指示器为第一个
+            self.indicatorView.curIndicatorIndex = 0
+            // 指定显示图片为第一个
+            bannerView.selectItem(at: 0, animated: false)
+            // 开启定时器开始滚动
+//            bannerView.automaticSlidingInterval = bannerSildingInterval
+            bannerView.removesInfiniteLoopForSingleItem = true
+            bannerView.alwaysBounceHorizontal = true
+        }
+    }
+    
 }
 
 private extension YHOfficialApprovalResultVC {
@@ -151,6 +207,53 @@ private extension YHOfficialApprovalResultVC {
             make.height.equalTo(543)
         }
         lightImageV.layer.zPosition = 3
+        
+        
+        
+        
+        //底部内容区域
+        view.addSubview(bottomContentView)
+        bottomContentView.snp.makeConstraints { make in
+            make.bottom.left.right.equalToSuperview()
+//            make.height.equalTo(600)
+        }
+        bottomContentView.layer.zPosition = 4
+//        bottomContentView.backgroundColor = .red //for test hjl
+        
+        bottomContentView.addSubview(tipsLabel)
+        tipsLabel.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-50)
+            make.centerX.equalToSuperview()
+        }
+        
+        
+        bottomContentView.addSubview(indicatorView)
+        indicatorView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.height.equalTo(2)
+            make.bottom.equalTo(tipsLabel.snp.top).offset(-20)
+        }
+        
+        
+        bottomContentView.addSubview(bannerView)
+        bannerView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.height.equalTo(148)
+            make.bottom.equalTo(indicatorView.snp.top).offset(-16)
+            
+            make.top.equalToSuperview().offset(20)
+        }
+//        bannerView.backgroundColor = .purple //for test hjl
+        bannerView.layer.zPosition = 10
+        
+        
+//        let transform = CGAffineTransform(scaleX: 0.6, y: 0.75)
+        bannerView.transformer = FSPagerViewTransformer(type:.linear)
+//        bannerView.itemSize = CGSize(width: 268, height: 148).applying(transform)
+        
+        self.dataArr = [YHBannerModel(),YHBannerModel(),YHBannerModel()]//for test hjl
+        bannerView.reloadData()
+        
     }
     
     private func rotatedTransform() -> CGAffineTransform {
@@ -184,3 +287,39 @@ private extension YHOfficialApprovalResultVC {
         
     }
 }
+
+
+
+extension YHOfficialApprovalResultVC: FSPagerViewDataSource, FSPagerViewDelegate {
+    
+    public func numberOfItems(in pagerView: FSPagerView) -> Int {
+        return self.dataArr.count
+    }
+    
+    public func pagerView(_ pagerView: FSPagerView, cellForItemAt index: Int) -> FSPagerViewCell {
+        let cell = pagerView.dequeueReusableCell(withReuseIdentifier: "cell", at: index) as! YHHomeBannerCollectionViewCell
+        if index < dataArr.count {
+//            cell.dataModel = dataArr[index]
+            cell.contentView.backgroundColor = .red//for test hjl
+        }
+        return cell
+    }
+    
+    // MARK: - FSPagerView Delegate
+    func pagerView(_ pagerView: FSPagerView, didSelectItemAt index: Int) {
+        pagerView.deselectItem(at: index, animated: true)
+        pagerView.scrollToItem(at: index, animated: true)
+        if index >= dataArr.count {
+            return
+        }
+        
+    }
+    
+    func pagerViewWillEndDragging(_ pagerView: FSPagerView, targetIndex: Int) {
+        self.indicatorView.curIndicatorIndex = targetIndex
+    }
+    
+    func pagerViewDidEndScrollAnimation(_ pagerView: FSPagerView) {
+        self.indicatorView.curIndicatorIndex = pagerView.currentIndex
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -405,8 +405,8 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
         } else {
             isAuthString = "false"
         }
-//        let path = "/serviceHousekeeper/pages/documentEdit/documentEdit?id=\(self.id)&docType=\(self.fileType)&signId=\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)&auth=\(isAuthString)&order_id=\(orderID)"
-        let path = "/serviceHousekeeper/pages/documentEdit/documentEdit?id=\(self.id)&docType=doc&signId=\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)&auth=\(isAuthString)&order_id=\(orderID)"
+        
+        let path = "/serviceHousekeeper/pages/documentEdit/documentEdit?id=\(self.id)&docType=doc&signId=\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)&auth=\(isAuthString)&order_id=\(orderID)&source_from=app"
         return path
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift

@@ -341,7 +341,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
         } else {
             isAuthString = "false"
         }
-        let path = "/serviceHousekeeper/pages/documentEdit/documentEdit?id=\(self.id)&docType=sign&signId=\(self.id)&auth=\(isAuthString)&order_id=\(orderID)"
+        let path = "/serviceHousekeeper/pages/documentEdit/documentEdit?id=\(self.id)&docType=sign&signId=\(self.id)&auth=\(isAuthString)&order_id=\(orderID)&source_from=app"
         return path
     }
     

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -95,14 +95,14 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         let view = YHUserInfoHeaderView.createView()
         view.settingBlock = {
             [weak self] in
-            guard let self = self else { return }
-            if !checkLogin() { return }
-            let vc = YHMySettingViewController()
-            self.navigationController?.pushViewController(vc)
+//            guard let self = self else { return }
+//            if !checkLogin() { return }
+//            let vc = YHMySettingViewController()
+//            self.navigationController?.pushViewController(vc)
             
         
-//            let vc = YHOfficialApprovalResultVC2()
-//            self?.navigationController?.pushViewController(vc) //for test hjl
+            let vc = YHOfficialApprovalResultVC()
+            self?.navigationController?.pushViewController(vc) //for test hjl
 
         }
         view.evaluateBlock = {