修改项说明：闯关界面开发

Class/LearningCenter/ComprehensiveDiscussion/ForumViewController.m

@@ -37,6 +37,7 @@
     [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(FORUMTYPS) WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
         NSLog(@"%@",returnValue);
+        [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
         }else{

Class/LearningCenter/LearningCenterMain/LearningCenterMainViewController.m

@@ -9,6 +9,7 @@
 #import "LearningCenterMainViewController.h"
 #import "OnlineLearningViewController.h"
 #import "ForumViewController.h"
+#import "EmigratedMainViewController.h"
 
 @interface LearningCenterMainViewController ()
 
@@ -80,29 +81,9 @@
 #pragma mark - 闯关
 - (void)breakthroughViewClickAction:(UITapGestureRecognizer *)sender
 {
-    
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
+    EmigratedMainViewController *emigrated = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"EmigratedMainViewController"];
+    [self.navigationController pushViewController:emigrated animated:YES];
 }
 
 
-
 @end

Class/LearningCenter/OnlineLearning/LearningCompleteViewController.h

+//
+//  LearningCompleteViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface LearningCompleteViewController : BaseViewController
+
+
+/**
+ 获得积分
+ */
+@property (weak, nonatomic) IBOutlet UILabel *obtainIntegralLabel;
+
+@end

Class/LearningCenter/OnlineLearning/LearningCompleteViewController.m

+//
+//  LearningCompleteViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "LearningCompleteViewController.h"
+
+@interface LearningCompleteViewController ()
+
+@end
+
+@implementation LearningCompleteViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+}
+
+#pragma mark - 开始考核
+- (IBAction)startEvaluationButtonClickAction:(UIButton *)sender {
+}
+
+@end

Class/LearningCenter/OnlineLearning/OnlineLearningDetailViewController.m

@@ -14,10 +14,38 @@
 
 @interface OnlineLearningDetailViewController ()
 
+
+/**
+ 学习项详情
+ */
+@property (nonatomic,strong) StudyTypeResponse *studyResponse;
+
 @end
 
 @implementation OnlineLearningDetailViewController
 
+
+#pragma mark -渲染完成
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    }
+}
+
+#pragma mark -视图即将消失
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    // 开启
+    self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -68,22 +96,29 @@
 - (void)getStudyItemDetailAction
 {
     WS(weakSelf);
-    NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(STUDYITEMDETAIL),self.studyTypeID];
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-        
-        NSLog(@"%@",returnValue);
+    StudyTaskCondition *studyListModel = [[StudyTaskCondition alloc]init];
+    studyListModel.employeeIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
+    studyListModel.typeEquals = self.studyTypeID;
+    DataPage *page = [[DataPage alloc] init];
+    page.page = ONE;
+    page.rows = 9999;
+    studyListModel.page = page;
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(STUDYLIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:studyListModel WithReturnValueBlock:^(id returnValue) {
+        
+        [weakSelf RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            weakSelf.studyResponse = [[StudyTypeResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+        }else {
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
+        }
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
-        
+        [weakSelf ErrorMBProgressView:NETWORK];
     } WithFailureBlock:^(NSError *error) {
-        
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
     }];
 }
 
 
-
-
-
-
-
 @end

Class/LearningCenter/OnlineLearning/VideoDetailViewController.m

@@ -9,10 +9,16 @@
 #import "VideoDetailViewController.h"
 #import "VideoDetailIntroTableViewCell.h"
 #import "VideoLecturerTableViewCell.h"
+#import "WkWebViewViewController.h"
 
 
 @interface VideoDetailViewController ()<UITableViewDataSource,UITableViewDelegate>
 
+/**
+ 简介高度
+ */
+@property (nonatomic,assign) CGFloat introductionHeight;
+
 @end
 
 @implementation VideoDetailViewController
@@ -29,6 +35,20 @@
     self.studyItemDetailsTableView.tableFooterView = [UIView new];
 }
 
