Commit f2adb8b756b071a4a66928bed2e934f1fdcb43d5

Authored by “张旭”
1 parent 170b2d47

1.1.5.25.04.21.12 , 过滤重复的默认商品数据

metaCode.xcodeproj/project.pbxproj
@@ -2936,7 +2936,7 @@ @@ -2936,7 +2936,7 @@
2936 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 2936 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2937 CODE_SIGN_IDENTITY = "Apple Development"; 2937 CODE_SIGN_IDENTITY = "Apple Development";
2938 CODE_SIGN_STYLE = Automatic; 2938 CODE_SIGN_STYLE = Automatic;
2939 - CURRENT_PROJECT_VERSION = 1.1.5.25.04.21.11; 2939 + CURRENT_PROJECT_VERSION = 1.1.5.25.04.21.12;
2940 DEBUG_INFORMATION_FORMAT = dwarf; 2940 DEBUG_INFORMATION_FORMAT = dwarf;
2941 DEVELOPMENT_TEAM = 94X49GG3ZW; 2941 DEVELOPMENT_TEAM = 94X49GG3ZW;
2942 ENABLE_BITCODE = NO; 2942 ENABLE_BITCODE = NO;
@@ -3192,7 +3192,7 @@ @@ -3192,7 +3192,7 @@
3192 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 3192 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
3193 CODE_SIGN_IDENTITY = "Apple Development"; 3193 CODE_SIGN_IDENTITY = "Apple Development";
3194 CODE_SIGN_STYLE = Automatic; 3194 CODE_SIGN_STYLE = Automatic;
3195 - CURRENT_PROJECT_VERSION = 1.1.5.25.04.21.11; 3195 + CURRENT_PROJECT_VERSION = 1.1.5.25.04.21.12;
3196 DEVELOPMENT_TEAM = 94X49GG3ZW; 3196 DEVELOPMENT_TEAM = 94X49GG3ZW;
3197 ENABLE_BITCODE = NO; 3197 ENABLE_BITCODE = NO;
3198 ENABLE_MODULE_VERIFIER = NO; 3198 ENABLE_MODULE_VERIFIER = NO;
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
@@ -1611,7 +1611,15 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1611,7 +1611,15 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1611 guard let self = self else { return } 1611 guard let self = self else { return }
1612 if status == .success{ 1612 if status == .success{
1613 let albumBaseModel = result as! CNLiveAlbumBaseModel 1613 let albumBaseModel = result as! CNLiveAlbumBaseModel
1614 - self.dataArray.add(albumBaseModel.list) 1614 + var isHaveGoodjson = false//是否有默认商品
  1615 + for (_,mdl) in self.dataArray.enumerated(){
  1616 + if let models = mdl as? [CNLiveAlbumModel]{
  1617 + isHaveGoodjson = true
  1618 + }
  1619 + }
  1620 + if !isHaveGoodjson{
  1621 + self.dataArray.add(albumBaseModel.list)
  1622 + }
1615 self.tableView.reloadData() 1623 self.tableView.reloadData()
1616 1624
1617 }else if (status == .noNetwork) { 1625 }else if (status == .noNetwork) {