iOS Team / CNLiveMateCode · Commits

Commit 2e2d2f3479d4caf3194828c4359f73cbfbd3b6d8

Authored by “张旭”
1 parent c9282a0a

删除注释和无用代码

Inline Side-by-side
Showing 13 changed files with 2 additions and 181 deletions
metaCode.xcodeproj/project.pbxproj
  View file @2e2d2f3
... ... @@ -223,7 +223,6 @@
223 223 79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
224 224 79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
225 225 79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
226   - 7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */; };
227 226 7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */; };
228 227 7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */; };
229 228 7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
... ... @@ -490,7 +489,6 @@
490 489 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
491 490 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
492 491 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoAlertView.swift; sourceTree = "<group>"; };
493   - 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNCertificationView.swift; sourceTree = "<group>"; };
494 492 7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGlobalBlock.swift; sourceTree = "<group>"; };
495 493 7C2703352A3AFD3A0061EC50 /* CNLiveEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveEnvironment.swift; sourceTree = "<group>"; };
496 494 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
... ... @@ -828,7 +826,6 @@
828 826 7CD675382A2740B0008354C1 /* CNMainView.swift */,
829 827 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
830 828 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
831   - 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
832 829 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
833 830 );
834 831 path = MainView;
... ... @@ -1814,7 +1811,6 @@
1814 1811 194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */,
1815 1812 1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */,
1816 1813 191733452B284DCD007BCC04 /* CNLiveShopCouponListModel.swift in Sources */,
1817   - 7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
1818 1814 796308752B4B90700090D22A /* CNLiveShortVideoHomeModel.swift in Sources */,
1819 1815 19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
1820 1816 790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
... ...
metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
  View file @2e2d2f3
... ... @@ -718,42 +718,6 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
718 718 }
719 719  
720 720 }
721   -
722   -
723   -
724   - /*
725   - //TODO 目前imageUrl为nil
726   - if model.imageUrl == singleImageView.model?.imageUrl{
727   - //要删除model的imageUrl和subview的imageUrl相等
728   - if singleImageView.model?.isVideo == true{
729   - //subview是视频
730   - if singleImageView.model?.isUploading == true{
731   - //subview正在上传中
732   - UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
733   - }else{
734   - //subview上传完成
735   - //标记当前有视频,并替换model
736   - self.replaceVideoUrls.append(singleImageView.model!)
737   - let videoModel = CNLiveSelectUploadImageModel()
738   - videoModel.isVideo = true
739   - self.uploadVideoModel = videoModel
740   - }
741   - }else{
742   - //subview是纯图片
743   - if singleImageView.model?.isUploading == true{
744   - //上传中
745   - UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
746   - }else{
747   - //上传完成
748   - if let index = self.uploadImageUrls.firstIndex(of: singleImageView.model!){
749   - //移除上传完成的model
750   - self.uploadImageUrls.remove(at: index)
751   - self.replaceImageUrls.append(singleImageView.model!)
752   - }
753   - }
754   - }
755   - break
756   - }*/
757 721 }
758 722 self.resetUI()
759 723 self.autoAdjustHeight()
... ...
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLiveShopDetailBtnsCell.swift
  View file @2e2d2f3
... ... @@ -75,15 +75,12 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
75 75 if tag == 100 {
76 76 //商品管理
77 77 navigationViewController().pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
78   -// currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: pushAnimated)
79 78 }else if tag == 101 {
80 79 //订单管理
81 80 navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
82   -// currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
83 81 }else if tag == 102 {
84 82 //交易记录
85 83 navigationViewController().pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
86   -// currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: pushAnimated)
87 84 }
88 85 // if tag == 100 {
89 86 // //发布动态
... ...
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLiveShopDetailOrderAssetCell.swift
  View file @2e2d2f3
