Skip to content

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

修改项说明：

parent 81f157cd
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 32 deletions
Class/LearningCenter/OnlineLearning/AssessmentViewController.m
View file @ c61266a9
......@@ -249,7 +249,7 @@
}else {
WS(weakSelf);
[XBLoadingView showHUDViewWithDefault];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(GETINTEGRAL) WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),@"studyScore"] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
AssessmentQualifiedViewController *qualified = [[[weakSelf class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"AssessmentQualifiedViewController"];
......
Class/LearningCenter/SkillsAssessment/AnswerViewController.h
View file @ c61266a9
......@@ -8,9 +8,15 @@
#import "BaseViewController.h"
@interface AnswerViewController : BaseViewController
@protocol DismissDelegate <NSObject>
@optional
- (void)dismissController;
@end
@interface AnswerViewController : BaseViewController
@property (nonatomic,weak) id<DismissDelegate>delegate;
@property (weak, nonatomic) IBOutlet UITableView *answerTableView;
/**
......
Class/LearningCenter/SkillsAssessment/AnswerViewController.m
View file @ c61266a9
......@@ -14,7 +14,7 @@
#import "EmigratedFinishViewController.h"
@interface AnswerViewController ()<UITableViewDelegate,UITableViewDataSource,WYPopoverControllerDelegate>
@interface AnswerViewController ()<UITableViewDelegate,UITableViewDataSource,WYPopoverControllerDelegate,CompeteDelegate>
@property (nonatomic,strong) WYPopoverController *popover;
......@@ -150,6 +150,9 @@
#pragma mark - 提交答案
- (void)submitAnswer
{
if ([self.delegate respondsToSelector:@selector(dismissController)]) {
[self.delegate dismissController];
}
TOPassLevelResultEntity *studyResult = [[TOPassLevelResultEntity alloc]init];
studyResult.passLevelId = self.passLevelId;
studyResult.submitTime = [[self class] getTimeby:0];
......@@ -228,7 +231,7 @@
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf determineIsQualified:[studyResult.grade integerValue]];
[weakSelf determineIsQualified:[studyResult.grade integerValue] passResult:[studyResult.passResult integerValue]];
}else{
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
}
......@@ -239,21 +242,28 @@
}
#pragma mark - 判断得分是否及格
- (void)determineIsQualified:(NSInteger)allScore
- (void)determineIsQualified:(NSInteger)allScore passResult:(NSInteger)state
{
EmigratedFinishViewController *finish = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"EmigratedFinishViewController"];
finish.delegate = self;
finish.preferredContentSize = CGSizeMake(520, 400);
if (self.emigrated.passGrade > allScore) {
EmigratedFinishViewController *finish = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"EmigratedFinishViewController"];
finish.preferredContentSize = CGSizeMake(520, 400);
finish.state = state;
finish.score = [NSString stringWithFormat:@"%ld",allScore];
[self showPopoverView:finish];
}else {
WS(weakSelf);
[XBLoadingView showHUDViewWithDefault];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(GETINTEGRAL) WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),@"passLevelScore"];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
finish.state = state;
finish.score = [NSString stringWithFormat:@"%ld",allScore];
finish.integral = [NSString stringWithFormat:@"+%@",returnValue[@"data"][@"optionValue"]];
[weakSelf showPopoverView:finish];
}else {
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
......@@ -265,6 +275,12 @@
}
}
#pragma mark - 完成
- (void)finish
{
[self.popover dismissPopoverAnimated:YES];
}
#pragma mark - 弹出框
- (void)showPopoverView:(BaseViewController *)controller
{
......
Class/LearningCenter/SkillsAssessment/EmigratedFinishViewController.h
View file @ c61266a9
......@@ -8,15 +8,49 @@
#import "BaseViewController.h"
@interface EmigratedFinishViewController : BaseViewController
@protocol CompeteDelegate <NSObject>
- (void)finish;
@end
/**
闯关结果
- NotThrough: 未通过
- Through: 已通过
- Audit: 待审核
*/
typedef NS_ENUM(NSInteger,RESULT_STATE){
NotThrough = 0,
Through,
Audit
};
@interface EmigratedFinishViewController : BaseViewController
@property (nonatomic,weak) id<CompeteDelegate>delegate;
@property (nonatomic,assign) RESULT_STATE state;
/**
闯关结果
*/
@property (weak, nonatomic) IBOutlet UILabel *emigratedResultLabel;
//@property (nonatomic,assign)
/**
得分
*/
@property (nonatomic,copy) NSString *score;
/**
积分
*/
@property (weak, nonatomic) IBOutlet UILabel *integralLabel;
/**
积分
*/
@property (nonatomic,copy) NSString *integral;
@end
Class/LearningCenter/SkillsAssessment/EmigratedFinishViewController.m
View file @ c61266a9
......@@ -16,12 +16,48 @@
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
switch (self.state) {
case NotThrough:
{
NSString *string = [NSString stringWithFormat:@"您的得分为%@\n\n闯关失败!",self.score];
NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:string];
NSRange range = NSMakeRange(5, [self.score length]);
[attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:range];
[attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"HelveticaNeue-Bold" size:35] range:range];
self.emigratedResultLabel.attributedText = attributedString;
}
break;
case Through:
{
NSString *string = [NSString stringWithFormat:@"您的得分为%@\n\n恭喜您，闯关成功！",self.score];
NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:string];
NSRange range = NSMakeRange(5, [self.score length]);
[attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:range];
[attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"HelveticaNeue-Bold" size:35] range:range];
self.integralLabel.text = [NSString stringWithFormat:@"+%@",self.integral];
self.emigratedResultLabel.attributedText = attributedString;
}
break;
case Audit:
{
self.emigratedResultLabel.text = @"您的回答已提交\n\n请等待反馈!";
}
break;
default:
break;
}
}
#pragma mark - 完成
- (IBAction)finishButtonClickAction:(UIButton *)sender {
if ([self.delegate respondsToSelector:@selector(finish)]) {
[self.delegate finish];
}
}
......
Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m
View file @ c61266a9
......@@ -11,7 +11,7 @@
#import "InstructionsViewController.h"
#import "AnswerViewController.h"
@interface EmigratedMainViewController ()<WYPopoverControllerDelegate>
@interface EmigratedMainViewController ()<WYPopoverControllerDelegate,DismissDelegate>
@property (nonatomic,strong) WYPopoverController *popover;
......@@ -87,11 +87,18 @@
{
TOPassLevelEntity *entity = self.emigratedResponse.passLevelEntity[sender.view.tag];
AnswerViewController *answer = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"AnswerViewController"];
answer.delegate = self;
answer.passLevelId = entity.fid;
answer.preferredContentSize = CGSizeMake(520, 400);
[self showPopoverView:answer];
}
#pragma mark - 做题完成
- (void)dismissController
{
[self.popover dismissPopoverAnimated:YES];
}
#pragma mark - 闯关说明
- (IBAction)instructionsButtonClickAction:(UIButton *)sender {
......
Lighting/LearningCenter.storyboard
View file @ c61266a9
......@@ -202,14 +202,14 @@
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="案例分析" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="InC-cR-acr">
<frame key="frameInset" minX="116" minY="22" width="883.59%" height="21"/>
<frame key="frameInset" minX="115.5" minY="22" width="1081.60%" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="优秀配灯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="R8L-1A-ohO">
<frame key="frameInset" minX="116" minY="48" width="883.59%" height="21"/>
<frame key="frameInset" minX="115.5" minY="48" width="1081.60%" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
......@@ -249,15 +249,15 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Recruitbackground" id="0NY-ad-nEt">
<frame key="frameInset" maxX="0.5" maxY="1.5"/>
<frame key="frameInset" maxX="1" maxY="2"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<view contentMode="scaleToFill" misplaced="YES" id="vtN-wg-csm">
<frame key="frameInset" minX="27" width="140" height="130"/>
<frame key="frameInset" minX="27" width="140" height="129.5" maxY="0.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="instructions" id="LiS-v3-89f">
<frame key="frameInset" minX="-0.5" maxX="0.5"/>
<frame key="frameInset" minX="-1" maxX="0.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Td0-qu-vJs">
......@@ -278,7 +278,7 @@
</connections>
</button>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.0" contentMode="scaleToFill" misplaced="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" id="YAA-QI-Lbo">
<frame key="frameInset" minX="311.5" minY="426" height="120" maxX="312"/>
<frame key="frameInset" minX="311" minY="426" height="120" maxX="312"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</scrollView>
</subviews>
......@@ -433,7 +433,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" id="UfB-K3-NdF" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="55.5" width="461" height="44"/>
<rect key="frame" x="0.0" y="56" width="461" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UfB-K3-NdF" id="WGo-Wa-YTq">
<frame key="frameInset" width="461" height="44"/>
......@@ -455,7 +455,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="52" id="gIe-bF-XsX" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="99.5" width="461" height="52"/>
<rect key="frame" x="0.0" y="100" width="461" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gIe-bF-XsX" id="Va8-wn-DBM">
<frame key="frameInset" width="461" height="52"/>
......@@ -492,7 +492,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentShortAnswerTableViewCell" rowHeight="112" id="smV-qr-KgP" customClass="AssessmentShortAnswerTableViewCell">
<rect key="frame" x="0.0" y="151.5" width="461" height="112"/>
<rect key="frame" x="0.0" y="152" width="461" height="112"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="smV-qr-KgP" id="A2f-ek-60T">
<frame key="frameInset" width="461" height="112"/>
......@@ -563,13 +563,20 @@
<frame key="frameInset" minX="50.00%" minY="56" width="150" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="你的得分为30 /n闯关失败" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="duB-al-sAf">
<frame key="frameInset" minX="45" minY="125" height="76" maxX="44"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="你的得分为30 /n闯关失败" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="duB-al-sAf">
<frame key="frameInset" minX="45" minY="125" height="120" maxX="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="25"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fHH-AJ-0Fy">
<frame key="frameInset" minY="142" width="119" height="103" maxX="20"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="60"/>
<color key="textColor" red="1" green="0.86721502110000004" blue="0.58854900600000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
......@@ -577,6 +584,7 @@
<size key="freeformSize" width="520" height="400"/>
<connections>
<outlet property="emigratedResultLabel" destination="duB-al-sAf" id="7nN-iJ-d45"/>
<outlet property="integralLabel" destination="fHH-AJ-0Fy" id="FSp-dX-qGm"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dYy-aS-5qL" userLabel="First Responder" sceneMemberID="firstResponder"/>
......@@ -1197,25 +1205,25 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" misplaced="YES" id="ZY0-DP-xQk">
<frame key="frameInset" minX="-0.5" minY="64" height="60" maxX="0.5"/>
<frame key="frameInset" minX="-0.5" minY="64" height="60"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销售的意义及销售的核心考核" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KeJ-aK-Mpo">
<frame key="frameInset" minX="166" minY="20" height="21" maxX="303.5"/>
<frame key="frameInset" minX="165" minY="20" height="21" maxX="304.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<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" id="HpZ-JD-HL0">
<frame key="frameInset" minY="20" width="77" height="21" maxX="132"/>
<frame key="frameInset" minY="20" width="77.5" height="21" maxX="132.5"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<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" misplaced="YES" text="50:12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2cl-ml-2MF" customClass="CountDownLabel">
<frame key="frameInset" minY="19" width="115.5" height="21" maxX="14.5"/>
<frame key="frameInset" minY="19" width="116" height="21" maxX="15"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="0.98209542036056519" green="0.21587386296076985" blue="0.25378193483566203" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -1225,7 +1233,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<color key="backgroundColor" red="0.97647058823529409" green="0.93333333333333335" blue="0.85098039215686272" alpha="1" colorSpace="calibratedRGB"/>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="81" sectionHeaderHeight="18" sectionFooterHeight="18" id="XRP-My-vMh">
<frame key="frameInset" minX="-0.5" minY="123.5" maxX="0.5" maxY="53.5"/>
<frame key="frameInset" minX="-0.5" minY="123.5" maxY="53.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
......@@ -1294,7 +1302,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</connections>
</tableView>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Ah0-JC-drA">
<frame key="frameInset" minX="49.75%" width="141.5" height="39" maxY="8"/>
<frame key="frameInset" minX="49.75%" width="141.5" height="39.5" maxY="8"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.3411764705882353" green="0.66274509803921566" blue="0.84705882352941175" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
......
Tools/CYConstManager.m
View file @ c61266a9
......@@ -350,7 +350,7 @@ NSString *const SUBMITANSWER = @"/study/submitStudyResult";
/**
* 获取相应分数对应的积分
*/
NSString *const GETINTEGRAL = @"/option/get/studyScore";
NSString *const GETINTEGRAL = @"/option/get/%@";
/**
* 获取闯关详情
......
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