Skip to content

GitLab

Commit 8b13e279 authored by Jan's avatar Jan
Browse files

完成排行榜 和 赛果页面

parent 6258a8da
Hide whitespace changes
Inline Side-by-side
Showing with 395 additions and 356 deletions
Sport.xcodeproj/project.pbxproj
View file @ 8b13e279
......@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
3D07BE721FD4E0F900BC4A64 /* NGGDateCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D07BE701FD4E0F900BC4A64 /* NGGDateCollectionViewCell.m */; };
3D07BE731FD4E0F900BC4A64 /* NGGDateCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D07BE711FD4E0F900BC4A64 /* NGGDateCollectionViewCell.xib */; };
3D0BEAA61FC55B7800EC14A9 /* NGGRankHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D0BEAA51FC55B7800EC14A9 /* NGGRankHeaderView.xib */; };
3D0BEAA91FC55BA100EC14A9 /* NGGRankHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0BEAA81FC55BA100EC14A9 /* NGGRankHeaderView.m */; };
3D25B4AD1FB4287600D20FB2 /* NGGDetailAnalyseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D25B4AC1FB4287600D20FB2 /* NGGDetailAnalyseView.m */; };
......@@ -23,8 +25,6 @@
3D35EDA91FB2F78900E01659 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3D35EC841FB2F78800E01659 /* Info.plist */; };
3D35EDAA1FB2F78900E01659 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D35EC851FB2F78800E01659 /* main.m */; };
3D35EDAB1FB2F78900E01659 /* NGGLoginSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D35EC891FB2F78800E01659 /* NGGLoginSession.m */; };
3D35EDAC1FB2F78900E01659 /* NGGDateListItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D35EC8D1FB2F78800E01659 /* NGGDateListItemView.m */; };
3D35EDAD1FB2F78900E01659 /* NGGDateListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D35EC8F1FB2F78800E01659 /* NGGDateListView.m */; };
3D35EDAE1FB2F78900E01659 /* NGGGuessDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D35EC911FB2F78800E01659 /* NGGGuessDetailViewController.m */; };
3D35EDAF1FB2F78900E01659 /* NGGGuessDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D35EC921FB2F78800E01659 /* NGGGuessDetailViewController.xib */; };
3D35EDB01FB2F78900E01659 /* NGGHomeActivityHeaderReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D35EC941FB2F78800E01659 /* NGGHomeActivityHeaderReusableView.m */; };
......@@ -244,6 +244,9 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
3D07BE6F1FD4E0F900BC4A64 /* NGGDateCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NGGDateCollectionViewCell.h; sourceTree = "<group>"; };
3D07BE701FD4E0F900BC4A64 /* NGGDateCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NGGDateCollectionViewCell.m; sourceTree = "<group>"; };
3D07BE711FD4E0F900BC4A64 /* NGGDateCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NGGDateCollectionViewCell.xib; sourceTree = "<group>"; };
3D0BEAA51FC55B7800EC14A9 /* NGGRankHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NGGRankHeaderView.xib; sourceTree = "<group>"; };
3D0BEAA71FC55BA100EC14A9 /* NGGRankHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NGGRankHeaderView.h; sourceTree = "<group>"; };
3D0BEAA81FC55BA100EC14A9 /* NGGRankHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NGGRankHeaderView.m; sourceTree = "<group>"; };
......@@ -270,10 +273,6 @@
3D35EC851FB2F78800E01659 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
3D35EC881FB2F78800E01659 /* NGGLoginSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NGGLoginSession.h; sourceTree = "<group>"; };
3D35EC891FB2F78800E01659 /* NGGLoginSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NGGLoginSession.m; sourceTree = "<group>"; };
3D35EC8C1FB2F78800E01659 /* NGGDateListItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NGGDateListItemView.h; sourceTree = "<group>"; };
3D35EC8D1FB2F78800E01659 /* NGGDateListItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NGGDateListItemView.m; sourceTree = "<group>"; };
3D35EC8E1FB2F78800E01659 /* NGGDateListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NGGDateListView.h; sourceTree = "<group>"; };
3D35EC8F1FB2F78800E01659 /* NGGDateListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NGGDateListView.m; sourceTree = "<group>"; };
3D35EC901FB2F78800E01659 /* NGGGuessDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NGGGuessDetailViewController.h; sourceTree = "<group>"; };
3D35EC911FB2F78800E01659 /* NGGGuessDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NGGGuessDetailViewController.m; sourceTree = "<group>"; };
3D35EC921FB2F78800E01659 /* NGGGuessDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NGGGuessDetailViewController.xib; sourceTree = "<group>"; };
......@@ -1417,10 +1416,6 @@
3D922EF51FD00DF1003AA7F1 /* Game List */ = {
isa = PBXGroup;
children = (
3D35EC8C1FB2F78800E01659 /* NGGDateListItemView.h */,
3D35EC8D1FB2F78800E01659 /* NGGDateListItemView.m */,
3D35EC8E1FB2F78800E01659 /* NGGDateListView.h */,
3D35EC8F1FB2F78800E01659 /* NGGDateListView.m */,
3DF60B3A1FD126FA00FE26E9 /* NGGPreGameTableViewCell.h */,
3DF60B391FD126F900FE26E9 /* NGGPreGameTableViewCell.m */,
3D35ECA91FB2F78800E01659 /* NGGPreGameTableViewCell.xib */,
......@@ -1433,6 +1428,9 @@
3DF60B401FD12F8100FE26E9 /* NGGLeagueModel.m */,
3DF60B451FD1624400FE26E9 /* NGGGameDateModel.h */,
3DF60B461FD1624400FE26E9 /* NGGGameDateModel.m */,
3D07BE6F1FD4E0F900BC4A64 /* NGGDateCollectionViewCell.h */,
3D07BE701FD4E0F900BC4A64 /* NGGDateCollectionViewCell.m */,
3D07BE711FD4E0F900BC4A64 /* NGGDateCollectionViewCell.xib */,
3D922EF61FD00EEB003AA7F1 /* NGGGameListView.h */,
3D922EF71FD00EEB003AA7F1 /* NGGGameListView.m */,
3D922EF91FD00F72003AA7F1 /* NGGGameListView.xib */,
......@@ -1618,6 +1616,7 @@
3D35EDE01FB2F78900E01659 /* DMMultiImagePicker.bundle in Resources */,
3D35EDA71FB2F78900E01659 /* LaunchScreen.storyboard in Resources */,
3D35EDC61FB2F78900E01659 /* NGGRegisterViewController.xib in Resources */,
3D07BE731FD4E0F900BC4A64 /* NGGDateCollectionViewCell.xib in Resources */,
3D35EDB11FB2F78900E01659 /* NGGHomeActivityHeaderReusableView.xib in Resources */,
3D35EE5C1FB3085400E01659 /* NGGGuess2RowsCollectionViewCell.xib in Resources */,
);
......@@ -1687,7 +1686,6 @@
3DF60B471FD1624400FE26E9 /* NGGGameDateModel.m in Sources */,
3D35EE1A1FB2F78900E01659 /* UIButton+WebCache.m in Sources */,
3D35EDDB1FB2F78900E01659 /* DMAssetGroupTableViewCell.m in Sources */,
3D35EDAC1FB2F78900E01659 /* NGGDateListItemView.m in Sources */,
3D35EE1B1FB2F78900E01659 /* UIImage+GIF.m in Sources */,
3D35EE001FB2F78900E01659 /* MJRefreshGifHeader.m in Sources */,
3D35EE0F1FB2F78900E01659 /* MKAnnotationView+WebCache.m in Sources */,
......@@ -1699,6 +1697,7 @@
3D35EE061FB2F78900E01659 /* UIScrollView+MJExtension.m in Sources */,
3D45CB751FCC1434006EF330 /* NGGMessageViewController.m in Sources */,
3D35EE2C1FB2F78900E01659 /* ViewController.m in Sources */,
3D07BE721FD4E0F900BC4A64 /* NGGDateCollectionViewCell.m in Sources */,
3D35EDF11FB2F78900E01659 /* NSArray+MASAdditions.m in Sources */,
3D35EDF61FB2F78900E01659 /* MJRefreshBackFooter.m in Sources */,
3D45CB851FCD380D006EF330 /* NGGExchangeViewController.m in Sources */,
......@@ -1746,7 +1745,6 @@
3D4B1BE51FC7CF9400FBAB6C /* NGGImageTableViewCell.m in Sources */,
3D0BEAA91FC55BA100EC14A9 /* NGGRankHeaderView.m in Sources */,
3D35EDD51FB2F78900E01659 /* AFHTTPSessionManager.m in Sources */,
3D35EDAD1FB2F78900E01659 /* NGGDateListView.m in Sources */,
3D4B1BE91FC7D34300FBAB6C /* NGGCommonCellModel.m in Sources */,
3D45CB8E1FCD5D14006EF330 /* NGGRechargeCollectionViewCell.m in Sources */,
3DDACFB71FC82F3B0057BD9B /* NGGCommonTableViewCell.m in Sources */,
......
Sport.xcodeproj/xcuserdata/Jan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 8b13e279
......@@ -4,83 +4,13 @@
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Sport/Modules/Login/NGGRegisterViewController.m"
timestampString = "533720862.109487"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "266"
endingLineNumber = "266"
landmarkName = "-registerButtonClicked:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Sport/Modules/Login/NGGRegisterViewController.m"
timestampString = "533720862.109601"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "262"
endingLineNumber = "262"
landmarkName = "-registerButtonClicked:"
landmarkType = "7">
<Locations>
<Location
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__51-[NGGRegisterViewController registerButtonClicked:]_block_invoke"
moduleName = "Sport"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/Jan/Code/Sport/Sport/Modules/Login/NGGRegisterViewController.m"
timestampString = "533817636.298862"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "262"
endingLineNumber = "262"
offsetFromSymbolStart = "136">
</Location>
<Location
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__51-[NGGRegisterViewController registerButtonClicked:]_block_invoke_2"
moduleName = "Sport"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/Jan/Code/Sport/Sport/Modules/Login/NGGRegisterViewController.m"
timestampString = "533817636.30025"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "262"
endingLineNumber = "262"
offsetFromSymbolStart = "24">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Sport/Modules/Home/PreGuess/Game List/NGGDateListView.m"
timestampString = "533817636.165998"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "58"
endingLineNumber = "58"
landmarkName = "-dateItemClicked:"
landmarkType = "7">
scope = "1"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
......
Sport/Base/NGGTabBarController.m
View file @ 8b13e279
......@@ -104,7 +104,6 @@
[childVC.tabBarItem setTitleTextAttributes:textAttrs forState:UIControlStateNormal];
childVC.tabBarItem.title = tabbarName;
// 设置tabBarItem的选中文字颜色
NSMutableDictionary *selectedTextAttrs = [NSMutableDictionary dictionary];
selectedTextAttrs[NSForegroundColorAttributeName] = NGGPrimaryColor;
......
Sport/Modules/Home/NGGHomeViewController.m
View file @ 8b13e279
......@@ -207,11 +207,6 @@ static NSString *kHomeHeaderIdentifier = @"NGGHomeHeaderReusableView";
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:logoView];;
}
//-(BOOL)prefersStatusBarHidden {
//
// return YES;
//}
#pragma mark - private methods
- (void)bannerImageTapped:(NSInteger)index {
......
Sport/Modules/Home/PreGuess/Detail/NGGGuessDetailViewController.h
View file @ 8b13e279
......@@ -7,7 +7,10 @@
//
#import "NGGCommonViewController.h"
#import "NGGGameListModel.h"
@interface NGGGuessDetailViewController : NGGCommonViewController
@property (nonatomic, strong) NGGGameListModel *model;
@end
Sport/Modules/Home/PreGuess/Detail/NGGGuessDetailViewController.m
View file @ 8b13e279
......@@ -38,7 +38,7 @@ static NSString *kDetailHeaderIdentifier = @"NGGDetailHeaderReusableView";
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
[self configueUIComponents];
self.title = @"赛事";
}
- (void)didReceiveMemoryWarning {
......@@ -46,6 +46,12 @@ static NSString *kDetailHeaderIdentifier = @"NGGDetailHeaderReusableView";
// Dispose of any resources that can be recreated.
}
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[self configueUIComponents];
}
#pragma mark - private methods
- (void)configueUIComponents {
......@@ -68,11 +74,11 @@ static NSString *kDetailHeaderIdentifier = @"NGGDetailHeaderReusableView";
_collectionView.backgroundColor = NGGSeparatorColor;
_collectionView.contentInset = UIEdgeInsetsMake(0, 0, 15, 0);
_analyseView = [[[NSBundle mainBundle] loadNibNamed:@"NGGDetailAnalyseView" owner:nil options:nil] lastObject];
_analyseView.hidden = YES;
[self.view addSubview:_analyseView];
[_analyseView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(_collectionView.mas_top);
make.left.bottom.right.equalTo(self.view);
}];
......
Sport/Modules/Home/PreGuess/Game List/.DS_Store
View file @ 8b13e279
No preview for this file type
Sport/Modules/Home/PreGuess/Game List/NGGDateListItemView.h → Sport/Modules/Home/PreGuess/Game List/NGGDateCollectionViewCell.h
View file @ 8b13e279
//
// NGGDateListItemView.h
// sport
// NGGDateCollectionViewCell.h
// Sport
//
// Created by Jan on 30/10/2017.
// Created by Jan on 04/12/2017.
// Copyright © 2017 NGG. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "NGGGameDateModel.h"
@interface NGGDateListItemView : UIButton
@interface NGGDateCollectionViewCell : UICollectionViewCell
@property (nonatomic, strong) NGGGameDateModel *model;
......
Sport/Modules/Home/PreGuess/Game List/NGGDateCollectionViewCell.m 0 → 100644
View file @ 8b13e279
//
// NGGDateCollectionViewCell.m
// Sport
//
// Created by Jan on 04/12/2017.
// Copyright © 2017 NGG. All rights reserved.
//
#import "NGGDateCollectionViewCell.h"
#import "JYCommonTool.h"
@interface NGGDateCollectionViewCell () {
__weak IBOutlet UILabel *_weekLabel;
__weak IBOutlet UILabel *_countLabel;
__weak IBOutlet UILabel *_dateLabel;
}
@end
@implementation NGGDateCollectionViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setModel:(NGGGameDateModel *)model {
_model = model;
_weekLabel.text = model.dateName;
_countLabel.text = [NSString stringWithFormat:@"(%@)", _model.count];
_dateLabel.text = [JYCommonTool dateFormatWithInterval:_model.timeStamp.integerValue format:@"hh/mm"];
}
- (void)setSelected:(BOOL)selected {
[super setSelected:selected];
_weekLabel.textColor = selected ? NGGPrimaryColor : NGGColor333;
_countLabel.textColor = selected ? NGGPrimaryColor : NGGColor333;
_dateLabel.textColor = selected ? NGGPrimaryColor : NGGColor333;
}
@end
Sport/Modules/Home/PreGuess/Game List/NGGDateCollectionViewCell.xib 0 → 100644
View file @ 8b13e279
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="NGGDateCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="192" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="192" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="09/21" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="77L-nx-f5r">
<rect key="frame" x="0.0" y="30" width="192" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Lk4-bD-9dt"/>
</constraints>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7lc-on-Oha">
<rect key="frame" x="61" y="10" width="71" height="20"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="星期三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nKR-Ct-FbM">
<rect key="frame" x="0.0" y="0.0" width="43" height="20"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="42" id="rTX-8s-85c"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(15)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FL2-uF-SMO">
<rect key="frame" x="43" y="0.0" width="28" height="20"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="nKR-Ct-FbM" secondAttribute="bottom" id="1TA-T0-GiE"/>
<constraint firstAttribute="width" priority="200" constant="50" id="8kx-De-JEG"/>
<constraint firstItem="nKR-Ct-FbM" firstAttribute="leading" secondItem="7lc-on-Oha" secondAttribute="leading" id="C22-Bv-No6"/>
<constraint firstAttribute="trailing" secondItem="FL2-uF-SMO" secondAttribute="trailing" id="VEK-IK-LU0"/>
<constraint firstAttribute="height" constant="20" id="Zfx-Mg-bjz"/>
<constraint firstAttribute="bottom" secondItem="FL2-uF-SMO" secondAttribute="bottom" id="eEl-6Y-Qud"/>
<constraint firstItem="nKR-Ct-FbM" firstAttribute="top" secondItem="7lc-on-Oha" secondAttribute="top" id="qOZ-yf-eIb"/>
<constraint firstItem="FL2-uF-SMO" firstAttribute="leading" secondItem="nKR-Ct-FbM" secondAttribute="trailing" id="uaT-BP-I0h"/>
<constraint firstItem="FL2-uF-SMO" firstAttribute="top" secondItem="7lc-on-Oha" secondAttribute="top" id="v5O-1n-1Gh"/>
</constraints>
</view>
</subviews>
</view>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="7lc-on-Oha" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="20m-FT-PME"/>
<constraint firstItem="7lc-on-Oha" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="4fj-bT-38k"/>
<constraint firstItem="77L-nx-f5r" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="F1a-rq-HJA"/>
<constraint firstAttribute="trailing" secondItem="77L-nx-f5r" secondAttribute="trailing" id="HBn-PR-hFU"/>
<constraint firstAttribute="bottom" secondItem="77L-nx-f5r" secondAttribute="bottom" constant="10" id="rEq-5Y-XIP"/>
</constraints>
<size key="customSize" width="192" height="60"/>
<connections>
<outlet property="_countLabel" destination="FL2-uF-SMO" id="zIl-7A-PZX"/>
<outlet property="_dateLabel" destination="77L-nx-f5r" id="6pl-xJ-7ve"/>
<outlet property="_weekLabel" destination="nKR-Ct-FbM" id="ldk-TE-0ZT"/>
</connections>
<point key="canvasLocation" x="96" y="57"/>
</collectionViewCell>
</objects>
</document>
Sport/Modules/Home/PreGuess/Game List/NGGDateListItemView.m deleted 100644 → 0
View file @ 6258a8da
//
// NGGDateListItemView.m
// sport
//
// Created by Jan on 30/10/2017.
// Copyright © 2017 NGG. All rights reserved.
//
#import "NGGDateListItemView.h"
#import "JYCommonTool.h"
@interface NGGDateListItemView () {
UILabel *_titleLabel;
UILabel *_dateLabel;
}
@end
@implementation NGGDateListItemView
- (instancetype)initWithFrame:(CGRect)frame {
if ([super initWithFrame:frame]) {
[self setup:frame];
}
return self;
}
- (void)setup:(CGRect)frame {
_titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 12, frame.size.width, 15)];
_titleLabel.textColor = NGGColor333;
_titleLabel.font = [UIFont systemFontOfSize:14];
_titleLabel.textAlignment = NSTextAlignmentCenter;
[self addSubview:_titleLabel];
_dateLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 33, frame.size.width, 15)];
_dateLabel.textColor = NGGColor333;
_dateLabel.font = [UIFont systemFontOfSize:14];
_dateLabel.textAlignment = NSTextAlignmentCenter;
[self addSubview:_dateLabel];
}
- (void)setModel:(NGGGameDateModel *)model {
_model = model;
_titleLabel.text = [NSString stringWithFormat:@"%@(%@)", model.dateName, model.count];
if (!isStringEmpty(_model.timeStamp)) {
_dateLabel.text = [JYCommonTool dateFormatWithInterval:_model.timeStamp.integerValue format:@"MM/dd"];
}
}
- (void)setSelected:(BOOL)selected {
if (selected) {
_titleLabel.textColor = NGGPrimaryColor;
_dateLabel.textColor = NGGPrimaryColor;
} else {
_titleLabel.textColor = NGGColor333;
_dateLabel.textColor = NGGColor333;
}
}
@end
Sport/Modules/Home/PreGuess/Game List/NGGDateListView.h deleted 100644 → 0
View file @ 6258a8da
//
// NGGDateListView.h
// sport
//
// Created by Jan on 30/10/2017.
// Copyright © 2017 NGG. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "NGGGameDateModel.h"
@protocol NGGDateListViewDelegate<NSObject>
- (void)dateListViewDidSelectItem:(NGGGameDateModel *)model atIndex:(NSInteger)index;
@end
@interface NGGDateListView : UIScrollView
@property (nonatomic, assign) NSInteger dateSelectedIndex;
@property (nonatomic, strong) NSArray *arrayOfDate;
@property (nonatomic, weak) id <NGGDateListViewDelegate> listViewdelegate;
@end
Sport/Modules/Home/PreGuess/Game List/NGGDateListView.m deleted 100644 → 0
View file @ 6258a8da
//
// NGGDateListView.m
// sport
//
// Created by Jan on 30/10/2017.
// Copyright © 2017 NGG. All rights reserved.
//
#import "NGGDateListView.h"
#import "NGGDateListItemView.h"
@interface NGGDateListItemView ()
@end
@implementation NGGDateListView
- (void)awakeFromNib {
[super awakeFromNib];
self.pagingEnabled = NO;
self.showsVerticalScrollIndicator = NO;
self.showsHorizontalScrollIndicator = NO;
}
- (void)setArrayOfDate:(NSArray *)arrayOfDate {
_arrayOfDate = arrayOfDate;
[self refreshData];
}
- (void)refreshData {
for (UIView *subview in self.subviews) {
[subview removeFromSuperview];
}
NSInteger itemCount = [_arrayOfDate count];
CGFloat lastViewLeftX = 0;
for (NSInteger index = 0; index < itemCount; index++) {
NGGDateListItemView *itemView = [[NGGDateListItemView alloc] initWithFrame:CGRectMake(lastViewLeftX, 0, 85, VIEW_H(self))];
itemView.tag = index;
itemView.model = _arrayOfDate[index];
[itemView addTarget:self action:@selector(dateItemClicked:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:itemView];
lastViewLeftX += VIEW_W(itemView);
}
self.contentSize = CGSizeMake(lastViewLeftX, VIEW_H(self));
}
- (void)dateItemClicked:(NGGDateListItemView *)itemView {
itemView.selected = YES;
if (_listViewdelegate && [_listViewdelegate respondsToSelector:@selector(dateListViewDidSelectItem:atIndex:)]) {
[_listViewdelegate dateListViewDidSelectItem:_arrayOfDate[itemView.tag] atIndex:itemView.tag];
}
}
@end
Sport/Modules/Home/PreGuess/Game List/NGGGameListModel.m
View file @ 8b13e279
......@@ -15,7 +15,7 @@
if (self = [super initWithInfo:dict]) {
_matchID = [dict stringForKey:@"match_id"];
_leagueName = [dict stringForKey:@"c_name"];
_leagueName = [dict stringForKey:@"c_full_name"];
_homeName = [dict stringForKey:@"h_name"];
_awayName = [dict stringForKey:@"a_name"];
_timeString = [dict stringForKey:@"match_time"];
......
Sport/Modules/Home/PreGuess/Game List/NGGGameListView.h
View file @ 8b13e279
......@@ -13,8 +13,9 @@
@protocol NGGGameListViewDelegate <NSObject>
///nil 为选择全部
- (void)gameListViewDidSelectDate:(NSDate *)date;
- (void)gameListViewDidSelectLeague:(NGGLeagueModel *)model;
- (void)gameListViewUpdateInfoWithLeagueID:(NSString *)leagueID timeStamp:(NSString *)timeStamp;
- (void)gameListViewDidSelectCellWithModel:(NGGGameListModel *)model;
@end
......
Sport/Modules/Home/PreGuess/Game List/NGGGameListView.m
View file @ 8b13e279
......@@ -7,25 +7,23 @@
//
#import "NGGGameListView.h"
#import "NGGDateListView.h"
#import "NGGTypeTableViewCell.h"
#import "NGGPreGameTableViewCell.h"
#import "NGGDateCollectionViewCell.h"
static NSString *kTypeCellIdentifier = @"NGGTypeTableViewCell";
static NSString *kGameCellIdentifier = @"NGGGameTableViewCell";
static NSString *kGameDateCellIdentifier = @"NGGGameDateCell";
@interface NGGGameListView ()<UITableViewDelegate, UITableViewDataSource, NGGDateListViewDelegate> {
@interface NGGGameListView ()<UITableViewDelegate, UITableViewDataSource, UICollectionViewDelegate, UICollectionViewDataSource> {
}
@property (weak, nonatomic) IBOutlet UITableView *typeTableView;
@property (weak, nonatomic) IBOutlet UITableView *gameTableView;
@property (weak, nonatomic) IBOutlet NGGDateListView *dateScrollView;
@property (weak, nonatomic) IBOutlet UICollectionView *dateCollectionView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *typeTableViewWidthConstraint;
@property (nonatomic, assign) NSInteger leagueSelectedIndex;
@property (nonatomic, assign) NSInteger dateSelectedindex;
@property (nonatomic, strong) NSArray<NGGLeagueModel *> *arrayOfLeague;
@property (nonatomic, strong) NSArray<NGGGameListModel *> *arrayOfGame;
@property (nonatomic, strong) NSArray *arrayOfDate;
......@@ -66,73 +64,141 @@ static NSString *kGameCellIdentifier = @"NGGGameTableViewCell";
[_gameTableView registerNib:[UINib nibWithNibName:@"NGGPreGameTableViewCell" bundle:nil] forCellReuseIdentifier:kGameCellIdentifier];
_typeTableViewWidthConstraint.constant = 125.0 * SCREEN_WIDTH / 375;
_dateScrollView.listViewdelegate = self;
_dateCollectionView.delegate = self;
_dateCollectionView.dataSource = self;
[_dateCollectionView registerNib:[UINib nibWithNibName:@"NGGDateCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:kGameDateCellIdentifier];
}
- (void)setDictionaryOfGameList:(NSDictionary *)dictionaryOfGameList {
_dictionaryOfGameList = dictionaryOfGameList;
[self refrshData];
if (_arrayOfDate == nil) {//初始化
[self initData];
} else {
[self refreshData];
}
}
- (void)refreshUI {
_dateScrollView.arrayOfDate = _arrayOfDate;
NSIndexPath *typeSelectedIndexPath = [_typeTableView indexPathForSelectedRow];
if (typeSelectedIndexPath == nil) {
typeSelectedIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
}
[_typeTableView reloadData];
[_gameTableView reloadData];
if ([_arrayOfLeague count] > 0) {
[_typeTableView selectRowAtIndexPath:typeSelectedIndexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
UITableViewCell *cell = [_typeTableView cellForRowAtIndexPath:typeSelectedIndexPath];
[cell setSelected:YES animated:NO];
}
}
- (void)refrshData {
///初始化日期数据以及联赛数据
- (void)initData {
if (_dictionaryOfGameList == nil) {//数据为零
if (_dictionaryOfGameList == nil) return;
_arrayOfGame = nil;
_arrayOfLeague = nil;
_arrayOfDate = nil;
_dateSelectedindex = -1;
_leagueSelectedIndex = -1;
[self refreshUI];
} else {
NSArray *gameListArray = [_dictionaryOfGameList arrayForKey:@"list"];
NSArray *leagueListArray = [_dictionaryOfGameList arrayForKey:@"classify"];
NSArray *dateArray = [_dictionaryOfGameList arrayForKey:@"date"];
NSMutableArray *dateArrayM = [NSMutableArray arrayWithCapacity:[dateArray count] + 1];
NSInteger allGame = 0;
for (NSInteger index = 0; index < [dateArray count]; index++) {
NSArray *gameListArray = [_dictionaryOfGameList arrayForKey:@"list"];
NSArray *leagueListArray = [_dictionaryOfGameList arrayForKey:@"classify"];
NSArray *dateArray = [_dictionaryOfGameList arrayForKey:@"date"];
NGGGameDateModel *dateModel = [[NGGGameDateModel alloc] initWithInfo:dateArray[index]];
allGame += dateModel.count.integerValue;
[dateArrayM addObject:dateModel];
}
if ([dateArray count] > 0) {
NSMutableArray *dateArrayM = [NSMutableArray arrayWithCapacity:[dateArray count] + 1];
NSInteger allGame = 0;
for (NSInteger index = 0; index < [dateArray count]; index++) {
NGGGameDateModel *dateModel = [[NGGGameDateModel alloc] initWithInfo:dateArray[index]];
allGame += dateModel.count.integerValue;
[dateArrayM addObject:dateModel];
}
NGGGameDateModel *dateAllModel = [[NGGGameDateModel alloc] init];
dateAllModel.dateName = @"全部";
dateAllModel.count = @(allGame).stringValue;
[dateArrayM insertObject:dateAllModel atIndex:0];
_arrayOfDate = [dateArrayM copy];
}
_arrayOfDate = [dateArrayM copy];
NSMutableArray *leagueArrayM = [NSMutableArray arrayWithCapacity:[leagueListArray count]];
for (NSInteger index = 0; index < [leagueListArray count]; index++) {
NGGLeagueModel *leagueModel = [[NGGLeagueModel alloc] initWithInfo:leagueListArray[index]];
[leagueArrayM addObject:leagueModel];
}
if ([leagueArrayM count] > 0) {
NSMutableArray *arrayM = [NSMutableArray arrayWithCapacity:[gameListArray count]];
for (NSInteger index = 0; index < [gameListArray count]; index++) {
NGGGameListModel *gameModel = [[NGGGameListModel alloc] initWithInfo:gameListArray[index]];
[arrayM addObject:gameModel];
}
_arrayOfGame = [arrayM copy];
NGGLeagueModel *leagueAllModel = [[NGGLeagueModel alloc] init];
leagueAllModel.leagueName = @"所有联赛";
[leagueArrayM insertObject:leagueAllModel atIndex:0];
}
_arrayOfLeague = [leagueArrayM copy];
NSMutableArray *gameArrayM = [NSMutableArray arrayWithCapacity:[gameListArray count]];
for (NSInteger index = 0; index < [gameListArray count]; index++) {
arrayM = [NSMutableArray arrayWithCapacity:[leagueListArray count]];
for (NSInteger index = 0; index < [leagueListArray count]; index++) {
NGGLeagueModel *leagueModel = [[NGGLeagueModel alloc] initWithInfo:leagueListArray[index]];
[arrayM addObject:leagueModel];
}
_arrayOfLeague = [arrayM copy];
NGGGameListModel *gameModel = [[NGGGameListModel alloc] initWithInfo:gameListArray[index]];
[gameArrayM addObject:gameModel];
}
_arrayOfGame = [gameArrayM copy];
[self initFreshUI];
}
[self refreshUI];
- (void)initFreshUI {
[_typeTableView reloadData];
[_gameTableView reloadData];
[_dateCollectionView reloadData];
if ([_arrayOfLeague count] > 0) {
[_typeTableView selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] animated:NO scrollPosition:UITableViewScrollPositionNone];
UITableViewCell *cell = [_typeTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
[cell setSelected:YES animated:NO];
}
if ([_arrayOfDate count] > 0) {
[_dateCollectionView selectItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] animated:NO scrollPosition:UICollectionViewScrollPositionNone];
}
}
- (void)refreshData {
NSArray *gameListArray = [_dictionaryOfGameList arrayForKey:@"list"];
NSArray *leagueListArray = [_dictionaryOfGameList arrayForKey:@"classify"];
NSMutableArray *leagueArrayM = [NSMutableArray arrayWithCapacity:[leagueListArray count]];
for (NSInteger index = 0; index < [leagueListArray count]; index++) {
NGGLeagueModel *leagueModel = [[NGGLeagueModel alloc] initWithInfo:leagueListArray[index]];
[leagueArrayM addObject:leagueModel];
}
if ([leagueArrayM count] > 0) {
NGGLeagueModel *leagueAllModel = [[NGGLeagueModel alloc] init];
leagueAllModel.leagueName = @"所有联赛";
[leagueArrayM insertObject:leagueAllModel atIndex:0];
}
_arrayOfLeague = [leagueArrayM copy];
NSMutableArray *gameArrayM = [NSMutableArray arrayWithCapacity:[gameListArray count]];
for (NSInteger index = 0; index < [gameListArray count]; index++) {
NGGGameListModel *gameModel = [[NGGGameListModel alloc] initWithInfo:gameListArray[index]];
[gameArrayM addObject:gameModel];
}
_arrayOfGame = [gameArrayM copy];
[self refreshUI];
}
#pragma mark - UITableViewDataSource
......@@ -184,32 +250,79 @@ static NSString *kGameCellIdentifier = @"NGGGameTableViewCell";
return 0.01f;
}
//- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
//{
//
// return 70.f;
//}
- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
// NGGGuessDetailViewController *controller = [[NGGGuessDetailViewController alloc] init];
// [self.navigationController pushViewController:controller animated:YES];
//
- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
if ([tableView isEqual:_typeTableView]) {
if (_delegate && [_delegate respondsToSelector:@selector(gameListViewUpdateInfoWithLeagueID:timeStamp:)]) {
NSIndexPath *selectedDateIndexPath = [[_dateCollectionView indexPathsForSelectedItems] firstObject];
NGGGameDateModel *model = _arrayOfDate[selectedDateIndexPath.item];
NSString *timeStamp = model.timeStamp;
if (timeStamp == nil) {//全部 为空
timeStamp = @"0";
}
NGGLeagueModel *leagueModel = _arrayOfLeague[indexPath.row];
NSString *leagueID = leagueModel.leagueID;
if (leagueID == nil) {//全部为空
leagueID = @"0";
}
[_delegate gameListViewUpdateInfoWithLeagueID:leagueID timeStamp:timeStamp];
}
} else if ([tableView isEqual:_gameTableView]) {
NGGGameListModel *model = _arrayOfGame[indexPath.row];
if (_delegate && [_delegate respondsToSelector:@selector(gameListViewDidSelectCellWithModel:)]) {
[_delegate gameListViewDidSelectCellWithModel:model];
}
}
}
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
{
#pragma mark - UICollectionViewDataSource && UICollectionViewDelagate
- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
[cell setLayoutMargins:UIEdgeInsetsZero];
return 1;
}
#pragma mark - NGGDateListViewDelegate
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
return [_arrayOfDate count];
}
- (void)dateListViewDidSelectItem:(NSDictionary *)itemInfo atIndex:(NSInteger)index {
- (UICollectionViewCell *) collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
// if (_delegate && _delegate respondsToSelector:@selector(gameListViewDidSelectDate:)) {
//
//
// }
NGGDateCollectionViewCell *cell = [_dateCollectionView dequeueReusableCellWithReuseIdentifier:kGameDateCellIdentifier forIndexPath:indexPath];
cell.model = _arrayOfDate[indexPath.row];
return cell;
}
- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath {
return nil;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(nonnull NSIndexPath *)indexPath {
NGGGameDateModel *model = _arrayOfDate[indexPath.row];
if (_arrayOfLeague.count > 0) {
[_typeTableView selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] animated:NO scrollPosition:UITableViewScrollPositionNone];
}
if (_delegate && [_delegate respondsToSelector:@selector(gameListViewUpdateInfoWithLeagueID:timeStamp:)]) {
NSString *timeStamp = model.timeStamp;
if (timeStamp == nil) {
timeStamp = @"0";
}
[_delegate gameListViewUpdateInfoWithLeagueID:@"0" timeStamp:timeStamp];
}
}
@end
Sport/Modules/Home/PreGuess/Game List/NGGGameListView.xib
View file @ 8b13e279
......@@ -16,57 +16,64 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I6B-H0-oWA">
<rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="die-6h-aiV">
<rect key="frame" x="0.0" y="0.0" width="35" height="55"/>
<rect key="frame" x="0.0" y="0.0" width="25" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="35" id="gHR-Fn-zXU"/>
<constraint firstAttribute="width" constant="25" id="gHR-Fn-zXU"/>
</constraints>
<state key="normal" image="arrow_left"/>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B9M-Bk-v6B">
<rect key="frame" x="340" y="0.0" width="35" height="55"/>
<rect key="frame" x="350" y="0.0" width="25" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="35" id="k01-WB-J6Z"/>
<constraint firstAttribute="width" constant="25" id="k01-WB-J6Z"/>
</constraints>
<state key="normal" image="arrow_right"/>
</button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TCw-VS-Eez" customClass="NGGDateListView">
<rect key="frame" x="35" y="0.0" width="305" height="55"/>
</scrollView>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="QBI-n3-lO1">
<rect key="frame" x="25" y="0.0" width="325" height="60"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="0Qg-Yr-jub">
<size key="itemSize" width="85" height="60"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
</collectionView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="TCw-VS-Eez" firstAttribute="top" secondItem="I6B-H0-oWA" secondAttribute="top" id="02b-2F-C8l"/>
<constraint firstAttribute="bottom" secondItem="TCw-VS-Eez" secondAttribute="bottom" id="5H1-ow-t30"/>
<constraint firstItem="QBI-n3-lO1" firstAttribute="top" secondItem="I6B-H0-oWA" secondAttribute="top" id="64e-wd-Wot"/>
<constraint firstAttribute="trailing" secondItem="B9M-Bk-v6B" secondAttribute="trailing" id="7yH-Mc-hav"/>
<constraint firstAttribute="height" constant="55" id="DfC-sc-o1c"/>
<constraint firstItem="B9M-Bk-v6B" firstAttribute="leading" secondItem="QBI-n3-lO1" secondAttribute="trailing" id="DaM-ys-vYi"/>
<constraint firstAttribute="height" constant="60" id="DfC-sc-o1c"/>
<constraint firstItem="B9M-Bk-v6B" firstAttribute="top" secondItem="I6B-H0-oWA" secondAttribute="top" id="bAE-PV-b6e"/>
<constraint firstItem="TCw-VS-Eez" firstAttribute="leading" secondItem="die-6h-aiV" secondAttribute="trailing" id="ecJ-Ys-bG9"/>
<constraint firstItem="QBI-n3-lO1" firstAttribute="leading" secondItem="die-6h-aiV" secondAttribute="trailing" id="e5E-SY-RIf"/>
<constraint firstAttribute="bottom" secondItem="die-6h-aiV" secondAttribute="bottom" id="gVE-IZ-XuK"/>
<constraint firstItem="B9M-Bk-v6B" firstAttribute="leading" secondItem="TCw-VS-Eez" secondAttribute="trailing" id="jh4-YT-BnT"/>
<constraint firstItem="die-6h-aiV" firstAttribute="top" secondItem="I6B-H0-oWA" secondAttribute="top" id="mAQ-gQ-jJt"/>
<constraint firstAttribute="bottom" secondItem="B9M-Bk-v6B" secondAttribute="bottom" id="oTf-Lh-qTD"/>
<constraint firstAttribute="bottom" secondItem="QBI-n3-lO1" secondAttribute="bottom" id="xYI-o5-5Ku"/>
<constraint firstItem="die-6h-aiV" firstAttribute="leading" secondItem="I6B-H0-oWA" secondAttribute="leading" id="xcu-X4-FV1"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4EL-kB-Vk8">
<rect key="frame" x="0.0" y="55" width="375" height="1"/>
<rect key="frame" x="0.0" y="60" width="375" height="1"/>
<color key="backgroundColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="i8p-fE-o7T"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="9RS-A9-KbA">
<rect key="frame" x="0.0" y="56" width="125" height="611"/>
<rect key="frame" x="0.0" y="61" width="125" height="606"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="125" id="uXO-Bl-Hm6"/>
</constraints>
</tableView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="llr-lE-8RK">
<rect key="frame" x="125" y="56" width="250" height="611"/>
<rect key="frame" x="125" y="61" width="250" height="606"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</tableView>
</subviews>
......@@ -88,7 +95,7 @@
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="dateScrollView" destination="TCw-VS-Eez" id="rwr-cd-wJw"/>
<outlet property="dateCollectionView" destination="QBI-n3-lO1" id="L7K-Ka-9Yk"/>
<outlet property="gameTableView" destination="llr-lE-8RK" id="jqX-mh-80L"/>
<outlet property="typeTableView" destination="9RS-A9-KbA" id="lc5-C5-4E4"/>
<outlet property="typeTableViewWidthConstraint" destination="uXO-Bl-Hm6" id="vaK-Sv-JfH"/>
......
Sport/Modules/Home/PreGuess/Game List/NGGTypeTableViewCell.m
View file @ 8b13e279
......@@ -13,6 +13,8 @@
__weak IBOutlet UIImageView *_noticeView;
__weak IBOutlet UIImageView *_logoView;
__weak IBOutlet UILabel *_leagueName;
__weak IBOutlet UILabel *_countLabel;
}
@end
......@@ -40,7 +42,13 @@
- (void)setModel:(NGGLeagueModel *)model{
_model = model;
_leagueName.text = [NSString stringWithFormat:@"%@(%@)", _model.leagueName, _model.count];
_leagueName.text = _model.leagueName;
if (_model.count) {
_countLabel.text = [NSString stringWithFormat:@"(%@)", _model.count];
} else {
_countLabel.text = nil;
}
}
@end
Sport/Modules/Home/PreGuess/Game List/NGGTypeTableViewCell.xib
View file @ 8b13e279
......@@ -24,35 +24,48 @@
<constraint firstAttribute="width" constant="22" id="gqL-14-DWk"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="所有联赛(182)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="2P9-aN-7wo">
<rect key="frame" x="30" y="0.0" width="98" height="74.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TAU-jk-7xN">
<rect key="frame" x="0.0" y="0.0" width="3" height="74.5"/>
<constraints>
<constraint firstAttribute="width" constant="3" id="7dA-3z-RYJ"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="英超" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="Gs0-3V-S1U">
<rect key="frame" x="35" y="0.0" width="29" height="74.5"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="I1A-T5-02e"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(15)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PhG-XP-FCo">
<rect key="frame" x="64" y="0.0" width="59" height="74.5"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.95294117647058818" green="0.95686274509803915" blue="0.97647058823529409" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="TAU-jk-7xN" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="0qs-cT-AEx"/>
<constraint firstAttribute="bottom" secondItem="2P9-aN-7wo" secondAttribute="bottom" id="7vq-Zk-RQC"/>
<constraint firstAttribute="trailing" secondItem="2P9-aN-7wo" secondAttribute="trailing" constant="5" id="BFK-5T-fXW"/>
<constraint firstItem="2LS-sI-YdU" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="3" id="FCV-vL-DSx"/>
<constraint firstItem="2P9-aN-7wo" firstAttribute="leading" secondItem="2LS-sI-YdU" secondAttribute="trailing" constant="5" id="KXP-rT-aau"/>
<constraint firstAttribute="bottom" secondItem="PhG-XP-FCo" secondAttribute="bottom" id="MK5-c5-hue"/>
<constraint firstItem="Gs0-3V-S1U" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="daC-rX-XhM"/>
<constraint firstItem="TAU-jk-7xN" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="e3M-HT-Wvm"/>
<constraint firstItem="PhG-XP-FCo" firstAttribute="leading" secondItem="Gs0-3V-S1U" secondAttribute="trailing" id="g7x-k6-UIG"/>
<constraint firstAttribute="bottom" secondItem="2LS-sI-YdU" secondAttribute="bottom" id="hZi-aj-IbK"/>
<constraint firstAttribute="trailing" secondItem="PhG-XP-FCo" secondAttribute="trailing" constant="10" id="iHW-he-LMY"/>
<constraint firstItem="2LS-sI-YdU" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="kYj-vc-wNK"/>
<constraint firstItem="PhG-XP-FCo" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="mhp-rg-pbJ"/>
<constraint firstAttribute="bottom" secondItem="Gs0-3V-S1U" secondAttribute="bottom" id="qBQ-hr-ySq"/>
<constraint firstItem="Gs0-3V-S1U" firstAttribute="leading" secondItem="2LS-sI-YdU" secondAttribute="trailing" constant="10" id="sUX-Tl-GXj"/>
<constraint firstAttribute="bottom" secondItem="TAU-jk-7xN" secondAttribute="bottom" id="zKc-CA-w96"/>
<constraint firstItem="2P9-aN-7wo" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="zla-vG-kGI"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="_leagueName" destination="2P9-aN-7wo" id="8rW-I8-SRN"/>
<outlet property="_countLabel" destination="PhG-XP-FCo" id="gBZ-Cr-oeK"/>
<outlet property="_leagueName" destination="Gs0-3V-S1U" id="ecZ-Mp-BMV"/>
<outlet property="_logoView" destination="2LS-sI-YdU" id="rLW-lI-ici"/>
<outlet property="_noticeView" destination="TAU-jk-7xN" id="Bwc-nG-IaD"/>
</connections>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment