iOS Team / CNLiveMateCode · Commits

Commit 5400af31d91ed77c758e77a0f91ac244202c6c25

Authored by liushiyu
2 parents 88077267 515d428c

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
metaCode.xcodeproj/project.pbxproj
  View file @5400af3
@@ -1445,7 +1445,7 @@ @@ -1445,7 +1445,7 @@
1445 GENERATE_INFOPLIST_FILE = YES; 1445 GENERATE_INFOPLIST_FILE = YES;
1446 INFOPLIST_FILE = metaCode/Info.plist; 1446 INFOPLIST_FILE = metaCode/Info.plist;
1447 INFOPLIST_KEY_CFBundleDisplayName = "元码"; 1447 INFOPLIST_KEY_CFBundleDisplayName = "元码";
1448 - INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能"; 1448 + INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用上传头像、意见反馈、资质审核等功能";
1449 INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市"; 1449 INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
1450 INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市"; 1450 INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
1451 INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市"; 1451 INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
@@ -1490,7 +1490,7 @@ @@ -1490,7 +1490,7 @@
1490 GENERATE_INFOPLIST_FILE = YES; 1490 GENERATE_INFOPLIST_FILE = YES;
1491 INFOPLIST_FILE = metaCode/Info.plist; 1491 INFOPLIST_FILE = metaCode/Info.plist;
1492 INFOPLIST_KEY_CFBundleDisplayName = "元码"; 1492 INFOPLIST_KEY_CFBundleDisplayName = "元码";
1493 - INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能"; 1493 + INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用上传头像、意见反馈、资质审核等功能";
1494 INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市"; 1494 INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
1495 INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市"; 1495 INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
1496 INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市"; 1496 INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
metaCode/Classes/Main/HomePage/Controller/CNUpSlideViewController.swift
  View file @5400af3
@@ -205,16 +205,16 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa @@ -205,16 +205,16 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
205 hiddenLoading() 205 hiddenLoading()
206 206
207 if status == .success{ 207 if status == .success{
208 - self.dataArray.addObjects(from: result as! [Any]) 208 + self.dataArray.removeAllObjects()
  209 + let array = result as! [Any]
209 let newDataArray = NSMutableArray() 210 let newDataArray = NSMutableArray()
210 - for slideModel in self.dataArray { 211 + for slideModel in array {
211 if let model = slideModel as? CNLiveDownSlideModel{ 212 if let model = slideModel as? CNLiveDownSlideModel{
212 213
213 let layout = CNLiveDownSlideModelLayout.init(model: model) 214 let layout = CNLiveDownSlideModelLayout.init(model: model)
214 newDataArray.addObjects(from: [layout.getCellHModel()]) 215 newDataArray.addObjects(from: [layout.getCellHModel()])
215 } 216 }
216 } 217 }
217 - self.dataArray.removeAllObjects()  
218 self.dataArray.addObjects(from: newDataArray as! [Any]) 218 self.dataArray.addObjects(from: newDataArray as! [Any])
219 219
220 self.tableView.reloadData() 220 self.tableView.reloadData()