删除注释和无用代码

“张旭”
1 parent c9282a0a
Showing 13 changed files with 2 additions and 181 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLiveShopDetailBtnsCell.swift
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLiveShopDetailOrderAssetCell.swift
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLliveShopDetailBannerCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideViewRemindView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNUpSlideDetailScrollView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNCertificationView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNHomePageBackgroupView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
metaCode/Classes/Main/Model/GoodsManager/CNLiveShopAddEditGoodsModel.swift
@@ -223,7 +223,6 @@
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
 		79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
-		7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */; };
 		7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */; };
 		7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */; };
 		7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
@@ -490,7 +489,6 @@
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
 		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
 		79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoAlertView.swift; sourceTree = "<group>"; };
-		7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNCertificationView.swift; sourceTree = "<group>"; };
 		7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGlobalBlock.swift; sourceTree = "<group>"; };
 		7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveEnvironment.swift; sourceTree = "<group>"; };
 		7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
@@ -828,7 +826,6 @@
 				7CD675382A2740B0008354C1 /* CNMainView.swift */,
 				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
 				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
-				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
 				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
 			);
 			path = MainView;
@@ -1814,7 +1811,6 @@
 				194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */,
 				1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */,
 				191733452B284DCD007BCC04 /* CNLiveShopCouponListModel.swift in Sources */,
-				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
 				796308752B4B90700090D22A /* CNLiveShortVideoHomeModel.swift in Sources */,
 				19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
@@ -718,42 +718,6 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 }
             }
-            
-            
-            
-            /*
-            //TODO 目前imageUrl为nil
-            if model.imageUrl == singleImageView.model?.imageUrl{
-                //要删除model的imageUrl和subview的imageUrl相等
-                if singleImageView.model?.isVideo == true{
-                    //subview是视频
-                    if singleImageView.model?.isUploading == true{
-                        //subview正在上传中
-                        UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
-                    }else{
-                        //subview上传完成
-                        //标记当前有视频,并替换model
-                        self.replaceVideoUrls.append(singleImageView.model!)
-                        let videoModel = CNLiveSelectUploadImageModel()
-                        videoModel.isVideo = true
-                        self.uploadVideoModel = videoModel
-                    }
-                }else{
-                    //subview是纯图片
-                    if singleImageView.model?.isUploading == true{
-                        //上传中
-                        UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
-                    }else{
-                        //上传完成
-                        if let index = self.uploadImageUrls.firstIndex(of: singleImageView.model!){
-                            //移除上传完成的model
-                            self.uploadImageUrls.remove(at: index)
-                            self.replaceImageUrls.append(singleImageView.model!)
-                        }
-                    }
-                }
-                break
-            }*/
         }
         self.resetUI()
         self.autoAdjustHeight()
@@ -75,15 +75,12 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
         if tag == 100 {
             //商品管理     
             navigationViewController().pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
         }else if tag == 101 {
             //订单管理
             navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }else if tag == 102 {
             //交易记录
             navigationViewController().pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
         }
 //        if tag == 100 {
 //            //发布动态
@@ -126,7 +126,6 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
         if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
             //push订单VC
             navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             //push余额VC
         }
@@ -135,7 +134,6 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
         if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
             //push订单VC
             navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             //push余额VC
         }
@@ -100,6 +100,5 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
         let webVC =  CNWebViewController()
         webVC.url = URL(string: bannerMdl?.url ?? "")
         navigationViewController().pushViewController(webVC, animated: pushAnimated)
-//        currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
     }
 }
@@ -19,21 +19,6 @@ class CNDownSlideViewRemindView : UIView{
     }
     func initUI(){
-//        CGFloat W = kScreenWidth - 100;
-//        UIBezierPath *bottomCircle = [UIBezierPath bezierPathWithArcCenter:CGPointMake(W/2, 0) radius:W/2 startAngle:0 endAngle:M_PI clockwise:YES];
-//        CAShapeLayer *bottomShapeLayer = [[CAShapeLayer alloc] init];
-//        bottomShapeLayer.path = bottomCircle.CGPath;
-//        bottomShapeLayer.fillColor = CNLiveColorWithHexString(@"#F5F5F5").CGColor;
-//
-//        [self.layer addSublayer:bottomShapeLayer];
-//
-//        UIButton *btn =[UIButton buttonWithType:UIButtonTypeCustom];
-//        btn.frame = CGRectMake((self.width - 50)/2, self.height-70, 50, 50);
-//        [btn setTitle:@"收钱" forState:UIControlStateNormal];
-//        [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-//        btn.titleLabel.font = [UIFont systemFontOfSize:17];
-//        btn.userInteractionEnabled = NO;
-        
         let W = UIScreen.main.bounds.width - 100
         let bottomCircle = UIBezierPath.init(arcCenter: CGPoint(x: W/2, y: 0), radius: W/2, startAngle: 0, endAngle: .pi, clockwise: true)
@@ -155,16 +155,7 @@ class CNUpSlideDetailScrollView: UIScrollView {
             }
         }
     }