... ... @@ -126,7 +126,6 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
126 126 if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
127 127 //push订单VC
128 128 navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
129   -// currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
130 129 }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
131 130 //push余额VC
132 131 }
... ... @@ -135,7 +134,6 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
135 134 if self.displayType == .CNLiveShopDetailDisplayTypeOrder{
136 135 //push订单VC
137 136 navigationViewController().pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
138   -// currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: pushAnimated)
139 137 }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
140 138 //push余额VC
141 139 }
... ...
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLliveShopDetailBannerCell.swift
  View file @2e2d2f3
... ... @@ -100,6 +100,5 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP
100 100 let webVC = CNWebViewController()
101 101 webVC.url = URL(string: bannerMdl?.url ?? "")
102 102 navigationViewController().pushViewController(webVC, animated: pushAnimated)
103   -// currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
104 103 }
105 104 }
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideViewRemindView.swift
  View file @2e2d2f3
... ... @@ -19,21 +19,6 @@ class CNDownSlideViewRemindView : UIView{
19 19 }
20 20  
21 21 func initUI(){
22   -// CGFloat W = kScreenWidth - 100;
23   -// UIBezierPath *bottomCircle = [UIBezierPath bezierPathWithArcCenter:CGPointMake(W/2, 0) radius:W/2 startAngle:0 endAngle:M_PI clockwise:YES];
24   -// CAShapeLayer *bottomShapeLayer = [[CAShapeLayer alloc] init];
25   -// bottomShapeLayer.path = bottomCircle.CGPath;
26   -// bottomShapeLayer.fillColor = CNLiveColorWithHexString(@"#F5F5F5").CGColor;
27   -//
28   -// [self.layer addSublayer:bottomShapeLayer];
29   -//
30   -// UIButton *btn =[UIButton buttonWithType:UIButtonTypeCustom];
31   -// btn.frame = CGRectMake((self.width - 50)/2, self.height-70, 50, 50);
32   -// [btn setTitle:@"收钱" forState:UIControlStateNormal];
33   -// [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
34   -// btn.titleLabel.font = [UIFont systemFontOfSize:17];
35   -// btn.userInteractionEnabled = NO;
36   -
37 22 let W = UIScreen.main.bounds.width - 100
38 23 let bottomCircle = UIBezierPath.init(arcCenter: CGPoint(x: W/2, y: 0), radius: W/2, startAngle: 0, endAngle: .pi, clockwise: true)
39 24  
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNUpSlideDetailScrollView.swift
  View file @2e2d2f3
... ... @@ -155,16 +155,7 @@ class CNUpSlideDetailScrollView: UIScrollView {
155 155 }
156 156 }
157 157 }
158   -
159   - //闭包：函数参数
160   -// func callBackBlock(_ block: @escaping enterBlock) {
161   -// block(_:)
162   -// }
163   -// func useBlock(){
164   -// if callBack != nil {
165   -// callBack!("闭包传值2")
166   -// }
167   -// }
  158 +
