潜水艇动效

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -556,10 +556,8 @@
 		BC7400E92CD1CB3D0056756A /* KSCloudPremissionAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7400E62CD1CB3D0056756A /* KSCloudPremissionAlertView.xib */; };
 		BC7400F42CD1CB450056756A /* DelayCheckTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7400EE2CD1CB450056756A /* DelayCheckTipsView.m */; };
 		BC7400F52CD1CB450056756A /* KSDelayCheckView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7400F12CD1CB450056756A /* KSDelayCheckView.m */; };
-		BC7400F62CD1CB450056756A /* delayCheck_musicAni.json in Resources */ = {isa = PBXBuildFile; fileRef = BC7400EB2CD1CB450056756A /* delayCheck_musicAni.json */; };
 		BC7400F72CD1CB450056756A /* DelayCheckTipsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7400EF2CD1CB450056756A /* DelayCheckTipsView.xib */; };
 		BC7400F82CD1CB450056756A /* KSDelayCheckView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7400F22CD1CB450056756A /* KSDelayCheckView.xib */; };
-		BC7400F92CD1CB450056756A /* delayCheck_ meteor.json in Resources */ = {isa = PBXBuildFile; fileRef = BC7400EA2CD1CB450056756A /* delayCheck_ meteor.json */; };
 		BC7401152CD20EA30056756A /* MergeMusicStaffView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7401142CD20EA30056756A /* MergeMusicStaffView.m */; };
 		BC7401192CD22FFA0056756A /* CBAutoScrollLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7401172CD22FFA0056756A /* CBAutoScrollLabel.m */; };
 		BC7401212CD25A920056756A /* KSBaseGuideView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC74011F2CD25A920056756A /* KSBaseGuideView.m */; };
@@ -672,6 +670,11 @@
 		BC9AA0DD2ABC434900CD954D /* KSHudLoagingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9AA0D92ABC434900CD954D /* KSHudLoagingManager.m */; };
 		BC9AA0DE2ABC434900CD954D /* KSCustomLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9AA0DA2ABC434900CD954D /* KSCustomLoadingView.m */; };
 		BC9AA0DF2ABC434900CD954D /* KSCustomLoadingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC9AA0DB2ABC434900CD954D /* KSCustomLoadingView.xib */; };
+		BC9DA0892CF9624600674ED9 /* delay_check_sandbeach.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA0882CF9624600674ED9 /* delay_check_sandbeach.json */; };
+		BC9DA08D2CF9647300674ED9 /* delay_check_seaGrass_right.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA08C2CF9647300674ED9 /* delay_check_seaGrass_right.json */; };
+		BC9DA08E2CF9647300674ED9 /* delay_check_ light.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA08A2CF9647300674ED9 /* delay_check_ light.json */; };
+		BC9DA08F2CF9647300674ED9 /* delay_check_seaGrass_left.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA08B2CF9647300674ED9 /* delay_check_seaGrass_left.json */; };
+		BC9DA0912CF9649D00674ED9 /* delay_check_ bubble.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA0902CF9649D00674ED9 /* delay_check_ bubble.json */; };
 		BCA1136828A3A5CF007FAFB9 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA1136728A3A5CF007FAFB9 /* Accelerate.framework */; };
 		BCA193B8282B6094004A585D /* RecentCourseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA193B7282B6094004A585D /* RecentCourseModel.m */; };
 		BCA336992C942B280074DF75 /* KSSourceDownloadAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA336962C942B270074DF75 /* KSSourceDownloadAlert.m */; };