+#pragma mark - WKWebView
+- (void)addChildWebViewController
+{
+    WS(weakSelf);
+    WkWebViewViewController *webView = [[WkWebViewViewController alloc]initWithReturnContentSize:^(CGFloat contentHeight) {
+        weakSelf.introductionHeight = contentHeight;
+        webView.view.frame = CGRectMake(0, 0, ScreenWidth, contentHeight);
+        [weakSelf.studyItemDetailsTableView reloadData];
+    }];
+    self.introductionHeight = 44;//默认值
+    webView.view.frame = CGRectMake(0, 0, ScreenWidth, self.introductionHeight);
+    [self addChildViewController:webView];
+}
+
 #pragma mark - <UITableViewDelegate,UITableViewDataSource>
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -36,6 +56,7 @@
         case StudyItemIntroCell:
         {
             VideoDetailIntroTableViewCell *itemDetailCell = [tableView dequeueReusableCellWithIdentifier:@"VideoDetailIntroTableViewCell" forIndexPath:indexPath];
+            [itemDetailCell.contentView addSubview:self.childViewControllers[0].view];
             return itemDetailCell;
         }
             break;
@@ -68,7 +89,7 @@
     switch (indexPath.row) {
         case StudyItemIntroCell:
         {
-            return 100;
+            return self.introductionHeight;
         }
             break;
         case LecturerIntroCell:

Class/LearningCenter/OnlineLearning/VideoHelperViewController.m

@@ -198,6 +198,14 @@
     }
 }
 
+#pragma mark - 页面消失后释放播放器
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [self.customPlayer pause];
+    [self.customPlayer.currentItem cancelPendingSeeks];
+    [self.customPlayer.currentItem.asset cancelLoading];
+}
+
 #pragma mark - 释放KVO
 - (void)dealloc
 {

Class/LearningCenter/OnlineLearning/VideoListViewController.m

@@ -12,6 +12,9 @@
 
 @interface VideoListViewController ()<UITableViewDelegate,UITableViewDataSource>
 
+
+@property (weak, nonatomic) IBOutlet UIView *headerView;
+
 @end
 
 @implementation VideoListViewController

Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.h

+//
+//  EmigratedMainViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface EmigratedMainViewController : BaseViewController
+
+
+/**
+ 闯关历史
+ */
+@property (weak, nonatomic) IBOutlet UIScrollView *throughHistoryBackScrollView;
+
+
+@end

Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m

+//
+//  EmigratedMainViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "EmigratedMainViewController.h"
+#import "ThroughHistoryView.h"
+#import "InstructionsViewController.h"
+
+@interface EmigratedMainViewController ()
+
+@property (nonatomic,strong) WYPopoverController *popover;
+
+@end
+
+@implementation EmigratedMainViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self getThroughHistoryDatasAction];
+}
+
+#pragma mark - 获取闯关信息
+- (void)getThroughHistoryDatasAction
+{
+    WS(weakSelf);
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(THROUGHLIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        
+        
+    } WithFailureBlock:^(NSError *error) {
+        
+    }];
+}
+
+#pragma mark - 开始
+- (IBAction)beginButtonClickAction:(UIButton *)sender {
+    
+    CGFloat width = 100;
+    CGFloat height = 120;
+    CGFloat interval = 30;
+    for (int i=0; i<10; i++) {
+        ThroughHistoryView *throughView = [ThroughHistoryView initializeView];
+        throughView.frame = CGRectMake(i*width+i*interval, 0, width, height);
+        [self.throughHistoryBackScrollView addSubview:throughView];
+    }
+    self.throughHistoryBackScrollView.contentSize = CGSizeMake(10*width+9*interval, 0);
+    WS(weakSelf);
+    [UIView animateWithDuration:0.2 animations:^{
+        sender.alpha = 0;
+        weakSelf.throughHistoryBackScrollView.alpha = 1;
+    }];
+}
+
+#pragma mark - 闯关说明
+- (IBAction)instructionsButtonClickAction:(UIButton *)sender {
+    
+    InstructionsViewController *instruction = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"InstructionsViewController"];
+    WS(weakSelf);
+    [instruction setDismissSyntonyBlock:^{
+        [weakSelf.popover dismissPopoverAnimated:YES];
+    }];
+    instruction.preferredContentSize = CGSizeMake(ScreenWidth/2, ScreenHeight/2);
+    self.popover = [[WYPopoverController alloc] initWithContentViewController:instruction];
+    self.popover.theme.fillBottomColor = [UIColor clearColor];
+    self.popover.theme.fillTopColor = [UIColor clearColor];
+    self.popover.theme.glossShadowColor = [UIColor clearColor];
+    [self.popover presentPopoverAsDialogAnimated:YES options:WYPopoverAnimationOptionFadeWithScale];
+}
+
+
+@end

Class/LearningCenter/SkillsAssessment/InstructionsViewController.h

+//
+//  InstructionsViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface InstructionsViewController : BaseViewController
+
+
+/**
+ 闯关说明
+ */
+@property (nonatomic,copy) NSString *explainString;
+
+/**
+ 关闭闯关说明回调
+ */
+@property (nonatomic,copy) void(^dismissSyntonyBlock)();
+
+@end