168 159 //MARK: - 事件
169 160 @objc func enterBtnAction(_ sender: UIButton){
170 161 let tag = sender.tag
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNCertificationView.swift deleted 100644 → 0
  View file @c9282a0
1   -////
2   -//// CNCertificationView.swift
3   -//// metaCode
4   -////
5   -//// Created by daojian on 2023/6/12.
6   -//// 旧卡片(废弃)
7   -//
8   -//import Foundation
9   -//
10   -/////身份认证View
11   -//class CNCertificationView : UIView{
12   -// ///添加身份点击事件回调
13   -// var addCertificationAction: closeBlock?
14   -//
15   -// lazy var contentView: UIView = {
16   -// let W = self.width-50
17   -// let H = W*1.5
18   -// let contentView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
19   -// contentView.backgroundColor = UIColor.white
20   -// contentView.clipsToBounds = true
21   -// contentView.layer.cornerRadius = 20
22   -//
23   -// return contentView
24   -//
25   -// }()
26   -//
27   -//// ///添加身份认证按钮
28   -//// lazy var addCerBtn: UIButton = {
29   -//// let addCerBtn = UIButton(type: .custom)
30   -//// addCerBtn.frame = CGRect(x: 0, y: 0, width: 145, height: 141)
31   -//// addCerBtn.centerX = self.contentView.width/2
32   -//// addCerBtn.centerY = self.contentView.height/2
33   -//// addCerBtn.setImage(UIImage(named: "homePage_addCertification_icon"), for: .normal)
34   -//// addCerBtn.addTarget(self, action: #selector(addCerBtnAction), for: .touchUpInside)
35   -//// return addCerBtn
36   -//// }()
37   -////
38   -//// ///添加身份按钮底部标题
39   -//// lazy var addCerBtnBottomTitle: UILabel = {
40   -//// let addCerBtnBottomTitle = UILabel(frame: CGRect(x: 0, y: self.addCerBtn.bottom - 10, width: 100, height: 22))
41   -//// addCerBtnBottomTitle.centerX = self.addCerBtn.centerX
42   -//// addCerBtnBottomTitle.textColor = UIColor("#0066FE")
43   -//// addCerBtnBottomTitle.textAlignment = .center
44   -//// addCerBtnBottomTitle.font = UIFont.systemFont(ofSize: 15, weight: .regular)
45   -//// addCerBtnBottomTitle.text = "身份认证"
46   -//// return addCerBtnBottomTitle
47   -////
48   -//// }()
49   -//
50   -// override init(frame: CGRect) {
51   -// super.init(frame: frame)
52   -// self.initUI()
53   -//
54   -// }
55   -//
56   -// required init?(coder: NSCoder) {
57   -// fatalError("init(coder:) has not been implemented")
58   -// }
59   -//
60   -// func initUI()
61   -// {
62   -// self.addSubview(self.contentView)
63   -//// self.contentView.addSubview(self.addCerBtn)
64   -//// self.contentView.addSubview(self.addCerBtnBottomTitle)
65   -//// }
66   -//
67   -//// @objc func addCerBtnAction(){
68   -////
69   -//// if(self.addCertificationAction != nil){
70   -//// self.addCertificationAction!()
71   -//// }
72   -////
73   -// }
74   -//}
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNHomePageBackgroupView.swift
  View file @2e2d2f3
... ... @@ -27,7 +27,7 @@ class CNHomePageBackgroupSubView : UIView
27 27 lazy var titleLabel: UILabel = {
28 28 let titleLabel = UILabel.init(frame: CGRectMake(25, KNavigationHeight - 20, KSreenWidth - 50, 35))
29 29 titleLabel.textColor = .white
30   - titleLabel.font = BoldFont_24 //UIFont.systemFont(ofSize: 24, weight: .semibold)
  30 + titleLabel.font = BoldFont_24
31 31 titleLabel.adjustsFontSizeToFitWidth=true
32 32 return titleLabel
33 33 }()
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
  View file @2e2d2f3
... ... @@ -951,7 +951,6 @@ class CNMainView : UIView{
951 951 }
952 952  
953 953 // MARK: - 事件
954   -
955 954 ///旋转到反面
956 955 func transformToBacnkView()
957 956 {
... ...
metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
  View file @2e2d2f3
... ... @@ -74,7 +74,6 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
74 74 tableView.dataSource = self
75 75 tableView.delegate = self
76 76 tableView.separatorStyle = .none
77   - // tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier)
78 77 tableView.register(CNLiveHomePageDuanJuCell.self, forCellReuseIdentifier: kCNLiveHomePageDuanJuCellIdentifier)
79 78  
80 79 tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier)
... ...
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
  View file @2e2d2f3
... ... @@ -15,7 +15,6 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
15 15 let kCNLivePlayletCellIdentifier = "kCNLivePlayletCellIdentifier"
16 16 let kCNLivePlayletHeaderCellIdentifier = "kCNLivePlayletHeaderCellIdentifier"
17 17 ///数据源
18   -// var albumModelArr:Array<CNLiveAlbumListModel> = [CNLiveAlbumListModel]()
19 18 lazy var albumModelArr: NSMutableArray = {
20 19 var dataArray = NSMutableArray()
21 20 return dataArray
... ... @@ -40,11 +39,6 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
40 39 self.albumId = aid
41 40 self.getAlbumMsg(aid: aid)// self.albumModel!.contentId 或 self.albumMsgModel!.albumId
42 41 }
43   -// init(albumModelArr:NSMutableArray) {
44   -// self.albumModelArr = NSMutableArray(array: albumModelArr)
45   -// super.init(nibName: nil, bundle: nil)
46   -// self.tableView.reloadData()
47   -// }
48 42  
49 43 required init?(coder: NSCoder) {
50 44 fatalError("init(coder:) has not been implemented")
... ...
metaCode/Classes/Main/Model/GoodsManager/CNLiveShopAddEditGoodsModel.swift
  View file @2e2d2f3
... ... @@ -61,33 +61,6 @@ class CNLiveShopAddEditGoodsModel: BaseModel {
61 61 dataArr.append(dic22)
62 62 dataArr.append(dic23)
63 63 dataArr.append(dic24)
64   -// var dataSource =
65   -// [
66   -// ["style":"1","isHaveTo":true,"title":"商品分类","contentType":"2"],
67   -// ["style":"1","isHaveTo":true,"title":"店铺分类","contentType":"2"],
68   -// ["style":"2","title":"基本信息"],
69   -// ["style":"3","isHaveTo":true,"title":"商品轮播","isDisplayLine":true,"isAbleSelectVideo":true,"isAbleSelectCover":true,"maxSelectImageCount":"7"],
70   -// ["style":"1","isHaveTo":true,"title":"商品名称","isDisplayLine":true,"contentType":"1"],
71   -// ["style":"4","isHaveTo":false,"title":"商品副标题","isDisplayLine":true,"placeholder":"请在此输入..."],
72   -// ["style":"1","isHaveTo":true,"title":"本店售价","subtitle":"(实际售价)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentTextColor":"#FC1541","contentType":"1"],
73   -// ["style":"1","isHaveTo":true,"title":"市场售价","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"],
74   -// ["style":"1","isHaveTo":false,"title":"商品重量","subtitle":"(kg)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"3","contentType":"1"],
75   -// ["style":"5","isHaveTo":false,"title":"最低起售","subtitle":"(件)","isDisplayLine":true,"desc":"如起售数超出库存买家无法购买","decimalLength":"3","contentType":"4"],
76   -// ["style":"1","isHaveTo":false,"title":"上架","contentType":"3"],
77   -// ["style":"2","title":"通用信息"],
78   -// ["style":"3","isHaveTo":true,"title":"商品详情图","isDisplayLine":true,"maxSelectImageCount":"9"],
79   -// ["style":"1","isHaveTo":false,"title":"商品运费","subtitle":"(0为包邮)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"],
80   -// ["style":"1","isHaveTo":false,"title":"是否支持退货","isDisplayLine":true,"contentType":"3"],
81   -// ["style":"1","isHaveTo":false,"title":"商品单位","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1"],
82   -// ["style":"2","title":"通用参数(*为必填)","touchSubtitle":"添加通用参数"],
83   -// ["style":"1","isHaveTo":true,"title":"品名","isDisplayLine":true,"contentType":"1"],
84   -// ["style":"1","isHaveTo":true,"title":"规格","isDisplayLine":true,"contentType":"1"],
85   -// ["style":"4","isHaveTo":true,"title":"寄送区域","isDisplayLine":true,"contentType":"1","placeholder":"请填写不配送**地区、仅配送**地区或全国包邮"],
86   -// ["style":"1","isHaveTo":true,"title":"发货时效","isDisplayLine":true,"contentType":"1"],
87   -// ["style":"1","isHaveTo":false,"title":"口味","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true],
88   -// ["style":"1","isHaveTo":false,"title":"产地","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true],
89   -// ["style":"1","isHaveTo":false,"title":"存储方式及期限","contentTextFieldkeyboardType":"1","isDisplayLine":true,"contentType":"1","isDelect":true]
90   -// ]
91 64  
92 65 for dic in dataArr{
93 66 let mdl = newDictionaryToModel(dic as! [String : Any], CNLiveShopAddEditGoodsListModel.self)
... ...