Skip to content

O
Opple-iOS
Commit 1bb1ac58 authored by 曹云霄's avatar 曹云霄
Browse files
Options

进入主题后，增加一个界面，包含该主题下的：课程分类。每个分类下的：课程列表。课程列表包含课程名称、课程学习进度，考试状态，考试得分信息

parent 54fe9a26
Show whitespace changes
Inline Side-by-side
Showing with 318 additions and 83 deletions
Class/LearningCenter/ComprehensiveDiscussion/ForumItemDetailViewController.m
View file @ 1bb1ac58
......@@ -161,7 +161,8 @@
commentCell.bestView.delegate = self;
commentCell.indexPath = indexPath;
commentCell.replyEntity = self.commentsArray[indexPath.row];
commentCell.optionButton.hidden = ![self.topicDetail.posterId isEqualToString:[Shoppersmanager manager].Shoppers.employee.fid];
BOOL boolValue = ([self.topicDetail.posterId isEqualToString:[Shoppersmanager manager].Shoppers.employee.fid] || [self.topicDetail.category isEqualToString:OPPLE_ASK]);
commentCell.optionButton.hidden = boolValue;
return commentCell;
}
......
Class/LearningCenter/OnlineLearning/OnlineLearningDetailViewController.m
View file @ 1bb1ac58
......@@ -72,6 +72,10 @@
videoWindow.delegate = self;
[self addChildViewController:videoWindow];
[self.view addSubview:videoWindow.view];
//播放简介
VideoDetailViewController *playDetail = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"VideoDetailViewController"];
[self addChildViewController:playDetail];
[self.view addSubview:playDetail.view];
//播放列表
VideoListViewController *playList = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"VideoListViewController"];
playList.studyItemTitle = self.studyTypeEntity.name;
......@@ -79,10 +83,6 @@
videoWindow.progressDelegate = playList;
[self addChildViewController:playList];
[self.view addSubview:playList.view];
//播放简介
VideoDetailViewController *playDetail = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"VideoDetailViewController"];
[self addChildViewController:playDetail];
[self.view addSubview:playDetail.view];
__weak typeof(videoWindow) weakVideWindow = videoWindow;
//全屏
WS(weakSelf);
......@@ -102,7 +102,7 @@
}
}];
videoWindow.view.frame = CGRectMake(0,NavigationHeight, ScreenWidth*2/3, ScreenHeight/2);
playList.view.frame = CGRectMake(ScreenWidth*2/3 + 5, NavigationHeight,ScreenWidth/3-5, ScreenHeight-64);
playList.view.frame = CGRectMake(0, 64,ScreenWidth, ScreenHeight-64);
playDetail.view.frame = CGRectMake(0, ScreenHeight/2+NavigationHeight, ScreenWidth*2/3, ScreenHeight/2-NavigationHeight);
}
......@@ -165,17 +165,19 @@
#pragma mark - 选中学习项
- (void)seleStudyItemCellIndex:(NSIndexPath *)indexPath
{
VideoDetailViewController *studyDetailVc = [self.childViewControllers lastObject];
//判断学习列表是否处于全屏状态，第一次选中是需要取消全屏状态
VideoListViewController *studyListVC = self.childViewControllers[2];
if (studyListVC.view.width == ScreenWidth) {
[studyListVC narrowAnimation];
}
VideoDetailViewController *studyDetailVc = self.childViewControllers[1];
studyDetailVc.indexPath = indexPath;
WS(weakSelf);
VideoHelperViewController *videoVc = [self.childViewControllers firstObject];
RsStudyTask *studyEntity = self.studyResult.studyEntity[indexPath.section];
CustomStudyEntity *studyList = studyEntity.studyTasks[indexPath.row];
videoVc.indexPath = indexPath;
//学习列表
VideoListViewController *studyListVC = self.childViewControllers[1];
[studyListVC selectedIndexPath:indexPath withIsQualified:[studyList.examResult boolValue]];
if ([studyList.attachment.fileUrl rangeOfString:@".mp4"].location != NSNotFound) {
//判断是否是第一次播放
if (videoVc.learningItem) {
......@@ -347,9 +349,9 @@
if (result.studyEntity.count == 0) {
[XBLoadingView showHUDViewWithText:@"学习内容为空"];return;
}
VideoListViewController *studyListVC = self.childViewControllers[1];
VideoListViewController *studyListVC = self.childViewControllers[2];
studyListVC.datasArray = [NSMutableArray arrayWithArray:result.studyEntity];
VideoDetailViewController *studyDetailsVC = self.childViewControllers[2];
VideoDetailViewController *studyDetailsVC = self.childViewControllers[1];
studyDetailsVC.datasArray = result.studyEntity;
studyDetailsVC.indexPath = [NSIndexPath indexPathForRow:0 inSection:0];
}
......
Class/LearningCenter/OnlineLearning/VideoListViewController.h
View file @ 1bb1ac58
......@@ -59,4 +59,8 @@
*/
- (void)selectedIndexPath:(NSIndexPath *)indexPath withIsQualified:(BOOL)boolValue;
/**
缩小
*/
- (void)narrowAnimation;
@end
Class/LearningCenter/OnlineLearning/VideoListViewController.m
View file @ 1bb1ac58
......@@ -140,5 +140,14 @@
NSLog(@"%ld",proportion);
}
#pragma mark -缩小动画
- (void)narrowAnimation
{
[UIView animateWithDuration:0.3 animations:^{
self.view.frame = CGRectMake(ScreenWidth*2/3 + 5, NavigationHeight,ScreenWidth/3-5, ScreenHeight-64);
}];
}
@end
Class/RebateDetailsViewController.m
View file @ 1bb1ac58
......@@ -43,7 +43,7 @@
if ([self.inputRebateTextField.text floatValue] > self.rebateAmount) {
[XBLoadingView showHUDViewWithText:@"当前账户余额不足"];return;
}
if ([self.inputRebateTextField.text floatValue] < 10 && [self.billType isEqualToString:redPackage]) {
if ([self.inputRebateTextField.text floatValue] < 10 && [self.billType isEqualToString:REDPACKAGE]) {
[XBLoadingView showHUDViewWithText:@"提现金额不能小于10"];return;
}
if ([self includeChinese:self.inputRebateTextField.text]) {
......
Class/RebateViewController.m
View file @ 1bb1ac58
......@@ -211,7 +211,7 @@
WS(weakSelf);
RebateDetailsViewController *rebateDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateDetailsViewController"];
rebateDetails.rebateAmount = (sender.tag == 100)?[self.resultEntity.accountTotal floatValue]:[self.resultEntity.redPackageAccountTotal floatValue];
rebateDetails.billType = (sender.tag == 100)?commission:redPackage;
rebateDetails.billType = (sender.tag == 100)?COMMISSION:REDPACKAGE;
rebateDetails.bankCardNumber = [[self.resultEntity.bankCards firstObject] bankAccount];
[rebateDetails setShowApplyDetails:^(TOApplyBillEntity *entity) {
WithdrawalTableViewController *detailVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
......
Lighting/GuideIntegral.storyboard
View file @ 1bb1ac58
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="ipad9_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......@@ -14,28 +17,33 @@
<viewControllerLayoutGuide type="bottom" id="BG0-Ov-fcv"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="MCq-MI-wm3">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Yy-Ao-XPR">
<rect key="frame" x="20" y="80" width="728" height="90"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ehM-sk-qnE">
<rect key="frame" x="8" y="10" width="70" height="70"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="E3g-3M-lJm"/>
<constraint firstAttribute="height" constant="70" id="pqd-YU-6ae"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="当前积分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W9n-sx-VVL">
<rect key="frame" x="108" y="25" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="luv-aV-HGH">
<rect key="frame" x="108" y="57" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.98039215690000003" green="0.32156862749999998" blue="0.050980392159999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J4F-f5-GIu">
<rect key="frame" x="598" y="27.5" width="100" height="35"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="EuH-tR-Oni"/>
......@@ -54,6 +62,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DFa-vp-e22">
<rect key="frame" x="228" y="20" width="1" height="50"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="8Lb-Qc-mLm"/>
......@@ -61,6 +70,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wwz-7Q-A55">
<rect key="frame" x="399" y="20" width="1" height="50"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="FCf-dc-Nat"/>
......@@ -68,19 +78,23 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YJy-KV-6XP">
<rect key="frame" x="430" y="57" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Eh-Eu-GWV">
<rect key="frame" x="259" y="57" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="季度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zzy-VB-gpq">
<rect key="frame" x="259" y="25" width="80" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="年度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xbh-34-JR3">
<rect key="frame" x="430" y="25" width="80" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -117,8 +131,10 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hU8-JL-KlR">
<rect key="frame" x="20" y="190" width="728" height="814"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="积分明细" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ip-ij-E17">
<rect key="frame" x="0.0" y="0.0" width="100" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="3x5-VW-7pB"/>
<constraint firstAttribute="width" constant="100" id="F37-Wr-cZh"/>
......@@ -167,10 +183,11 @@
<viewControllerLayoutGuide type="bottom" id="MdX-wh-p4Y"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="S8f-mf-Xs2">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="8mA-NF-xF3">
<rect key="frame" x="0.0" y="110" width="768" height="914"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="BAY-Cu-eCc">
<size key="itemSize" width="146" height="108"/>
......@@ -186,13 +203,17 @@
<rect key="frame" x="0.0" y="0.0" width="146" height="108"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="O88-Xc-mmd"/>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="O88-Xc-mmd">
<rect key="frame" x="0.0" y="0.0" width="146" height="78"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="多功能抱枕" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Qi-Hc-eV0">
<rect key="frame" x="5" y="86.5" width="111" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9kC-nV-7qm">
<rect key="frame" x="121" y="83" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="o3S-8T-gOV"/>
<constraint firstAttribute="width" constant="20" id="vcE-w6-Bg9"/>
......@@ -230,6 +251,7 @@
</connections>
</collectionView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZKg-2M-z15">
<rect key="frame" x="633" y="65" width="100" height="35"/>
<color key="backgroundColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="Lbu-8A-n3N"/>
......@@ -249,6 +271,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LuM-4O-5F2">
<rect key="frame" x="508" y="65" width="100" height="35"/>
<color key="backgroundColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="6aP-FO-UJZ"/>
......@@ -300,45 +323,52 @@
<viewControllerLayoutGuide type="bottom" id="jVO-nq-vjx"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="gPk-r6-eLE">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="106" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="6OB-63-x5H">
<rect key="frame" x="0.0" y="44" width="768" height="980"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeBillTableViewCell" rowHeight="100" id="nOs-BP-FmU" customClass="PrizeExchangeBillTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="100"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeBillTableViewCell" rowHeight="100" id="nOs-BP-FmU" customClass="PrizeExchangeBillTableViewCell">
<rect key="frame" x="0.0" y="28" width="768" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nOs-BP-FmU" id="MbJ-jd-L1F">
<frame key="frameInset" width="1024" height="99"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="兑换单号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O9g-97-MWd">
<rect key="frame" x="40" y="21" width="65.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aya-ed-dzb">
<rect key="frame" x="120.5" y="22" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016年11月22日18:16:19" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QD9-jl-dvj">
<rect key="frame" x="120.5" y="62" width="148" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="兑换日期:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FwA-ch-K2G">
<rect key="frame" x="40" y="61" width="65.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="兑换状态:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bCB-y3-9PG">
<rect key="frame" x="507.5" y="21" width="65.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已申请" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ntU-dA-Kkb">
<rect key="frame" x="588" y="22" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
......@@ -365,39 +395,45 @@
<outlet property="exchangeTimeLabel" destination="QD9-jl-dvj" id="nK9-bu-bwh"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeConsigneeTableViewCell" rowHeight="100" id="Dqq-9I-czz" customClass="PrizeExchangeConsigneeTableViewCell">
<rect key="frame" x="0.0" y="128" width="1024" height="100"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeConsigneeTableViewCell" rowHeight="100" id="Dqq-9I-czz" customClass="PrizeExchangeConsigneeTableViewCell">
<rect key="frame" x="0.0" y="128" width="768" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dqq-9I-czz" id="sVs-pU-Wny">
<frame key="frameInset" width="1024" height="99"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uEN-op-W8u">
<rect key="frame" x="40" y="21" width="50.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ure-Cw-GPA">
<rect key="frame" x="105.5" y="22" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016年11月22日18:16:19" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dVM-nK-yXe">
<rect key="frame" x="120.5" y="62" width="148" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="详细地址:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dgF-Oa-dPM">
<rect key="frame" x="40" y="61" width="65.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eGs-nr-OvN">
<rect key="frame" x="507.5" y="21" width="65.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已申请" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iV7-ce-zDB">
<rect key="frame" x="588" y="22" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
......@@ -424,16 +460,18 @@
<outlet property="phoneNumberLabel" destination="iV7-ce-zDB" id="dI4-5w-b1X"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeSectionTableViewCell" rowHeight="60" id="h1B-nj-hUc" customClass="PrizeExchangeSectionTableViewCell">
<rect key="frame" x="0.0" y="228" width="1024" height="60"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeSectionTableViewCell" rowHeight="60" id="h1B-nj-hUc" customClass="PrizeExchangeSectionTableViewCell">
<rect key="frame" x="0.0" y="228" width="768" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="h1B-nj-hUc" id="Y9f-ox-GSm">
<frame key="frameInset" width="1024" height="59"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oo9-M7-rcL">
<rect key="frame" x="0.0" y="10" width="1000" height="49.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="促销信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aWB-Zw-ZY4">
<rect key="frame" x="28" y="14.5" width="69.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -458,37 +496,41 @@
<outlet property="sectionTitleLabel" destination="aWB-Zw-ZY4" id="naO-Iy-o4b"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeInformationTableViewCell" rowHeight="126" id="L62-fY-nOH" customClass="PrizeExchangeInformationTableViewCell">
<rect key="frame" x="0.0" y="288" width="1024" height="126"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeInformationTableViewCell" rowHeight="126" id="L62-fY-nOH" customClass="PrizeExchangeInformationTableViewCell">
<rect key="frame" x="0.0" y="288" width="768" height="126"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L62-fY-nOH" id="gbr-pV-Tqj">
<frame key="frameInset" width="1024" height="125"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="125"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeCourierTableViewCell" rowHeight="60" id="NIn-Su-84l" customClass="PrizeExchangeCourierTableViewCell">
<rect key="frame" x="0.0" y="414" width="1024" height="60"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeCourierTableViewCell" rowHeight="60" id="NIn-Su-84l" customClass="PrizeExchangeCourierTableViewCell">
<rect key="frame" x="0.0" y="414" width="768" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NIn-Su-84l" id="slW-As-u76">
<frame key="frameInset" width="1024" height="59"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="物流公司:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FGB-vT-nML">
<rect key="frame" x="40" y="21" width="65.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="顺丰快递" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cKG-9P-0Ci">
<rect key="frame" x="120.5" y="22" width="53.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="快递单号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="krH-x5-3MF">
<rect key="frame" x="507.5" y="21" width="65.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789766" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6dY-4m-yfO">
<rect key="frame" x="588" y="22" width="93.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
......@@ -542,30 +584,34 @@
<viewControllerLayoutGuide type="bottom" id="zD2-Kj-wag"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="a4e-de-HwQ">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="qbR-St-FxM">
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="IntegralDetailsTableViewCell" rowHeight="70" id="dvh-wm-f5G" customClass="IntegralDetailsTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<rect key="frame" x="0.0" y="28" width="768" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dvh-wm-f5G" id="UeK-sH-3z8">
<frame key="frameInset" width="1024" height="69"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="69"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="积分清零" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YDf-Lj-2uh">
<rect key="frame" x="10" y="17" width="58" height="17"/>
<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="2016年12月14日23:25:13" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IZs-JW-Ffo">
<rect key="frame" x="10" y="37" width="141" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-200" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5dd-4T-RC4">
<rect key="frame" x="719" y="24" width="39" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -587,25 +633,29 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="prizeDetailsTableViewCell" rowHeight="90" id="GX2-Gv-YRn" customClass="prizeDetailsTableViewCell">
<rect key="frame" x="0.0" y="98" width="1024" height="90"/>
<rect key="frame" x="0.0" y="98" width="768" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GX2-Gv-YRn" id="tQ9-m3-04b">
<frame key="frameInset" width="1024" height="89"/>
<rect key="frame" x="0.0" y="0.0" width="768" height="89"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zvz-7f-MPc">
<rect key="frame" x="25" y="8" width="718" height="75"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="兑换单号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WLA-Tz-XJu">
<rect key="frame" x="20" y="39" width="62" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567898754" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fKt-d3-ydD">
<rect key="frame" x="87" y="39" width="95" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ynF-nD-CoS">
<rect key="frame" x="608" y="17" width="100" height="40"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="7kY-E3-pLl"/>
<constraint firstAttribute="height" constant="40" id="xyv-cI-LdF"/>
......@@ -621,6 +671,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016年11月22日10:07:57" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AiS-xF-TBa">
<rect key="frame" x="20" y="19" width="161" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -691,7 +742,7 @@
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
</document>
Lighting/LearningCenter.storyboard
View file @ 1bb1ac58
This source diff could not be displayed because it is too large. You can view the blob instead.
Tools/CYConstManager.h
View file @ 1bb1ac58
......@@ -608,9 +608,12 @@ extern NSString *const RECRUITTHROUGH;
/**
* 返利
*/
extern NSString *const commission;
extern NSString *const COMMISSION;
/**
* 红包
*/
extern NSString *const redPackage;
extern NSString *const REDPACKAGE;
/**
* 欧普问问
*/
extern NSString *const OPPLE_ASK;
Tools/CYConstManager.m
View file @ 1bb1ac58
......@@ -606,13 +606,15 @@ NSString *const RECRUITTHROUGH = @"7";
/**
* 返利
*/
NSString *const commission = @"commission";
NSString *const COMMISSION = @"commission";
/**
* 红包
*/
NSString *const redPackage = @"redPackage";
NSString *const REDPACKAGE = @"redPackage";
/**
* 欧普问问
*/
NSString *const OPPLE_ASK = @"欧普问问";
......
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