下滑页大图点击 , 大图详情页变形问题 , 删除WebViewJavascriptBridge 的UIWebview

“张旭”
1 parent 1af7f5eb
Showing 10 changed files with 114 additions and 127 deletions
Podfile
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNHomePageBackgroupView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumImageCell.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -67,11 +67,28 @@ target &#39;metaCode&#39; do
 #  pod 'QMUIKit'
    pod 'YYWebImage', :git => 'https://gitee.com/mirrors/YYWebImage.git'
+   pod 'WebViewJavascriptBridge'
+   
    #依赖三方私有库,如果里面有.a的时候加上这个
    pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
    end
+   #依赖三方私有库,如果里面有.a的时候加上这个
+   pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+   ############################################  #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件
+            dir_web = File.join(installer.sandbox.pod_dir('WebViewJavascriptBridge'), 'WebViewJavascriptBridge')
+            Dir.foreach(dir_web) {|x|
+              real_path = File.join(dir_web, x)
+              if (!File.directory?(real_path) && File.exists?(real_path))
+                if(x == 'WebViewJavascriptBridge.h' || x == 'WebViewJavascriptBridge.m')
+                  File.delete(real_path)
+                end
+              end
+            }
+            #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件
+        #################################################
+   end
@@ -56,6 +56,9 @@ enum VNumPage {
 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate,UIGestureRecognizerDelegate,WKNavigationDelegate{
+    //获取身份信息接口总次数,为0时刷新左右轮播
+    var reloadNum:Int = 0
+    var reloadShopNum:Int = 1
     ///NewPagedFlowView 开始滑动时的偏移量
     private var beginOffset = 0.0
@@ -396,9 +399,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         bannerView?.idModel = identityModel
         if (identityModel.auth == true){
             bannerView?.baseScrollView.isScrollEnabled = true
-            if identityModel.id == 9{
-                self.getApplyShopInfo()
-            }
         }else{
             //未认证
             if (identityModel.downType == 3 || identityModel.downType == 4 || identityModel.upType == 3 || identityModel.upType == 4)
@@ -409,7 +409,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
             //未认证&要显示的是电商
-            if identityModel.id == 9{
+            if identityModel.id == 9 && reloadShopNum == 1{
+                reloadShopNum = reloadShopNum - 1
                 self.getApplyShopInfo()
             }
         }
@@ -626,7 +627,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     {
 //        showLoading(message: "")
         CNLiveMineViewModel.requestAuthStandList(page: 1)
-        { result, respStatue in
+        { [self] result, respStatue in
             hiddenLoading()
             if respStatue == .success{
@@ -636,10 +637,9 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                     self.dataArray = NSMutableArray.init()
                     self.dataArray.addObjects(from: listArray as! [Any])
-                    self.addPageView()
-                    
-                    self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
+                    //全部已认证
+                    var isAllAuthed = true
                     //请求身份详情,判断是企业认证还是个人认证
                     listArray.forEach { standListModel in
                         let listModel = standListModel as! StandListModel
@@ -648,9 +648,16 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                             listModel.isPersonOrEnterprise = 3
                         }else{
                             //未认证
+                            isAllAuthed = false
                             self.getStandInfo(identityId: "\(listModel.id)")
+                            reloadNum = reloadNum + 1
                         }
                     }
+                    if isAllAuthed{
+                        self.addPageView()
+                        
+                        self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
+                    }
                 }else{
                     self.NetApiStatus = .apiError
@@ -667,7 +674,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     // MARK: - 获取身份信息是个人认证还是企业认证,机构认证
     func getStandInfo(identityId:String){
-        CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { result, respStatue in
+        CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { [self] result, respStatue in
             hiddenLoading()
             if respStatue == .success{
                 let standInfoBaseModel = result as! MineStandInfoBaseModel
@@ -675,104 +682,59 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                     let listModel = standListModel as! StandListModel
                     if listModel.id == standInfoBaseModel.identityId{
                         listModel.standInfoBaseModel = standInfoBaseModel
-                    }
-                }
-                
-                if standInfoBaseModel.authInfos.count > 0{
-                    //个人认证有值
-                    if standInfoBaseModel.enterpriseAuthInfos.count > 0{
-                        //个人有值,企业认证有值
-                        if standInfoBaseModel.agencyAuthInfos.count > 0{
-                            //个人有值,企业有值,机构认证有值
-                            self.dataArray.forEach { standListModel in
-                                let listModel = standListModel as! StandListModel
-                                if listModel.id == standInfoBaseModel.identityId{
-                                    //目标model,企业+个人+机构
+                        if standInfoBaseModel.authInfos.count > 0{
+                            //个人认证有值
+                            if standInfoBaseModel.enterpriseAuthInfos.count > 0{
+                                //个人有值,企业认证有值
+                                if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                    //个人有值,企业有值,机构认证有值
                                     listModel.isPersonOrEnterprise = 4
-                                }
-                            }
-
-                        }else{
-                            //个人有值,企业有值,机构认证没值
-                            self.dataArray.forEach { standListModel in
-                                let listModel = standListModel as! StandListModel
-                                if listModel.id == standInfoBaseModel.identityId{
-                                    //目标model,企业+个人
+                                }else{
+                                    //个人有值,企业有值,机构认证没值
                                     listModel.isPersonOrEnterprise = 0
                                 }
-                            }
-                        }
-                        
-                    }else{
-                        //个人有值,企业认证没值
-                        if standInfoBaseModel.agencyAuthInfos.count > 0{
-                            //个人有值,企业没值,机构有值
-                            self.dataArray.forEach { standListModel in
-                                let listModel = standListModel as! StandListModel
-                                if listModel.id == standInfoBaseModel.identityId{
-                                    //目标model
+                                
+                            }else{
+                                //个人有值,企业认证没值
+                                if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                    //个人有值,企业没值,机构有值
                                     listModel.isPersonOrEnterprise = 0
-                                }
-                            }
-                        }else{
-                            //个人有值,企业没值,机构没值
-                            self.dataArray.forEach { standListModel in
-                                let listModel = standListModel as! StandListModel
-                                if listModel.id == standInfoBaseModel.identityId{
-                                    //目标model ,个人
+                                }else{
+                                    //个人有值,企业没值,机构没值
                                     listModel.isPersonOrEnterprise = 1
                                 }
                             }
-                        }
-                    }
-                    
-                }else if standInfoBaseModel.enterpriseAuthInfos.count > 0{
-                    //企业认证有值,个人没值
-                    if standInfoBaseModel.agencyAuthInfos.count > 0{
-                        ///企业有值,个人没值,机构有值
-                        self.dataArray.forEach { standListModel in
-                            let listModel = standListModel as! StandListModel
-                            if listModel.id == standInfoBaseModel.identityId{
-                                //目标model
+                            
+                        }else if standInfoBaseModel.enterpriseAuthInfos.count > 0{
+                            //企业认证有值,个人没值
+                            if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                ///企业有值,个人没值,机构有值
                                 listModel.isPersonOrEnterprise = 0
-                            }
-                        }
-                    }else{
-                        ///企业有值,个人没值,机构没值
-                        self.dataArray.forEach { standListModel in
-                            let listModel = standListModel as! StandListModel
-                            if listModel.id == standInfoBaseModel.identityId{
-                                //目标model ,企业
+                            }else{
+                                ///企业有值,个人没值,机构没值
                                 listModel.isPersonOrEnterprise = 2
                             }
-                        }
-                    }
-                    
-                    
-                }else{
-                    //企业个人都没值
-                    if standInfoBaseModel.agencyAuthInfos.count > 0{
-                        //企业没值,个人没值,机构有值
-                        self.dataArray.forEach { standListModel in
-                            let listModel = standListModel as! StandListModel
-                            if listModel.id == standInfoBaseModel.identityId{
-                                //目标model 机构
+                            
+                            
+                        }else{
+                            //企业个人都没值
+                            if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                //企业没值,个人没值,机构有值
                                 listModel.isPersonOrEnterprise = 5
-                            }
-                        }
-                    }else{
-                        //企业没值,个人没值,机构没值
-                        self.dataArray.forEach { standListModel in
-                            let listModel = standListModel as! StandListModel
-                            if listModel.id == standInfoBaseModel.identityId{
-                                //目标model ,已认证/无企业和个人
+                            }else{
+                                //企业没值,个人没值,机构没值
                                 listModel.isPersonOrEnterprise = 3
                             }
                         }
                     }
-                    
                 }
-                self.pageFlowView.reloadData()
+                //已请求全部身份详情,开始刷新
+                reloadNum = reloadNum - 1
+                if reloadNum == 0{
+                    self.addPageView()
+                    let arr = Array(self.dataArray)
+                    self.backgroupView.updateData(idArray: arr as! Array<StandListModel>)
+                }
             }else{
                 //网络请求失败
             }
@@ -789,8 +751,10 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                 for (index, item) in self!.dataArray.enumerated() {
                     let model = item as! StandListModel
                     model.shopInfoModel = shopModel
-                    let bannerView =  self?.pageFlowView.cells[index] as? CNCustomIndexView
-                    bannerView?.idModel = model
+                    if model.id == 9{
+                        let bannerView =  self?.pageFlowView.cells[index] as? CNCustomIndexView
+                        bannerView?.idModel = model
+                    }
                 }
             }
         }
@@ -269,7 +269,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                     return 75
                 }else if self.slideModel?.type == SlideModelTypeOneCourse75{
                     //大图课程
-                    return KSreenWidth
+                    return KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)
                 }
             }
         }else{
@@ -131,7 +131,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideSingleCourseCellIdentifier) as? CNDownSlideSingleCourseCell
             else {
                 let cell = CNDownSlideSingleCourseCell()
-                cell.slideModel = slideModel
                 return cell
             }
             cell.slideModel = slideModel
@@ -149,14 +149,14 @@ class CNDownSlideView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
-//        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
-//        tap.cancelsTouchesInView = false
-//        self.addGestureRecognizer(tap)
+        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
+        tap.cancelsTouchesInView = false
+        self.addGestureRecognizer(tap)
         self.initUI()
     }
-//    @objc func slideViewTap() {
-//        print("slideViewTap")
-//    }
+    @objc func slideViewTap() {
+        print("slideViewTap")
+    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -77,9 +77,9 @@ class CNHomePageBackgroupView: UIView{
     ///当前在屏幕显示的view
     var currentApearView: CNHomePageBackgroupSubView?
     ///数据源
-    lazy var dataArray:Array<CNHomePageBackgroupSubView> = {
-        let dataArray = Array<CNHomePageBackgroupSubView>()
-        return dataArray
+    lazy var groupSubViewDataArray:Array<CNHomePageBackgroupSubView> = {
+        let groupSubViewDataArray = Array<CNHomePageBackgroupSubView>()
+        return groupSubViewDataArray
     }()
     // MARK: - 初始化
@@ -103,7 +103,7 @@ class CNHomePageBackgroupView: UIView{
             let obj:UIView = array[i]
             obj.removeFromSuperview()
         }
-        self.dataArray = Array<CNHomePageBackgroupSubView>()
+        self.groupSubViewDataArray = Array<CNHomePageBackgroupSubView>()
         for i in (0..<idArray.count){
@@ -117,11 +117,11 @@ class CNHomePageBackgroupView: UIView{
             subView.imageView.kf.setImage(with: URL(string: idModel.backgroundImg),placeholder: UIImage(named: "homePage_backgroup_blue"))
             //更新双向链表
-            let lastSubView: CNHomePageBackgroupSubView? = self.dataArray.last
+            let lastSubView: CNHomePageBackgroupSubView? = self.groupSubViewDataArray.last
             lastSubView?.nextSubView = subView
             subView.preSubView = lastSubView
-            self.dataArray.append(subView)
+            self.groupSubViewDataArray.append(subView)
             if i==0 {
                 self.currentApearView = subView
@@ -130,7 +130,7 @@ class CNHomePageBackgroupView: UIView{
         }
         //倒序添加子view
-        for i in self.dataArray.enumerated().reversed() {
+        for i in self.groupSubViewDataArray.enumerated().reversed() {
             let subview: CNHomePageBackgroupSubView = i.element
             self.addSubview(subview)
@@ -148,14 +148,14 @@ class CNHomePageBackgroupView: UIView{
         if(currentApearViewIndex == 0){
             return nil
         }
-        return dataArray[currentApearViewIndex - 1]
+        return groupSubViewDataArray[currentApearViewIndex - 1]
     }
     ///获取当前视图右边的子视图
     func getRightView()->CNHomePageBackgroupSubView?{
-        if(currentApearViewIndex >= self.dataArray.count - 1){
+        if(currentApearViewIndex >= self.groupSubViewDataArray.count - 1){
             return nil
         }
-        return dataArray[currentApearViewIndex + 1]
+        return groupSubViewDataArray[currentApearViewIndex + 1]
     }
     /// 替换当前显示的子view
@@ -22,8 +22,8 @@ class CNFrontMainView : UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.initUI()
-//        let tap:UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapAction))
-//        self.addGestureRecognizer(tap)
+        let tap:UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapAction))
+        self.addGestureRecognizer(tap)
     }
     required init?(coder: NSCoder) {
@@ -519,18 +519,18 @@ class CNFrontMainView : UIView{
         if (payLayer != nil){
             //已添加layer
-        }else{
-            //未添加layer
-            let gradient = CAGradientLayer()
-            gradient.frame = self.bounds
-            gradient.colors = [HexColor(startHex)!.cgColor, HexColor(endHex)!.cgColor]
-            gradient.locations = [0, 1]
-            gradient.startPoint = CGPoint(x: 0, y: 0.43)
-            gradient.endPoint = CGPoint(x: 0.43, y: 0.43)
-            gradient.name = unStandBtnBgViewLayer
-            self.unStandBtnBgView.layer.insertSublayer(gradient, at: 0)
-            self.unStandBtnBgView.backgroundColor = .clear
+            payLayer?.removeFromSuperlayer()
         }
+        //添加新layer
+        let gradient = CAGradientLayer()
+        gradient.frame = self.bounds
+        gradient.colors = [HexColor(startHex)!.cgColor, HexColor(endHex)!.cgColor]
+        gradient.locations = [0, 1]
+        gradient.startPoint = CGPoint(x: 0, y: 0.43)
+        gradient.endPoint = CGPoint(x: 0.43, y: 0.43)
+        gradient.name = unStandBtnBgViewLayer
+        self.unStandBtnBgView.layer.insertSublayer(gradient, at: 0)
+        self.unStandBtnBgView.backgroundColor = .clear
     }
     func subLayer(name:String,viewLayer:CALayer) -> CALayer?{
         if let subLayer = viewLayer.sublayers?.first(where: { $0.name == name }) {
@@ -556,7 +556,8 @@ class CNFrontMainView : UIView{
     // MARK: -按钮点击事件
     @objc func tapAction(){
-        tapTransformAciton!()
+        //翻转到反面
+//        tapTransformAciton!()
     }
     @objc func addStandBtnAction() {
@@ -46,6 +46,9 @@ class CNUpSlideView:UIView{
         }
         set{
             _downPath = newValue!
+            self.subviews.forEach { view in
+                view.removeFromSuperview()
+            }
             if(type == UpDownTypeH5){
                 self.addSubview(self.webView)
                 if (_downPath != ""){
@@ -11,7 +11,9 @@ class CNLiveAlbumImageCell:UITableViewCell{
     //MARK: - 懒加载
     lazy var iconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenWidth))
+        let iconImgView = UIImageView(frame: CGRect(x: (KSreenWidth - KSreenWidth*(KSreenWidth/DownSlideSingleCourseW))/2, y: 0, width: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW), height: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)))
+        iconImgView.contentMode = .scaleAspectFill
+        iconImgView.clipsToBounds = true
         return iconImgView
     }()
@@ -28,6 +30,7 @@ class CNLiveAlbumImageCell:UITableViewCell{
     private func setupUI() {
         contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         self.contentView.addSubview(self.iconImgView)
+        
     }
@@ -284,7 +284,7 @@ class CNLiveMineViewModel: NSObject {
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/allList", param: param as! [String : String], cacheType: .cacheNetwork) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/allList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary