Commit 90f6ba20b5ba081f36b2cceaa97da5745e90ff1c
1 parent
84838751
no message
Showing
2 changed files
with
110 additions
and
1 deletions
CNLiveScioLive.xcodeproj/xcshareddata/xcschemes/CNLiveScioLive.xcscheme
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<Scheme | ||
| 3 | + LastUpgradeVersion = "1010" | ||
| 4 | + version = "1.3"> | ||
| 5 | + <BuildAction | ||
| 6 | + parallelizeBuildables = "YES" | ||
| 7 | + buildImplicitDependencies = "YES"> | ||
| 8 | + <BuildActionEntries> | ||
| 9 | + <BuildActionEntry | ||
| 10 | + buildForTesting = "YES" | ||
| 11 | + buildForRunning = "YES" | ||
| 12 | + buildForProfiling = "YES" | ||
| 13 | + buildForArchiving = "YES" | ||
| 14 | + buildForAnalyzing = "YES"> | ||
| 15 | + <BuildableReference | ||
| 16 | + BuildableIdentifier = "primary" | ||
| 17 | + BlueprintIdentifier = "08C08F6D214F997E00E23D16" | ||
| 18 | + BuildableName = "CNLiveScioLive.app" | ||
| 19 | + BlueprintName = "CNLiveScioLive" | ||
| 20 | + ReferencedContainer = "container:CNLiveScioLive.xcodeproj"> | ||
| 21 | + </BuildableReference> | ||
| 22 | + </BuildActionEntry> | ||
| 23 | + </BuildActionEntries> | ||
| 24 | + </BuildAction> | ||
| 25 | + <TestAction | ||
| 26 | + buildConfiguration = "Debug" | ||
| 27 | + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| 28 | + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| 29 | + shouldUseLaunchSchemeArgsEnv = "YES"> | ||
| 30 | + <Testables> | ||
| 31 | + </Testables> | ||
| 32 | + <MacroExpansion> | ||
| 33 | + <BuildableReference | ||
| 34 | + BuildableIdentifier = "primary" | ||
| 35 | + BlueprintIdentifier = "08C08F6D214F997E00E23D16" | ||
| 36 | + BuildableName = "CNLiveScioLive.app" | ||
| 37 | + BlueprintName = "CNLiveScioLive" | ||
| 38 | + ReferencedContainer = "container:CNLiveScioLive.xcodeproj"> | ||
| 39 | + </BuildableReference> | ||
| 40 | + </MacroExpansion> | ||
| 41 | + <AdditionalOptions> | ||
| 42 | + </AdditionalOptions> | ||
| 43 | + </TestAction> | ||
| 44 | + <LaunchAction | ||
| 45 | + buildConfiguration = "Debug" | ||
| 46 | + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| 47 | + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| 48 | + launchStyle = "0" | ||
| 49 | + useCustomWorkingDirectory = "NO" | ||
| 50 | + ignoresPersistentStateOnLaunch = "NO" | ||
| 51 | + debugDocumentVersioning = "YES" | ||
| 52 | + debugServiceExtension = "internal" | ||
| 53 | + allowLocationSimulation = "YES"> | ||
| 54 | + <BuildableProductRunnable | ||
| 55 | + runnableDebuggingMode = "0"> | ||
| 56 | + <BuildableReference | ||
| 57 | + BuildableIdentifier = "primary" | ||
| 58 | + BlueprintIdentifier = "08C08F6D214F997E00E23D16" | ||
| 59 | + BuildableName = "CNLiveScioLive.app" | ||
| 60 | + BlueprintName = "CNLiveScioLive" | ||
| 61 | + ReferencedContainer = "container:CNLiveScioLive.xcodeproj"> | ||
| 62 | + </BuildableReference> | ||
| 63 | + </BuildableProductRunnable> | ||
| 64 | + <AdditionalOptions> | ||
| 65 | + </AdditionalOptions> | ||
| 66 | + </LaunchAction> | ||
| 67 | + <ProfileAction | ||
| 68 | + buildConfiguration = "Release" | ||
| 69 | + shouldUseLaunchSchemeArgsEnv = "YES" | ||
| 70 | + savedToolIdentifier = "" | ||
| 71 | + useCustomWorkingDirectory = "NO" | ||
| 72 | + debugDocumentVersioning = "YES"> | ||
| 73 | + <BuildableProductRunnable | ||
| 74 | + runnableDebuggingMode = "0"> | ||
| 75 | + <BuildableReference | ||
| 76 | + BuildableIdentifier = "primary" | ||
| 77 | + BlueprintIdentifier = "08C08F6D214F997E00E23D16" | ||
| 78 | + BuildableName = "CNLiveScioLive.app" | ||
| 79 | + BlueprintName = "CNLiveScioLive" | ||
| 80 | + ReferencedContainer = "container:CNLiveScioLive.xcodeproj"> | ||
| 81 | + </BuildableReference> | ||
| 82 | + </BuildableProductRunnable> | ||
| 83 | + </ProfileAction> | ||
| 84 | + <AnalyzeAction | ||
| 85 | + buildConfiguration = "Debug"> | ||
| 86 | + </AnalyzeAction> | ||
| 87 | + <ArchiveAction | ||
| 88 | + buildConfiguration = "Release" | ||
| 89 | + revealArchiveInOrganizer = "YES"> | ||
| 90 | + </ArchiveAction> | ||
| 91 | +</Scheme> |
CNLiveScioLive/Pages/Home/搜索/Controller/CNLiveSearchViewController.m
| @@ -487,7 +487,25 @@ | @@ -487,7 +487,25 @@ | ||
| 487 | cell.tagsLabel.text = text; | 487 | cell.tagsLabel.text = text; |
| 488 | [cell reSetTagFrame]; | 488 | [cell reSetTagFrame]; |
| 489 | return cell; | 489 | return cell; |
| 490 | - } else if ([@"article" isEqualToString:_dic[@"type"]]) { | 490 | + } |
| 491 | + else if ([@"subject" isEqualToString:_dic[@"type"]]) { | ||
| 492 | + static NSString *identifier = @"articleCell"; | ||
| 493 | + ArticleTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:identifier]; | ||
| 494 | + if (cell == nil) { | ||
| 495 | + cell = [[ArticleTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]; | ||
| 496 | + } | ||
| 497 | + [cell.backImage sd_setImageWithURL:[NSURL URLWithString:_dic[@"img"]] placeholderImage:[UIImage imageNamed:@"backDefault"]]; | ||
| 498 | + cell.titleLabel.text = _dic[@"title"]; | ||
| 499 | + cell.timeLabel.text = [_dic[@"createDate"] componentsSeparatedByString:@" "][0]; | ||
| 500 | + NSString *text = [NSString stringWithFormat:@"%@",_dic[@"tags"]]; | ||
| 501 | + if ([text isEqualToString:@"<null>"]||[text isEqualToString:@""]) { | ||
| 502 | + text = @"专题"; | ||
| 503 | + } | ||
| 504 | + cell.tagsLabel.text = text; | ||
| 505 | + [cell reSetTagFrame]; | ||
| 506 | + return cell; | ||
| 507 | + } | ||
| 508 | + else if ([@"article" isEqualToString:_dic[@"type"]]) { | ||
| 491 | 509 | ||
| 492 | if ([@"" isEqualToString:_dic[@"img"]]) { | 510 | if ([@"" isEqualToString:_dic[@"img"]]) { |
| 493 | static NSString *identifier = @"NoticeCell"; | 511 | static NSString *identifier = @"NoticeCell"; |