@@ -1901,8 +1904,6 @@
 		BC7400E42CD1CB3D0056756A /* KSCloudPremissionAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSCloudPremissionAlertView.h; sourceTree = "<group>"; };
 		BC7400E52CD1CB3D0056756A /* KSCloudPremissionAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSCloudPremissionAlertView.m; sourceTree = "<group>"; };
 		BC7400E62CD1CB3D0056756A /* KSCloudPremissionAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KSCloudPremissionAlertView.xib; sourceTree = "<group>"; };
-		BC7400EA2CD1CB450056756A /* delayCheck_ meteor.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "delayCheck_ meteor.json"; sourceTree = "<group>"; };
-		BC7400EB2CD1CB450056756A /* delayCheck_musicAni.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delayCheck_musicAni.json; sourceTree = "<group>"; };
 		BC7400ED2CD1CB450056756A /* DelayCheckTipsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DelayCheckTipsView.h; sourceTree = "<group>"; };
 		BC7400EE2CD1CB450056756A /* DelayCheckTipsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DelayCheckTipsView.m; sourceTree = "<group>"; };
 		BC7400EF2CD1CB450056756A /* DelayCheckTipsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DelayCheckTipsView.xib; sourceTree = "<group>"; };
@@ -2083,6 +2084,11 @@
 		BC9AA0DA2ABC434900CD954D /* KSCustomLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSCustomLoadingView.m; sourceTree = "<group>"; };
 		BC9AA0DB2ABC434900CD954D /* KSCustomLoadingView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSCustomLoadingView.xib; sourceTree = "<group>"; };
 		BC9AA0DC2ABC434900CD954D /* KSHudLoagingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSHudLoagingManager.h; sourceTree = "<group>"; };
+		BC9DA0882CF9624600674ED9 /* delay_check_sandbeach.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delay_check_sandbeach.json; sourceTree = "<group>"; };
+		BC9DA08A2CF9647300674ED9 /* delay_check_ light.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "delay_check_ light.json"; sourceTree = "<group>"; };
+		BC9DA08B2CF9647300674ED9 /* delay_check_seaGrass_left.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delay_check_seaGrass_left.json; sourceTree = "<group>"; };
+		BC9DA08C2CF9647300674ED9 /* delay_check_seaGrass_right.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delay_check_seaGrass_right.json; sourceTree = "<group>"; };
+		BC9DA0902CF9649D00674ED9 /* delay_check_ bubble.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "delay_check_ bubble.json"; sourceTree = "<group>"; };
 		BCA1136728A3A5CF007FAFB9 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
 		BCA193B6282B6094004A585D /* RecentCourseModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentCourseModel.h; sourceTree = "<group>"; };
 		BCA193B7282B6094004A585D /* RecentCourseModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecentCourseModel.m; sourceTree = "<group>"; };
@@ -5096,8 +5102,11 @@
 		BC7400EC2CD1CB450056756A /* AnimationSource */ = {
 			isa = PBXGroup;
 			children = (
-				BC7400EA2CD1CB450056756A /* delayCheck_ meteor.json */,
-				BC7400EB2CD1CB450056756A /* delayCheck_musicAni.json */,
+				BC9DA0882CF9624600674ED9 /* delay_check_sandbeach.json */,
+				BC9DA08A2CF9647300674ED9 /* delay_check_ light.json */,
+				BC9DA08B2CF9647300674ED9 /* delay_check_seaGrass_left.json */,
+				BC9DA08C2CF9647300674ED9 /* delay_check_seaGrass_right.json */,
+				BC9DA0902CF9649D00674ED9 /* delay_check_ bubble.json */,
 			);
 			path = AnimationSource;
 			sourceTree = "<group>";
@@ -6393,6 +6402,7 @@
 				BC71D267288804CD0010F14B /* img_42.png in Resources */,
 				BC71D27A288804CD0010F14B /* img_35.png in Resources */,
 				BC71D25A288804CD0010F14B /* img_46.png in Resources */,
+				BC9DA0892CF9624600674ED9 /* delay_check_sandbeach.json in Resources */,
 				BC12636F28FEA20800509E90 /* RecentMusicView.xib in Resources */,
 				BCC5841E28AA545B00BAB4CF /* cloud_animation_29.png in Resources */,
 				BCBFDF5228115DA40052AFE5 /* HomeIntroduceView.xib in Resources */,
@@ -6402,6 +6412,9 @@
 				BC119270280FAF7D00A716F7 /* AccompanyCourseInfoCell.xib in Resources */,
 				BC2DFF5828BE143A0056105A /* HomeTempLiveCell.xib in Resources */,
 				BCFDA65528BCA2000022B497 /* accomapny_animation_0.png in Resources */,
+				BC9DA08D2CF9647300674ED9 /* delay_check_seaGrass_right.json in Resources */,
+				BC9DA08E2CF9647300674ED9 /* delay_check_ light.json in Resources */,
+				BC9DA08F2CF9647300674ED9 /* delay_check_seaGrass_left.json in Resources */,
 				BC3BF6412B9FE92600831494 /* ShareFunctionView.xib in Resources */,
 				BCC583C828A9EC6400BAB4CF /* cloud_animation_10.png in Resources */,
 				BCA3369A2C942B280074DF75 /* KSSourceDownloadAlert.xib in Resources */,
@@ -6421,6 +6434,7 @@
 				BCC583CC28A9EC6400BAB4CF /* cloud_animation_5.png in Resources */,
 				BCC583B928A9EC6400BAB4CF /* cloud_animation_22.png in Resources */,
 				BCCE95E42AB053FE00AB6385 /* MorePageNavView.xib in Resources */,
+				BC9DA0912CF9649D00674ED9 /* delay_check_ bubble.json in Resources */,
 				BCC0F65F2A8CD8F500C4EFA4 /* TXMainEmtpyView.xib in Resources */,
 				BC40B9FA2811768400DEC0D1 /* HotInformationHeadView.xib in Resources */,
 				BC27A06E280FF56C00F91E27 /* AccompanyEvaluateCell.xib in Resources */,
@@ -6526,10 +6540,8 @@
 				BCFCE44E28DD5C000051FED8 /* Low.wav in Resources */,
 				BC802D9428B897670079E350 /* LiveApplyingView.xib in Resources */,
 				BC71D244288804CD0010F14B /* img_10.png in Resources */,
-				BC7400F62CD1CB450056756A /* delayCheck_musicAni.json in Resources */,
 				BC7400F72CD1CB450056756A /* DelayCheckTipsView.xib in Resources */,
 				BC7400F82CD1CB450056756A /* KSDelayCheckView.xib in Resources */,
-				BC7400F92CD1CB450056756A /* delayCheck_ meteor.json in Resources */,
 				BC0212F827FC4A080040569F /* SubjectImageCell.xib in Resources */,
 				BCC583B728A9EC6400BAB4CF /* cloud_animation_21.png in Resources */,
 				BC11921B280ED6A900A716F7 /* NewClassPopCell.xib in Resources */,

KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "DEV"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/check_failedTips.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "check_failedTips@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "check_failedTips@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/check_finishTips.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "check_finishTips@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "check_finishTips@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/check_ingTips.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "check_ingTips@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "check_ingTips@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/check_tips_icon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "check_tips_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "check_tips_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/delayCheck_back.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "delayCheck_back@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "delayCheck_back@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/delayCheck_bg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "delayCheck_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "delayCheck_bg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/delayCheck_ship_checking.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "delayCheck_ship_checking@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "delayCheck_ship_checking@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/delayCheck_ship_failer.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "delayCheck_ship_failer@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "delayCheck_ship_failer@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/delayCheck_ship_prepare.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "delayCheck_ship_prepare@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "delayCheck_ship_prepare@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/DelayCheck/delayCheck_ship_success.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "delayCheck_ship_success@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "delayCheck_ship_success@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Common/Base/DelayCheck/KSDelayCheckView.m

@@ -30,7 +30,6 @@
 @property (weak, nonatomic) IBOutlet UIView *otherTipsView;
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *tipsWidth;
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tipsBottomSpace;
 
 @property (nonatomic, strong) NSTimer *timer;
 
@@ -42,13 +41,17 @@
 
 @property (nonatomic, assign) CGFloat systemVolume;
 
-@property (weak, nonatomic) IBOutlet UIView *musicAniBgView;
-@property (nonatomic, strong) LOTAnimationView *musicAniView; // 音符动效
+@property (weak, nonatomic) IBOutlet UIView *lightBgView;
+@property (nonatomic, strong) LOTAnimationView *ligntAniView;
 
-@property (weak, nonatomic) IBOutlet UIView *meteorAniBgView;
-@property (nonatomic, strong) LOTAnimationView *meteorAnimationView; // 流星动效
+@property (weak, nonatomic) IBOutlet UIView *sandbeachAniBgView;
+@property (nonatomic, strong) LOTAnimationView *sandbeachAniView;
 
-@property (weak, nonatomic) IBOutlet UIImageView *rotationStar;
+@property (weak, nonatomic) IBOutlet UIView *seaGrassLeft;
+@property (nonatomic, strong) LOTAnimationView *seaGrassLeftAniView;
+
+@property (weak, nonatomic) IBOutlet UIView *seaGrassRight;
+@property (nonatomic, strong) LOTAnimationView *seaGrassRightAniView;
 
 @end
 
@@ -61,11 +64,11 @@
     self.backButtonLeft.constant = 25;
     self.systemVolume = [self getCurrentVolume];
     if (IS_IPAD) {
-        self.shipboardWidth.constant = 318 * 1.2;
-        self.tipsWidth.constant = 342 * 1.2;
-        self.tipsBottomSpace.constant = 40.0f;
+        self.shipboardWidth.constant = 298 * 1.2;
+        self.tipsWidth.constant = 340 * 1.2;
+//        self.tipsBottomSpace.constant = 40.0f;
     }
-    self.retryButtonRight.constant = self.tipsWidth.constant / 342 * 54;
+    self.retryButtonRight.constant = self.tipsWidth.constant / 340 * 54;
     
 }
 