Class/LearningCenter/SkillsAssessment/InstructionsViewController.m

+//
+//  InstructionsViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "InstructionsViewController.h"
+
+@interface InstructionsViewController ()
+
+@end
+
+@implementation InstructionsViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+}
+
+#pragma mark - 关闭闯关说明
+- (IBAction)dismissButtonClickAction:(UIButton *)sender {
+    
+    if (self.dismissSyntonyBlock) {
+        self.dismissSyntonyBlock();
+    }
+}
+
+@end

Class/LearningCenter/SkillsAssessment/ThroughHistoryView.h

+//
+//  ThroughHistoryView.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ThroughHistoryView : UIView
+
+
++ (instancetype)initializeView;
+
+@end

Class/LearningCenter/SkillsAssessment/ThroughHistoryView.m

+//
+//  ThroughHistoryView.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/28.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "ThroughHistoryView.h"
+
+@implementation ThroughHistoryView
+
+
++ (instancetype)initializeView
+{
+    return [[[NSBundle mainBundle] loadNibNamed:@"ThroughHistoryView" owner:nil options:nil] firstObject];
+}
+
+@end

Class/LearningCenter/SkillsAssessment/ThroughHistoryView.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <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"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ThroughHistoryView">
+            <rect key="frame" x="0.0" y="0.0" width="100" height="120"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="periodback" translatesAutoresizingMaskIntoConstraints="NO" id="NhW-KY-dfx">
+                    <frame key="frameInset"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                </imageView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="第一期" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sj3-Pj-bDO">
+                    <frame key="frameInset" minY="42" height="21"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
+                    <color key="textColor" red="0.50980392156862742" green="0.36862745098039218" blue="0.33725490196078434" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="截止" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E4Z-tr-AmG">
+                    <frame key="frameInset" minX="16" minY="78" width="30" height="21"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
+                    <color key="textColor" red="0.50980392156862742" green="0.36862745098039218" blue="0.33725490196078434" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="2016.05.02" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7wQ-tG-CXo">
+                    <frame key="frameInset" height="21" maxY="6"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
+                    <color key="textColor" red="0.50980392156862742" green="0.36862745098039218" blue="0.33725490196078434" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="success" translatesAutoresizingMaskIntoConstraints="NO" id="TxV-0B-tUi">
+                    <frame key="frameInset" minY="62" width="60" height="20" maxX="11"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                </imageView>
+            </subviews>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="-39" y="-145"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="periodback" width="208" height="229"/>
+        <image name="success" width="52" height="20"/>
+    </resources>
+</document>

Class/ProductLibraryViewController.m

@@ -583,7 +583,6 @@
     self.selectedIndex = buttontag;
     //分类
     if (self.screenView.sortingSegmented.selectedSegmentIndex == 0) {
-        
         self.screenFirstView.selectedIndex = buttontag;
         self.screenFirstView.datasArray = [self.screeningDatas objectAtIndex_opple:buttontag];
     }

Class/ScreeningView.m

@@ -88,10 +88,8 @@
     }
     
     if ([self.delegate respondsToSelector:@selector(ScreeningButtonClick:)]) {
-        
         [self.delegate ScreeningButtonClick:sender.tag-100];
     }
-    
     [self RemoveAllButtonisSelected];
     sender.selected = YES;
     sender.backgroundColor = kMainBlueColor;
