Commit bc1b562e30afc7431f0ec4f0d9645fad44f46ab0
1 parent
66434a34
全部课程 显示空白问题
Showing
3 changed files
with
7 additions
and
4 deletions
metaCode.xcodeproj/project.pbxproj
| ... | ... | @@ -932,6 +932,7 @@ |
| 932 | 932 | 191732F92B0AF329007BCC04 /* GoodsDetail */, |
| 933 | 933 | 19565ED22AF9FE67007D6727 /* GoodsManager */, |
| 934 | 934 | 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */, |
| 935 | + 19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */, | |
| 935 | 936 | 19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */, |
| 936 | 937 | 19BB1FE72AECAD060094D962 /* CNLiveShopConsoleModel.swift */, |
| 937 | 938 | 19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */, |
| ... | ... | @@ -944,7 +945,6 @@ |
| 944 | 945 | children = ( |
| 945 | 946 | 1917330B2B109691007BCC04 /* CNLivePlayer */, |
| 946 | 947 | 19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */, |
| 947 | - 19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */, | |
| 948 | 948 | 19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */, |
| 949 | 949 | 19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */, |
| 950 | 950 | 191733302B170537007BCC04 /* CNLiveCommonManager.swift */, | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
| ... | ... | @@ -104,8 +104,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa |
| 104 | 104 | if slideModel.type == SlideModelTypeRecommend4{ |
| 105 | 105 | guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell |
| 106 | 106 | else { |
| 107 | -// let cell = CNLiveDownSlideRecommendCell() | |
| 108 | -// cell.slideModel = slideModel | |
| 109 | 107 | return CNLiveDownSlideRecommendCell() |
| 110 | 108 | } |
| 111 | 109 | cell.slideModel = slideModel | ... | ... |
metaCode/Classes/Main/Util/CNLiveDownSlideModelLayout.swift renamed to metaCode/Classes/Main/Model/CNLiveDownSlideModelLayout.swift
| ... | ... | @@ -47,8 +47,13 @@ class CNLiveDownSlideModelLayout:NSObject{ |
| 47 | 47 | } |
| 48 | 48 | _slideModel?.cellH = CGFloat(totalNum)*(DownSlideTodayRecommendH + DownSlideRecommendLeftGap) |
| 49 | 49 | }else if(_slideModel?.type == SlideModelTypeAllCourse12){//全部课程 |
| 50 | + //总显示块数/循环数 | |
| 51 | + var totalNum = (contentsNum >= row) ? row : contentsNum | |
| 52 | + if row == 0{//row为0 , contents全部显示 | |
| 53 | + totalNum = contentsNum | |
| 54 | + } | |
| 50 | 55 | |
| 51 | - _slideModel?.cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(_slideModel!.rowNum)+DownSlideRecommendLeftGap | |
| 56 | + _slideModel?.cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(totalNum)+DownSlideRecommendLeftGap | |
| 52 | 57 | |
| 53 | 58 | }else if(_slideModel?.type == SlideModelTypeOneCourse75){//单节课程 |
| 54 | 59 | ... | ... |