@@ -109,13 +112,19 @@
 
 
 - (void)stopPlayAllAnimation {
-    if (self.meteorAnimationView.isAnimationPlaying) {
-        [self.meteorAnimationView stop];
+    if (self.ligntAniView.isAnimationPlaying) {
+        [self.ligntAniView stop];
+    }
+    if (self.sandbeachAniView.isAnimationPlaying) {
+        [self.sandbeachAniView stop];
+    }
+    if (self.seaGrassLeftAniView.isAnimationPlaying) {
+        [self.seaGrassLeftAniView stop];
     }
-    if (self.musicAniView.isAnimationPlaying) {
-        [self.musicAniView stop];
+    if (self.seaGrassRightAniView.isAnimationPlaying) {
+        [self.seaGrassRightAniView stop];
     }
-    [self removeAnimation];
+    
     [self removeMoveAnimation];
 }
 
@@ -149,13 +158,19 @@
 
 - (void)prepareAnimation {
     self.status = DELAYCHECK_TYPE_PREPARE;
-    self.musicAniView = [self configAnimation:@"delayCheck_musicAni" attachInView:self.musicAniBgView];
-    [self.musicAniView play];
     
-    self.meteorAnimationView = [self configAnimation:@"delayCheck_ meteor" attachInView:self.meteorAniBgView];
-    [self.meteorAnimationView play];
+    self.ligntAniView = [self configAnimation:@"delay_check_ light" attachInView:self.lightBgView];
+    [self.ligntAniView play];
+    
+    self.sandbeachAniView = [self configAnimation:@"delay_check_sandbeach" attachInView:self.sandbeachAniBgView];
+    [self.sandbeachAniView play];
+    
+    self.seaGrassLeftAniView = [self configAnimation:@"delay_check_seaGrass_left" attachInView:self.seaGrassLeft];
+    [self.seaGrassLeftAniView play];
+    
+    self.seaGrassRightAniView = [self configAnimation:@"delay_check_seaGrass_right" attachInView:self.seaGrassRight];
+    [self.seaGrassRightAniView play];
     
-    [self addRotationAnimation];
     [self addMoveAnimation];
 }
 
@@ -180,7 +195,7 @@
             self.hasSendStart = NO;
             self.retryButton.hidden = YES;
             [self.tipsImage setImage:[UIImage imageNamed:@"check_prepareTips"]];
-            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_airShip_prepare"]];
+            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_ship_prepare"]];
             if (self.isHeadsetOff == NO) {
                 [self startTimer];
             }
@@ -192,16 +207,15 @@
         {
             self.retryButton.hidden = YES;
             [self.tipsImage setImage:[UIImage imageNamed:@"check_ingTips"]];
-            
             [self hideTips];
-            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_airShip_checking"]];
+            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_ship_checking"]];
         }
             break;
         case DELAYCHECK_TYPE_SUCCESS:
         {
             self.retryButton.hidden = YES;
             [self.tipsImage setImage:[UIImage imageNamed:@"check_finishTips"]];
-            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_airShip_success"]];
+            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_ship_success"]];
             
             @weakObj(self);
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -215,7 +229,7 @@
         {
             self.retryButton.hidden = NO;
             [self.tipsImage setImage:[UIImage imageNamed:@"check_failedTips"]];
-            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_airShip_failer"]];
+            [self.shipView setImage:[UIImage imageNamed:@"delayCheck_ship_failer"]];
             [self hideTips];
         }
             break;
@@ -325,22 +339,10 @@
     return [[AVAudioSession sharedInstance] outputVolume];
 }
 
-- (void)addRotationAnimation {
-    CABasicAnimation *rotationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
-    rotationAnimation.toValue = [NSNumber numberWithFloat:M_PI *2.0];
-    rotationAnimation.duration = 8.0f;
-    rotationAnimation.cumulative = YES;
-    rotationAnimation.repeatCount = CGFLOAT_MAX;
-    [self.rotationStar.layer addAnimation:rotationAnimation forKey:@"rotationAnimation"];
-}
-
-- (void)removeAnimation {
-    [self.rotationStar.layer removeAllAnimations];
-}
 
 - (void)addMoveAnimation {
     CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.translation.y"];
-    animation.toValue= @(12);
+    animation.toValue= @(-12);
     animation.duration = 1;
     animation.removedOnCompletion = NO;
     animation.fillMode = kCAFillModeForwards; // 保持动画完成后的状态

KulexiuForStudent/KulexiuForStudent/Common/Base/DelayCheck/KSDelayCheckView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,23 +17,38 @@
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="delayCheck_bg" translatesAutoresizingMaskIntoConstraints="NO" id="13a-eT-FQo">
                     <rect key="frame" x="0.0" y="0.0" width="813" height="375"/>
                 </imageView>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_bg_star" translatesAutoresizingMaskIntoConstraints="NO" id="gjS-ff-gQi">
-                    <rect key="frame" x="0.0" y="0.0" width="813" height="375"/>
-                </imageView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Guc-mv-HSz">
-                    <rect key="frame" x="0.0" y="0.0" width="813" height="375"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BHM-q7-D86">
+                    <rect key="frame" x="0.0" y="0.0" width="813" height="375.33333333333331"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="width" secondItem="BHM-q7-D86" secondAttribute="height" multiplier="2436:1125" id="Nw1-ti-SLN"/>
+                    </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A5z-Nq-rkg">
-                    <rect key="frame" x="39" y="69" width="258" height="161"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u3c-a0-cG0">
+                    <rect key="frame" x="0.0" y="-0.33333333333334281" width="813" height="375.33333333333337"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="258" id="6d1-el-Roo"/>
-                        <constraint firstAttribute="height" constant="161" id="s6L-ah-5zP"/>
+                        <constraint firstAttribute="width" secondItem="u3c-a0-cG0" secondAttribute="height" multiplier="2436:1125" id="YMd-RO-iQP"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1aI-Fq-ro5">
+                    <rect key="frame" x="0.0" y="211.33333333333337" width="220" height="163.66666666666663"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="220" id="OLi-N4-PkT"/>
+                        <constraint firstAttribute="width" secondItem="1aI-Fq-ro5" secondAttribute="height" multiplier="668:497" id="Obf-wd-fG0"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="37c-b2-LZq">
+                    <rect key="frame" x="717" y="195" width="96" height="180"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="96" id="NkB-Gn-6O0"/>
+                        <constraint firstAttribute="height" constant="180" id="izH-4z-agw"/>
                     </constraints>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pcl-5K-Deb">
-                    <rect key="frame" x="30" y="20" width="32" height="32"/>
+                    <rect key="frame" x="30" y="20" width="38" height="38"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                     <state key="normal" image="delayCheck_back"/>
                     <connections>
@@ -41,13 +56,13 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="pg3-Ih-STu">
-                    <rect key="frame" x="235.66666666666663" y="23.666666666666671" width="342" height="98"/>
+                    <rect key="frame" x="236.66666666666663" y="250" width="340" height="98"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_failedTips" translatesAutoresizingMaskIntoConstraints="NO" id="RzA-6Z-Vaf">
-                            <rect key="frame" x="0.0" y="0.0" width="342" height="98"/>
+                            <rect key="frame" x="0.0" y="0.0" width="340" height="98"/>
                         </imageView>
                         <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yCx-o2-bWc">
-                            <rect key="frame" x="223.00000000000003" y="38" width="64.999999999999972" height="40"/>
+                            <rect key="frame" x="221.33333333333334" y="48" width="64.666666666666657" height="40"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="o5e-3D-elW"/>
@@ -60,36 +75,36 @@
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="pg3-Ih-STu" secondAttribute="height" multiplier="171:49" id="73N-ha-eoc"/>
+                        <constraint firstAttribute="width" secondItem="pg3-Ih-STu" secondAttribute="height" multiplier="340:98" id="73N-ha-eoc"/>
                         <constraint firstItem="RzA-6Z-Vaf" firstAttribute="leading" secondItem="pg3-Ih-STu" secondAttribute="leading" id="EA2-46-oCg"/>
-                        <constraint firstAttribute="bottom" secondItem="yCx-o2-bWc" secondAttribute="bottom" constant="20" id="Lt5-4A-5oA"/>
+                        <constraint firstAttribute="bottom" secondItem="yCx-o2-bWc" secondAttribute="bottom" constant="10" id="Lt5-4A-5oA"/>
                         <constraint firstItem="yCx-o2-bWc" firstAttribute="width" secondItem="RzA-6Z-Vaf" secondAttribute="width" multiplier="130/684" id="QNj-sa-OBZ"/>
                         <constraint firstAttribute="trailing" secondItem="yCx-o2-bWc" secondAttribute="trailing" constant="54" id="kEa-Vx-hTr"/>
                         <constraint firstAttribute="bottom" secondItem="RzA-6Z-Vaf" secondAttribute="bottom" id="leX-O1-FmL"/>
                         <constraint firstItem="RzA-6Z-Vaf" firstAttribute="top" secondItem="pg3-Ih-STu" secondAttribute="top" id="m2b-RE-xIn"/>
                         <constraint firstAttribute="trailing" secondItem="RzA-6Z-Vaf" secondAttribute="trailing" id="rnJ-9N-LF7"/>
-                        <constraint firstAttribute="width" constant="342" id="zTz-gE-YK1"/>
+                        <constraint firstAttribute="width" constant="340" id="zTz-gE-YK1"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1N3-2i-t6U">
-                    <rect key="frame" x="247.66666666666663" y="121.66666666666669" width="318" height="332"/>
+                    <rect key="frame" x="257.66666666666669" y="6" width="298.00000000000006" height="254"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="delayCheck_airShip_prepare" translatesAutoresizingMaskIntoConstraints="NO" id="DOi-v9-ZzR">
-                            <rect key="frame" x="0.0" y="0.0" width="318" height="332"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="delayCheck_ship_prepare" translatesAutoresizingMaskIntoConstraints="NO" id="DOi-v9-ZzR">
+                            <rect key="frame" x="0.0" y="0.0" width="298" height="254"/>
                         </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="318" id="8xk-yi-a4d"/>
-                        <constraint firstItem="DOi-v9-ZzR" firstAttribute="top" secondItem="1N3-2i-t6U" secondAttribute="top" id="Hff-ix-iEG"/>
-                        <constraint firstAttribute="trailing" secondItem="DOi-v9-ZzR" secondAttribute="trailing" id="iOt-zt-HeO"/>
-                        <constraint firstItem="DOi-v9-ZzR" firstAttribute="leading" secondItem="1N3-2i-t6U" secondAttribute="leading" id="moI-be-c6f"/>
-                        <constraint firstAttribute="bottom" secondItem="DOi-v9-ZzR" secondAttribute="bottom" id="xXs-Qy-Av9"/>
-                        <constraint firstAttribute="width" secondItem="1N3-2i-t6U" secondAttribute="height" multiplier="318:332" id="y5K-xG-Akv"/>
+                        <constraint firstAttribute="width" constant="298" id="8xk-yi-a4d"/>
+                        <constraint firstItem="DOi-v9-ZzR" firstAttribute="top" secondItem="1N3-2i-t6U" secondAttribute="top" id="SUF-3q-kUD"/>
+                        <constraint firstAttribute="trailing" secondItem="DOi-v9-ZzR" secondAttribute="trailing" id="SnH-QF-Ff0"/>
+                        <constraint firstItem="DOi-v9-ZzR" firstAttribute="leading" secondItem="1N3-2i-t6U" secondAttribute="leading" id="mF8-sI-v4L"/>
+                        <constraint firstAttribute="bottom" secondItem="DOi-v9-ZzR" secondAttribute="bottom" id="oYe-Oz-PpR"/>
+                        <constraint firstAttribute="width" secondItem="1N3-2i-t6U" secondAttribute="height" multiplier="298:254" id="y5K-xG-Akv"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9H1-aj-D94">
-                    <rect key="frame" x="276" y="291" width="261" height="38"/>
+                    <rect key="frame" x="276" y="24" width="261" height="38"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_tips_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Xcc-tp-5MH">
                             <rect key="frame" x="11" y="10" width="18" height="18"/>
@@ -116,7 +131,7 @@
                                         <constraint firstAttribute="height" constant="17" id="dla-tp-0jZ"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                                    <color key="textColor" red="0.0039215686274509803" green="0.75686274509803919" blue="0.70980392156862748" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="textColor" red="0.17254901960784313" green="0.72549019607843135" blue="0.61960784313725492" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tH2-gC-QHh">
@@ -165,39 +180,29 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="orange_star" translatesAutoresizingMaskIntoConstraints="NO" id="xx8-DD-P5k">
-                    <rect key="frame" x="0.0" y="222" width="152" height="83"/>
-                </imageView>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rotate_star" translatesAutoresizingMaskIntoConstraints="NO" id="Qqu-0i-Kit">
-                    <rect key="frame" x="695.66666666666663" y="204" width="155" height="159"/>
-                </imageView>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
+                <constraint firstItem="BHM-q7-D86" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="0yw-5D-nTd"/>
                 <constraint firstAttribute="trailing" secondItem="13a-eT-FQo" secondAttribute="trailing" id="22b-4P-sSo"/>
-                <constraint firstAttribute="bottom" secondItem="9H1-aj-D94" secondAttribute="bottom" constant="46" id="2ZJ-Fn-fQ7"/>
-                <constraint firstItem="gjS-ff-gQi" firstAttribute="trailing" secondItem="13a-eT-FQo" secondAttribute="trailing" id="4U4-YI-cWv"/>
-                <constraint firstAttribute="bottom" secondItem="xx8-DD-P5k" secondAttribute="bottom" constant="70" id="AnJ-1b-i1e"/>
-                <constraint firstItem="A5z-Nq-rkg" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="39" id="EZd-PG-aee"/>
+                <constraint firstAttribute="trailing" secondItem="37c-b2-LZq" secondAttribute="trailing" id="32c-cc-NjU"/>
+                <constraint firstAttribute="trailing" secondItem="u3c-a0-cG0" secondAttribute="trailing" id="3JW-Rm-dNy"/>
+                <constraint firstItem="9H1-aj-D94" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="24" id="7wh-YC-9L7"/>
+                <constraint firstAttribute="bottom" secondItem="37c-b2-LZq" secondAttribute="bottom" id="EuR-y6-KIo"/>
                 <constraint firstItem="13a-eT-FQo" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Iir-tv-x6u"/>
-                <constraint firstItem="1N3-2i-t6U" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" constant="100" id="JFM-nL-thX"/>
-                <constraint firstAttribute="trailing" secondItem="Guc-mv-HSz" secondAttribute="trailing" id="NVr-98-kcE"/>
+                <constraint firstItem="u3c-a0-cG0" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="JJr-Nc-90c"/>
+                <constraint firstAttribute="bottom" secondItem="pg3-Ih-STu" secondAttribute="bottom" constant="27" id="JsQ-fC-Os1"/>
+                <constraint firstAttribute="bottom" secondItem="1aI-Fq-ro5" secondAttribute="bottom" id="NHB-Bw-r6a"/>
                 <constraint firstItem="1N3-2i-t6U" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="P1J-Nc-NHw"/>
-                <constraint firstItem="A5z-Nq-rkg" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="69" id="PXn-92-6Hg"/>
-                <constraint firstItem="gjS-ff-gQi" firstAttribute="top" secondItem="13a-eT-FQo" secondAttribute="top" id="QB7-s8-xnd"/>
-                <constraint firstItem="xx8-DD-P5k" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="TM1-SQ-tC1"/>
+                <constraint firstItem="BHM-q7-D86" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="PKr-qN-bhq"/>
+                <constraint firstAttribute="bottom" secondItem="u3c-a0-cG0" secondAttribute="bottom" id="Q5N-oI-EZ1"/>
+                <constraint firstAttribute="trailing" secondItem="BHM-q7-D86" secondAttribute="trailing" id="Q7J-FN-pKD"/>
                 <constraint firstItem="pcl-5K-Deb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="Yo1-C7-F1f"/>
-                <constraint firstItem="Guc-mv-HSz" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="b7S-Kv-1cT"/>
                 <constraint firstItem="13a-eT-FQo" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="bKZ-Tx-uIh"/>
-                <constraint firstItem="Guc-mv-HSz" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="biF-Rh-WaY"/>
                 <constraint firstAttribute="bottom" secondItem="13a-eT-FQo" secondAttribute="bottom" id="diT-dc-3Di"/>
-                <constraint firstItem="gjS-ff-gQi" firstAttribute="bottom" secondItem="13a-eT-FQo" secondAttribute="bottom" id="fWI-wl-nRN"/>
-                <constraint firstAttribute="bottom" secondItem="Qqu-0i-Kit" secondAttribute="bottom" constant="12" id="gFf-hG-x2t"/>
+                <constraint firstItem="1aI-Fq-ro5" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fZU-xW-xJ0"/>
                 <constraint firstItem="pg3-Ih-STu" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="hAp-vt-VbP"/>
-                <constraint firstAttribute="bottom" secondItem="Guc-mv-HSz" secondAttribute="bottom" id="ixV-Df-mZS"/>
-                <constraint firstItem="1N3-2i-t6U" firstAttribute="top" secondItem="pg3-Ih-STu" secondAttribute="bottom" id="k0D-eM-DfL"/>
-                <constraint firstAttribute="trailing" secondItem="Qqu-0i-Kit" secondAttribute="centerX" constant="40" id="oRg-Zm-elj"/>
-                <constraint firstItem="gjS-ff-gQi" firstAttribute="leading" secondItem="13a-eT-FQo" secondAttribute="leading" id="pAA-GY-dPy"/>
+                <constraint firstItem="1N3-2i-t6U" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="6" id="lL6-0H-fjE"/>
                 <constraint firstItem="9H1-aj-D94" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="tXf-ar-C6b"/>
                 <constraint firstItem="pcl-5K-Deb" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="30" id="z0b-B2-XKR"/>
             </constraints>
@@ -206,16 +211,16 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="backButtonLeft" destination="z0b-B2-XKR" id="mwK-Dp-cdh"/>
+                <outlet property="lightBgView" destination="BHM-q7-D86" id="Z54-x4-MB0"/>
                 <outlet property="mainView" destination="1N3-2i-t6U" id="qk6-xp-B7v"/>
-                <outlet property="meteorAniBgView" destination="Guc-mv-HSz" id="ZxP-rp-fYi"/>
-                <outlet property="musicAniBgView" destination="A5z-Nq-rkg" id="reB-t4-qu6"/>
                 <outlet property="otherTipsView" destination="9H1-aj-D94" id="t02-3G-Dt7"/>
                 <outlet property="retryButton" destination="yCx-o2-bWc" id="VT9-95-9As"/>
                 <outlet property="retryButtonRight" destination="kEa-Vx-hTr" id="mfJ-ly-kRF"/>
-                <outlet property="rotationStar" destination="Qqu-0i-Kit" id="TaC-WD-5Bk"/>
+                <outlet property="sandbeachAniBgView" destination="u3c-a0-cG0" id="9S9-m6-gVa"/>
+                <outlet property="seaGrassLeft" destination="1aI-Fq-ro5" id="f1u-GJ-hVo"/>
+                <outlet property="seaGrassRight" destination="37c-b2-LZq" id="mby-9q-vL2"/>
                 <outlet property="shipView" destination="DOi-v9-ZzR" id="T99-Mq-ZQx"/>
                 <outlet property="shipboardWidth" destination="8xk-yi-a4d" id="nww-Ue-UQK"/>
-                <outlet property="tipsBottomSpace" destination="k0D-eM-DfL" id="8jl-BK-PJl"/>
                 <outlet property="tipsImage" destination="RzA-6Z-Vaf" id="BFH-sX-6TB"/>
                 <outlet property="tipsWidth" destination="zTz-gE-YK1" id="P6j-U4-cba"/>
             </connections>
@@ -223,14 +228,11 @@
         </view>
     </objects>
     <resources>
-        <image name="check_bg_star" width="812" height="375"/>
-        <image name="check_failedTips" width="340" height="99"/>
+        <image name="check_failedTips" width="340" height="98"/>
         <image name="check_tips_icon" width="18" height="18"/>
-        <image name="delayCheck_airShip_prepare" width="318" height="332"/>
-        <image name="delayCheck_back" width="32" height="32"/>
-        <image name="delayCheck_bg" width="813" height="376"/>
-        <image name="orange_star" width="152" height="83"/>
-        <image name="rotate_star" width="155" height="159"/>
+        <image name="delayCheck_back" width="38" height="38"/>
+        <image name="delayCheck_bg" width="812" height="375"/>
+        <image name="delayCheck_ship_prepare" width="298" height="254"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForStudent/KulexiuForStudent/Common/Define/KSDomain.h

@@ -39,6 +39,6 @@
 #define WhiteBoardHostURL ([NSString stringWithFormat:@"https://%@",WHITE_BOARD])
 
 // 云教练
-#define CLOUD_URL ([NSString stringWithFormat:@"https://%@%@",ACCOMPANY_DOMAIN, WEBPATH])
+#define CLOUD_URL ([NSString stringWithFormat:@"https://%@/%@",ACCOMPANY_DOMAIN, @"klx-music-score"])
 
 #endif /* KSDomain_h */

KulexiuForStudent/KulexiuForStudent/Common/MediaMerge/AudioMerge/KSMediaMergeView.m

@@ -285,6 +285,20 @@
     else {
         self.musicSpeed = 1.0f;
     }
+    // 谱面类型
+    if ([[self.preJsonDic allKeys] containsObject:@"musicRenderType"]) {
+        self.musicRenderType = [self.preJsonDic ks_stringValueForKey:@"musicRenderType"];
+    }
+    else {
+        self.musicRenderType = @"staff";
+    }
+    
+    if ([[self.preJsonDic allKeys] containsObject:@"part-index"]) {
+        self.partIndex = [self.preJsonDic ks_integerValueForKey:@"part-index"];
+    }
+    else {
+        self.partIndex = 0;
+    }
     self.offsetTime = self.originalOffset;
     [self.contrlView configWithOffsetTime:self.originalOffset];
     self.contrlView.hideBackView = YES;