@@ -102,9 +100,7 @@
 - (void)RemoveAllButtonisSelected
 {
     for (UIView *view in self.backgroundView.subviews) {
-        
         if ([view isKindOfClass:[UIButton class]]) {
-            
             UIButton *button = (UIButton *)view;
             button.selected = NO;
             button.backgroundColor = [UIColor whiteColor];

Class/SettlementViewController.m

@@ -319,7 +319,6 @@
 #pragma mark -弹出popover视图控制器
 - (void)ShowPopoverViewController:(CGSize)size Withdatas:(NSArray *)datasArray ShowButton:(UIButton *)button SelectedIndex:(NSInteger)index GetTitle:(BOOL )istitle
 {
-    
     PopoverViewController *popover = [[PopoverViewController alloc]init];
     popover.datasArray = datasArray;
     popover.delegate = self;
@@ -343,8 +342,6 @@
  */
 - (void)returnCellindexpathwithrow:(NSString *)Type WithcellTitle:(NSString *)title Withselected:(NSInteger)Selected
 {
-    [self dismissViewControllerAnimated:YES completion:nil];
-    
     switch (Selected) {
         case 0://支付方式
         {

Lighting.xcodeproj/project.pbxproj

@@ -112,6 +112,11 @@
 		29706DB41CD082990003C412 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB31CD082990003C412 /* Assets.xcassets */; };
 		29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; };
 		2973C33B1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2973C33A1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m */; };
+		297B143E1DEBF53E009A462A /* EmigratedMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 297B143D1DEBF53E009A462A /* EmigratedMainViewController.m */; };
+		297B14411DEBFE25009A462A /* ThroughHistoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 297B14401DEBFE25009A462A /* ThroughHistoryView.m */; };
+		297B14431DEBFE35009A462A /* ThroughHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 297B14421DEBFE35009A462A /* ThroughHistoryView.xib */; };
+		297B14461DEC18EF009A462A /* InstructionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 297B14451DEC18EF009A462A /* InstructionsViewController.m */; };
+		297B14491DEC2D26009A462A /* LearningCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 297B14481DEC2D26009A462A /* LearningCompleteViewController.m */; };
 		297BA2C21DE94D3300474F79 /* VICacheAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 297BA2AD1DE94D3300474F79 /* VICacheAction.m */; };
 		297BA2C31DE94D3300474F79 /* VICacheConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 297BA2AF1DE94D3300474F79 /* VICacheConfiguration.m */; };
 		297BA2C41DE94D3300474F79 /* VICacheManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 297BA2B11DE94D3300474F79 /* VICacheManager.m */; };