-  
-    //闭包：函数参数
-//    func callBackBlock(_ block: @escaping enterBlock) {
-//        block(_:)
-//    }
-//    func useBlock(){
-//        if callBack != nil {
-//            callBack!("闭包传值2")
-//        }
-//    }
+
     //MARK: - 事件
     @objc func enterBtnAction(_ sender: UIButton){
         let tag = sender.tag
-////
-////  CNCertificationView.swift
-////  metaCode
-////
-////  Created by daojian on 2023/6/12.
-////  旧卡片(废弃)
-//
-//import Foundation
-//
-/////身份认证View
-//class CNCertificationView : UIView{
-//    ///添加身份点击事件回调
-//    var addCertificationAction: closeBlock?
-//    
-//    lazy var contentView: UIView = {
-//        let W = self.width-50
-//        let H = W*1.5
-//        let contentView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
-//        contentView.backgroundColor = UIColor.white
-//        contentView.clipsToBounds = true
-//        contentView.layer.cornerRadius = 20
-//        
-//        return contentView
-//        
-//    }()
-//    
-////    ///添加身份认证按钮
-////    lazy var addCerBtn: UIButton = {
-////        let addCerBtn = UIButton(type: .custom)
-////        addCerBtn.frame = CGRect(x: 0, y: 0, width: 145, height: 141)
-////        addCerBtn.centerX = self.contentView.width/2
-////        addCerBtn.centerY = self.contentView.height/2
-////        addCerBtn.setImage(UIImage(named: "homePage_addCertification_icon"), for: .normal)
-////        addCerBtn.addTarget(self, action: #selector(addCerBtnAction), for: .touchUpInside)
-////        return addCerBtn
-////    }()
-////
-////    ///添加身份按钮底部标题
-////    lazy var addCerBtnBottomTitle: UILabel = {
-////        let addCerBtnBottomTitle = UILabel(frame: CGRect(x: 0, y: self.addCerBtn.bottom - 10, width: 100, height: 22))
-////        addCerBtnBottomTitle.centerX = self.addCerBtn.centerX
-////        addCerBtnBottomTitle.textColor = UIColor("#0066FE")
-////        addCerBtnBottomTitle.textAlignment = .center
-////        addCerBtnBottomTitle.font = UIFont.systemFont(ofSize: 15, weight: .regular)
-////        addCerBtnBottomTitle.text = "身份认证"
-////        return addCerBtnBottomTitle
-////
-////    }()
-//    
-//    override init(frame: CGRect) {
-//        super.init(frame: frame)
-//        self.initUI()
-//        
-//    }
-//    
-//    required init?(coder: NSCoder) {
-//        fatalError("init(coder:) has not been implemented")
-//    }
-//    
-//    func initUI()
-//    {
-//        self.addSubview(self.contentView)
-////        self.contentView.addSubview(self.addCerBtn)
-////        self.contentView.addSubview(self.addCerBtnBottomTitle)
-////    }
-//    
-////    @objc func addCerBtnAction(){
-////
-////        if(self.addCertificationAction != nil){
-////            self.addCertificationAction!()
-////        }
-////
-//    }
-//}
@@ -27,7 +27,7 @@ class CNHomePageBackgroupSubView : UIView
     lazy var titleLabel: UILabel = {
         let titleLabel = UILabel.init(frame: CGRectMake(25, KNavigationHeight - 20, KSreenWidth - 50, 35))
         titleLabel.textColor = .white
-        titleLabel.font = BoldFont_24 //UIFont.systemFont(ofSize: 24, weight: .semibold)
+        titleLabel.font = BoldFont_24
         titleLabel.adjustsFontSizeToFitWidth=true
         return titleLabel
     }()
@@ -951,7 +951,6 @@ class CNMainView : UIView{
     }
     // MARK: - 事件
-    
     ///旋转到反面
     func transformToBacnkView()
     {
@@ -74,7 +74,6 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         tableView.dataSource = self
         tableView.delegate = self
         tableView.separatorStyle = .none
-        //        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier)
         tableView.register(CNLiveHomePageDuanJuCell.self, forCellReuseIdentifier: kCNLiveHomePageDuanJuCellIdentifier)
         tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier)
@@ -15,7 +15,6 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
     let kCNLivePlayletCellIdentifier = "kCNLivePlayletCellIdentifier"
     let kCNLivePlayletHeaderCellIdentifier = "kCNLivePlayletHeaderCellIdentifier"
     ///数据源
-//    var albumModelArr:Array<CNLiveAlbumListModel> = [CNLiveAlbumListModel]()
     lazy var albumModelArr: NSMutableArray = {
         var dataArray = NSMutableArray()
         return dataArray
@@ -40,11 +39,6 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
         self.albumId = aid
         self.getAlbumMsg(aid: aid)// self.albumModel!.contentId 或 self.albumMsgModel!.albumId
     }
-//    init(albumModelArr:NSMutableArray) {
-//        self.albumModelArr = NSMutableArray(array: albumModelArr)
-//        super.init(nibName: nil, bundle: nil)
-//        self.tableView.reloadData()
-//    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -61,33 +61,6 @@ class CNLiveShopAddEditGoodsModel: BaseModel {
         dataArr.append(dic22)
         dataArr.append(dic23)
         dataArr.append(dic24)
-//        var dataSource =
-//        [
-//         ["style":"1","isHaveTo":true,"title":"商品分类","contentType":"2"],
-//         ["style":"1","isHaveTo":true,"title":"店铺分类","contentType":"2"],
-//         ["style":"2","title":"基本信息"],
-//         ["style":"3","isHaveTo":true,"title":"商品轮播","isDisplayLine":true,"isAbleSelectVideo":true,"isAbleSelectCover":true,"maxSelectImageCount":"7"],
-//         ["style":"1","isHaveTo":true,"title":"商品名称","isDisplayLine":true,"contentType":"1"],
-//         ["style":"4","isHaveTo":false,"title":"商品副标题","isDisplayLine":true,"placeholder":"请在此输入..."],
-//         ["style":"1","isHaveTo":true,"title":"本店售价","subtitle":"(实际售价)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentTextColor":"#FC1541","contentType":"1"],
-//         ["style":"1","isHaveTo":true,"title":"市场售价","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"],
-//         ["style":"1","isHaveTo":false,"title":"商品重量","subtitle":"(kg)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"3","contentType":"1"],
-//         ["style":"5","isHaveTo":false,"title":"最低起售","subtitle":"(件)","isDisplayLine":true,"desc":"如起售数超出库存买家无法购买","decimalLength":"3","contentType":"4"],
-//         ["style":"1","isHaveTo":false,"title":"上架","contentType":"3"],
-//         ["style":"2","title":"通用信息"],
-//         ["style":"3","isHaveTo":true,"title":"商品详情图","isDisplayLine":true,"maxSelectImageCount":"9"],
-//         ["style":"1","isHaveTo":false,"title":"商品运费","subtitle":"(0为包邮)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"],
-//         ["style":"1","isHaveTo":false,"title":"是否支持退货","isDisplayLine":true,"contentType":"3"],
-//         ["style":"1","isHaveTo":false,"title":"商品单位","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1"],
-//          ["style":"2","title":"通用参数(*为必填)","touchSubtitle":"添加通用参数"],
-//          ["style":"1","isHaveTo":true,"title":"品名","isDisplayLine":true,"contentType":"1"],
-//          ["style":"1","isHaveTo":true,"title":"规格","isDisplayLine":true,"contentType":"1"],
-//          ["style":"4","isHaveTo":true,"title":"寄送区域","isDisplayLine":true,"contentType":"1","placeholder":"请填写不配送**地区、仅配送**地区或全国包邮"],
-//          ["style":"1","isHaveTo":true,"title":"发货时效","isDisplayLine":true,"contentType":"1"],
-//          ["style":"1","isHaveTo":false,"title":"口味","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true],
-//          ["style":"1","isHaveTo":false,"title":"产地","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true],
-//          ["style":"1","isHaveTo":false,"title":"存储方式及期限","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true]
-//        ]
         for dic in dataArr{
             let mdl = newDictionaryToModel(dic as! [String : Any], CNLiveShopAddEditGoodsListModel.self)