@@ -454,6 +459,15 @@
 		29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2973C3391DBEF2EC00FAC995 /* ClientShoppingCarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientShoppingCarViewController.h; sourceTree = "<group>"; };
 		2973C33A1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientShoppingCarViewController.m; sourceTree = "<group>"; };
+		297B143C1DEBF53E009A462A /* EmigratedMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmigratedMainViewController.h; sourceTree = "<group>"; };
+		297B143D1DEBF53E009A462A /* EmigratedMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmigratedMainViewController.m; sourceTree = "<group>"; };
+		297B143F1DEBFE25009A462A /* ThroughHistoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThroughHistoryView.h; sourceTree = "<group>"; };
+		297B14401DEBFE25009A462A /* ThroughHistoryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThroughHistoryView.m; sourceTree = "<group>"; };
+		297B14421DEBFE35009A462A /* ThroughHistoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ThroughHistoryView.xib; sourceTree = "<group>"; };
+		297B14441DEC18EF009A462A /* InstructionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstructionsViewController.h; sourceTree = "<group>"; };
+		297B14451DEC18EF009A462A /* InstructionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstructionsViewController.m; sourceTree = "<group>"; };
+		297B14471DEC2D26009A462A /* LearningCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LearningCompleteViewController.h; sourceTree = "<group>"; };
+		297B14481DEC2D26009A462A /* LearningCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LearningCompleteViewController.m; sourceTree = "<group>"; };
 		297BA2AC1DE94D3300474F79 /* VICacheAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VICacheAction.h; sourceTree = "<group>"; };
 		297BA2AD1DE94D3300474F79 /* VICacheAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VICacheAction.m; sourceTree = "<group>"; };
 		297BA2AE1DE94D3300474F79 /* VICacheConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VICacheConfiguration.h; sourceTree = "<group>"; };
@@ -1337,6 +1351,27 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		297B14391DEBF4E7009A462A /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				297B143C1DEBF53E009A462A /* EmigratedMainViewController.h */,
+				297B143D1DEBF53E009A462A /* EmigratedMainViewController.m */,
+				297B14441DEC18EF009A462A /* InstructionsViewController.h */,
+				297B14451DEC18EF009A462A /* InstructionsViewController.m */,
+			);
+			name = Controllers;
+			sourceTree = "<group>";
+		};
+		297B143A1DEBF4F3009A462A /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				297B143F1DEBFE25009A462A /* ThroughHistoryView.h */,
+				297B14401DEBFE25009A462A /* ThroughHistoryView.m */,
+				297B14421DEBFE35009A462A /* ThroughHistoryView.xib */,
+			);
+			name = Views;
+			sourceTree = "<group>";
+		};
 		297BA2AA1DE94D3300474F79 /* VideoCache */ = {
 			isa = PBXGroup;
 			children = (
@@ -1755,6 +1790,8 @@
 		29C30BD51DDC0A5000CA3E29 /* SkillsAssessment */ = {
 			isa = PBXGroup;
 			children = (
+				297B143A1DEBF4F3009A462A /* Views */,
+				297B14391DEBF4E7009A462A /* Controllers */,
 			);
 			path = SkillsAssessment;
 			sourceTree = "<group>";
@@ -1810,6 +1847,8 @@
 				2940AE851DE7FCDB001164B0 /* VideoListViewController.m */,
 				2940AE871DE7FCE4001164B0 /* VideoDetailViewController.h */,
 				2940AE881DE7FCE4001164B0 /* VideoDetailViewController.m */,
+				297B14471DEC2D26009A462A /* LearningCompleteViewController.h */,
+				297B14481DEC2D26009A462A /* LearningCompleteViewController.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -2257,6 +2296,7 @@
 				29E2D3291DB8918100443170 /* CardOrderInformationReusableView.xib in Resources */,
 				29E2D33D1DB8BE7F00443170 /* CardAmplificationViewController.xib in Resources */,
 				29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */,
+				297B14431DEBFE35009A462A /* ThroughHistoryView.xib in Resources */,
 				294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */,
 				29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
 				29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */,
@@ -2355,6 +2395,7 @@
 				291D6A651D0002AF007891AE /* TOGoodsEntityModel.m in Sources */,
 				29E944591DE45558007CD26C /* PrizeExchangeConsigneeTableViewCell.m in Sources */,
 				2999B12F1DE6CD730031F79E /* ForumViewController.m in Sources */,
+				297B14411DEBFE25009A462A /* ThroughHistoryView.m in Sources */,
 				2928F8381CD09E730036D761 /* CustomButton.m in Sources */,
 				293393551CD3379E000D997B /* ShoppingTableViewCell.m in Sources */,
 				29837B561DE5992A009CF614 /* CustomBorderLabel.m in Sources */,
@@ -2379,6 +2420,7 @@
 				29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */,
 				2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
 				29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */,
+				297B143E1DEBF53E009A462A /* EmigratedMainViewController.m in Sources */,
 				29E384D11CE9C65700888199 /* SearchViewController.m in Sources */,
 				29702B461D727F6200322196 /* WithdrawalTableViewController.m in Sources */,
 				2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
@@ -2406,6 +2448,7 @@
 				2973C33B1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m in Sources */,
 				293164001DCE3F6D0075129D /* NotDrawTableViewCell.m in Sources */,
 				2916A7481D703A1700644C8C /* UIView+cornerRadius.m in Sources */,
+				297B14461DEC18EF009A462A /* InstructionsViewController.m in Sources */,
 				29F14BA91CF6B60D0005D3E5 /* QRUtil.m in Sources */,
 				29EAAEA01CDC79DC00C4DBA2 /* CustomerOrderViewController.m in Sources */,
 				2904BA431DBEF3A200FB473A /* OrderRecordViewController.m in Sources */,
@@ -2421,6 +2464,7 @@
 				29E2D3201DB8737000443170 /* CardViewController.m in Sources */,
 				294CF0EC1CEDCF480055F1D8 /* PromptinformationView.m in Sources */,
 				290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */,
+				297B14491DEC2D26009A462A /* LearningCompleteViewController.m in Sources */,
 				2921F2FC1DB5E75300D6439B /* PromotionalGoodsModel.m in Sources */,
 				29498C5A1D051C3F004FA79B /* HelpController.m in Sources */,
 				04FCB1A41CF60A8F0056093B /* DeviceDirectionManager.m in Sources */,

Lighting/Images.xcassets/Recruitbackground.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Recruitbackground.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/background.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "background.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/begin.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "begin.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "begin@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "begin@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/cancel.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "cancel.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "cancel@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "cancel@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/failure.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "failure.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "failure@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "failure@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/finish-2.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "finish.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "finish@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "finish@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/instructions.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "instructions.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "instructions@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "instructions@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/periodback.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "periodback.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/result.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "result.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "result@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "result@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/submited.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "submited.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "submited@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "submited@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/success.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "success.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "success@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "success@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/闯关结果.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "闯关结果.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/闯关说明.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "闯关说明.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Tools/CYConstManager.h

@@ -337,6 +337,16 @@ extern NSString *const FORUMTYPS;
  *  学习项详情
  */
 extern NSString *const STUDYITEMDETAIL;
+
+/**
+ *  学习列表
+ */
+extern NSString *const STUDYLIST;
+
+/**
+ *  闯关信息
+ */
+extern NSString *const THROUGHLIST;
 /*****************************************接口地址*****************************************/
 
 

Tools/CYConstManager.m

@@ -331,6 +331,16 @@ NSString *const FORUMTYPS = @"/forum/getCategorys";
  *  学习项详情
  */
 NSString *const STUDYITEMDETAIL = @"/study/getTask/%@";
+
+/**
+ *  学习列表
+ */
+NSString *const STUDYLIST = @"/study/query";
+
+/**
+ *  闯关信息
+ */
+NSString *const THROUGHLIST = @"/passLevel/query";
 /*****************************************接口地址*****************************************/
 
 

Tools/ExperienceCentreViewController.m

@@ -287,9 +287,6 @@
 {
     if (error != NULL) {
         [self ErrorMBProgressView:@"保存相册失败"];
-    }else
-    {
-        [self SuccessMBProgressView:@"保存相册成功"];
     }
 }
 

Tools/QRViewController.m

@@ -163,7 +163,6 @@
     _output.metadataObjectTypes = @[AVMetadataObjectTypeEAN13Code,
                                     AVMetadataObjectTypeEAN8Code,
                                     AVMetadataObjectTypeCode128Code,
-                                    AVMetadataObjectTypeQRCode,
                                     AVMetadataObjectTypeQRCode];
     // Preview
     _preview =[AVCaptureVideoPreviewLayer layerWithSession:_session];

Tools/ShareGoodsViewController.m

@@ -41,11 +41,9 @@
             }
             
         } WithErrorCodeBlock:^(id errorCodeValue) {
-            [weakSelf RemoveMBProgressHUDLoding];
-            [weakSelf SHOWPrompttext:NETWORK];
+            [weakSelf ErrorMBProgressView:NETWORK];
         } WithFailureBlock:^(NSError *error) {
-            [weakSelf RemoveMBProgressHUDLoding];
-            [weakSelf SHOWPrompttext:error.localizedDescription];
+            [weakSelf ErrorMBProgressView:error.localizedDescription];
         }];
     }else//分享商品
     {
@@ -54,43 +52,32 @@
         NSString *goodsID = [self.goodsIds substringToIndex:[self.goodsIds length]-1];
         NSDictionary *parameterDict = [NSDictionary dictionaryWithObjectsAndKeys:[goodsID substringToIndex:self.goodsIds.length-1],@"goodsIds",@"",@"title",@"",@"remark",nil];
         //上传图片
-        [[NetworkRequestClassManager Manager] UploadImageWithURL:SERVERREQUESTURL(SHARE) WithRequestType:0 WithImageDatas:imageData WithParameter:parameterDict WithReturnValueBlock:^(id returnValue) {
-            
+        [[NetworkRequestClassManager Manager] UploadImageWithURL:SERVERREQUESTURL(SHARE) WithRequestType:ZERO WithImageDatas:imageData WithParameter:parameterDict WithReturnValueBlock:^(id returnValue) {
             if ([returnValue[@"code"] isEqualToNumber:@0]) {
-                
                 NSString *shareWeb = returnValue[@"data"][@"url"];
                 [weakSelf callSharePlatform:shareWeb withPlatformTag:sender withTitle:ShareTitle];
             }else
             {
                 if ([weakSelf.delegate respondsToSelector:@selector(CodeNotEqualZERO:)]) {
-                    
                     [weakSelf.delegate CodeNotEqualZERO:returnValue[@"message"]];
                 }
             }
             
         }WithprogressBlock:^(double progress) {
-            
             if (progress >= 1) {
-                
                 if ([weakSelf.delegate respondsToSelector:@selector(UploadImageSuccess)]) {
-                    
                     [weakSelf.delegate UploadImageSuccess];
                 }
-                
             }else
             {
                 if ([weakSelf.delegate respondsToSelector:@selector(UploadImageProgress:)]) {
-                    
                     [weakSelf.delegate UploadImageProgress:progress];
                 }
             }
-            
         } WithErrorCodeBlock:^(id errorCodeValue) {
-            
+            [weakSelf ErrorMBProgressView:NETWORK];
         } WithFailureBlock:^(NSError *error) {
-            
             if ([weakSelf.delegate respondsToSelector:@selector(UploadImageFailue)]) {
-                
                 [weakSelf.delegate UploadImageFailue];
             }
             [weakSelf ErrorMBProgressView:error.localizedDescription];
@@ -114,7 +101,6 @@
                 }
             }];
         }
-            
             break;
         case 101://微信朋友圈
         {