Browse Source

延迟检测动画效果

Steven 4 months ago
parent
commit
1d5751a753
53 changed files with 527 additions and 210 deletions
  1. 20 18
      KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj
  2. 1 1
      KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme
  3. 6 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/Contents.json
  4. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_failedTips.imageset/Contents.json
  5. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_failedTips.imageset/check_failedTips@2x.png
  6. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_failedTips.imageset/check_failedTips@3x.png
  7. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_finishTips.imageset/Contents.json
  8. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_finishTips.imageset/check_finishTips@2x.png
  9. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_finishTips.imageset/check_finishTips@3x.png
  10. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_ingTips.imageset/Contents.json
  11. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_ingTips.imageset/check_ingTips@2x.png
  12. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_ingTips.imageset/check_ingTips@3x.png
  13. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_prepareTips.imageset/Contents.json
  14. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_prepareTips.imageset/check_prepareTips@2x.png
  15. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_prepareTips.imageset/check_prepareTips@3x.png
  16. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_tips_icon.imageset/Contents.json
  17. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_tips_icon.imageset/check_tips_icon@2x.png
  18. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_tips_icon.imageset/check_tips_icon@3x.png
  19. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_back.imageset/Contents.json
  20. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_back.imageset/delayCheck_back@2x.png
  21. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_back.imageset/delayCheck_back@3x.png
  22. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_bg.imageset/Contents.json
  23. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_bg.imageset/delayCheck_bg@2x.png
  24. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_bg.imageset/delayCheck_bg@3x.png
  25. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_checking.imageset/Contents.json
  26. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_checking.imageset/delayCheck_ship_checking@2x.png
  27. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_checking.imageset/delayCheck_ship_checking@3x.png
  28. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_failer.imageset/Contents.json
  29. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_failer.imageset/delayCheck_ship_failer@2x.png
  30. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_failer.imageset/delayCheck_ship_failer@3x.png
  31. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_prepare.imageset/Contents.json
  32. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_prepare.imageset/delayCheck_ship_prepare@2x.png
  33. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_prepare.imageset/delayCheck_ship_prepare@3x.png
  34. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_success.imageset/Contents.json
  35. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_success.imageset/delayCheck_ship_success@2x.png
  36. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_success.imageset/delayCheck_ship_success@3x.png
  37. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delayCheck_ meteor.json
  38. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delayCheck_musicAni.json
  39. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_ bubble.json
  40. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_ light.json
  41. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_sandbeach.json
  42. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_seaGrass_left.json
  43. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_seaGrass_right.json
  44. 0 16
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/DelayCheckTipsView.h
  45. 0 20
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/DelayCheckTipsView.m
  46. 0 42
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/DelayCheckTipsView.xib
  47. 47 38
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/KSDelayCheckView.m
  48. 76 63
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/KSDelayCheckView.xib
  49. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Common/Define/KSDomain.h
  50. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSCustomLoadingView.m
  51. 7 7
      KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSCustomLoadingView.xib
  52. 16 2
      KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/KSMediaMergeView.m
  53. 110 1
      KulexiuForTeacher/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/xcschememanagement.plist

+ 20 - 18
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -700,14 +700,10 @@
 		BC71DF2B2A8A0432003F165E /* KSWhiteboardRefreshView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC71DF292A8A0432003F165E /* KSWhiteboardRefreshView.m */; };
 		BC71DF2E2A8A2233003F165E /* KSNewWhiteBoard.m in Sources */ = {isa = PBXBuildFile; fileRef = BC71DF2C2A8A2233003F165E /* KSNewWhiteBoard.m */; };
 		BC73A1F42809693F00FA8F6F /* EvaluateSortView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC73A1F32809693F00FA8F6F /* EvaluateSortView.xib */; };
-		BC7401082CD203B80056756A /* DelayCheckTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7400FE2CD203B80056756A /* DelayCheckTipsView.m */; };
 		BC7401092CD203B80056756A /* KSDelayCheckView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7401012CD203B80056756A /* KSDelayCheckView.m */; };
 		BC74010A2CD203B80056756A /* KSCloudPremissionAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7401052CD203B80056756A /* KSCloudPremissionAlertView.m */; };
 		BC74010B2CD203B80056756A /* KSDelayCheckView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7401022CD203B80056756A /* KSDelayCheckView.xib */; };
-		BC74010C2CD203B80056756A /* delayCheck_ meteor.json in Resources */ = {isa = PBXBuildFile; fileRef = BC7400FA2CD203B80056756A /* delayCheck_ meteor.json */; };
 		BC74010D2CD203B80056756A /* KSCloudPremissionAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7401062CD203B80056756A /* KSCloudPremissionAlertView.xib */; };
-		BC74010E2CD203B80056756A /* delayCheck_musicAni.json in Resources */ = {isa = PBXBuildFile; fileRef = BC7400FB2CD203B80056756A /* delayCheck_musicAni.json */; };
-		BC74010F2CD203B80056756A /* DelayCheckTipsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7400FF2CD203B80056756A /* DelayCheckTipsView.xib */; };
 		BC7401122CD20E8C0056756A /* MergeMusicStaffView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7401112CD20E8C0056756A /* MergeMusicStaffView.m */; };
 		BC7401302CD264560056756A /* KSBaseGuideManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BC74012A2CD264560056756A /* KSBaseGuideManager.m */; };
 		BC7401312CD264560056756A /* KSBaseGuideView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC74012E2CD264560056756A /* KSBaseGuideView.m */; };
@@ -834,6 +830,11 @@
 		BC9AA0D02ABC3D3A00CD954D /* KSComplainImageDisplayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC9AA0CF2ABC3D3A00CD954D /* KSComplainImageDisplayView.xib */; };
 		BC9AA0D42ABC430B00CD954D /* KSCustomLoadingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC9AA0D12ABC430A00CD954D /* KSCustomLoadingView.xib */; };
 		BC9AA0D52ABC430B00CD954D /* KSCustomLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9AA0D22ABC430A00CD954D /* KSCustomLoadingView.m */; };
+		BC9DA0972CF9904500674ED9 /* delay_check_seaGrass_left.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA0952CF9904500674ED9 /* delay_check_seaGrass_left.json */; };
+		BC9DA0982CF9904500674ED9 /* delay_check_seaGrass_right.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA0962CF9904500674ED9 /* delay_check_seaGrass_right.json */; };
+		BC9DA0992CF9904500674ED9 /* delay_check_sandbeach.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA0942CF9904500674ED9 /* delay_check_sandbeach.json */; };
+		BC9DA09A2CF9904500674ED9 /* delay_check_ bubble.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA0922CF9904500674ED9 /* delay_check_ bubble.json */; };
+		BC9DA09B2CF9904500674ED9 /* delay_check_ light.json in Resources */ = {isa = PBXBuildFile; fileRef = BC9DA0932CF9904500674ED9 /* delay_check_ light.json */; };
 		BC9EFE962C04804200CFA7B1 /* KSMuteTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9EFE932C04804100CFA7B1 /* KSMuteTipsView.m */; };
 		BC9EFE972C04804200CFA7B1 /* KSMuteTipsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC9EFE942C04804200CFA7B1 /* KSMuteTipsView.xib */; };
 		BC9EFEAF2C0480A500CFA7B1 /* GroupBanListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9EFE992C0480A500CFA7B1 /* GroupBanListViewController.m */; };
@@ -2319,11 +2320,6 @@
 		BC71DF2C2A8A2233003F165E /* KSNewWhiteBoard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSNewWhiteBoard.m; sourceTree = "<group>"; };
 		BC71DF2D2A8A2233003F165E /* KSNewWhiteBoard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSNewWhiteBoard.h; sourceTree = "<group>"; };
 		BC73A1F32809693F00FA8F6F /* EvaluateSortView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EvaluateSortView.xib; sourceTree = "<group>"; };
-		BC7400FA2CD203B80056756A /* delayCheck_ meteor.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "delayCheck_ meteor.json"; sourceTree = "<group>"; };
-		BC7400FB2CD203B80056756A /* delayCheck_musicAni.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delayCheck_musicAni.json; sourceTree = "<group>"; };
-		BC7400FD2CD203B80056756A /* DelayCheckTipsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DelayCheckTipsView.h; sourceTree = "<group>"; };
-		BC7400FE2CD203B80056756A /* DelayCheckTipsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DelayCheckTipsView.m; sourceTree = "<group>"; };
-		BC7400FF2CD203B80056756A /* DelayCheckTipsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DelayCheckTipsView.xib; sourceTree = "<group>"; };
 		BC7401002CD203B80056756A /* KSDelayCheckView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSDelayCheckView.h; sourceTree = "<group>"; };
 		BC7401012CD203B80056756A /* KSDelayCheckView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSDelayCheckView.m; sourceTree = "<group>"; };
 		BC7401022CD203B80056756A /* KSDelayCheckView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KSDelayCheckView.xib; sourceTree = "<group>"; };
@@ -2529,6 +2525,11 @@
 		BC9AA0D12ABC430A00CD954D /* KSCustomLoadingView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSCustomLoadingView.xib; sourceTree = "<group>"; };
 		BC9AA0D22ABC430A00CD954D /* KSCustomLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSCustomLoadingView.m; sourceTree = "<group>"; };
 		BC9AA0D32ABC430B00CD954D /* KSCustomLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSCustomLoadingView.h; sourceTree = "<group>"; };
+		BC9DA0922CF9904500674ED9 /* delay_check_ bubble.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "delay_check_ bubble.json"; sourceTree = "<group>"; };
+		BC9DA0932CF9904500674ED9 /* delay_check_ light.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "delay_check_ light.json"; sourceTree = "<group>"; };
+		BC9DA0942CF9904500674ED9 /* delay_check_sandbeach.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delay_check_sandbeach.json; sourceTree = "<group>"; };
+		BC9DA0952CF9904500674ED9 /* delay_check_seaGrass_left.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delay_check_seaGrass_left.json; sourceTree = "<group>"; };
+		BC9DA0962CF9904500674ED9 /* delay_check_seaGrass_right.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = delay_check_seaGrass_right.json; sourceTree = "<group>"; };
 		BC9EFE932C04804100CFA7B1 /* KSMuteTipsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSMuteTipsView.m; sourceTree = "<group>"; };
 		BC9EFE942C04804200CFA7B1 /* KSMuteTipsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSMuteTipsView.xib; sourceTree = "<group>"; };
 		BC9EFE952C04804200CFA7B1 /* KSMuteTipsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSMuteTipsView.h; sourceTree = "<group>"; };
@@ -6044,8 +6045,11 @@
 		BC7400FC2CD203B80056756A /* AnimationSource */ = {
 			isa = PBXGroup;
 			children = (
-				BC7400FA2CD203B80056756A /* delayCheck_ meteor.json */,
-				BC7400FB2CD203B80056756A /* delayCheck_musicAni.json */,
+				BC9DA0922CF9904500674ED9 /* delay_check_ bubble.json */,
+				BC9DA0932CF9904500674ED9 /* delay_check_ light.json */,
+				BC9DA0942CF9904500674ED9 /* delay_check_sandbeach.json */,
+				BC9DA0952CF9904500674ED9 /* delay_check_seaGrass_left.json */,
+				BC9DA0962CF9904500674ED9 /* delay_check_seaGrass_right.json */,
 			);
 			path = AnimationSource;
 			sourceTree = "<group>";
@@ -6054,9 +6058,6 @@
 			isa = PBXGroup;
 			children = (
 				BC7400FC2CD203B80056756A /* AnimationSource */,
-				BC7400FD2CD203B80056756A /* DelayCheckTipsView.h */,
-				BC7400FE2CD203B80056756A /* DelayCheckTipsView.m */,
-				BC7400FF2CD203B80056756A /* DelayCheckTipsView.xib */,
 				BC7401002CD203B80056756A /* KSDelayCheckView.h */,
 				BC7401012CD203B80056756A /* KSDelayCheckView.m */,
 				BC7401022CD203B80056756A /* KSDelayCheckView.xib */,
@@ -7520,10 +7521,7 @@
 				BC38C42E2AF900E100ABFCC2 /* KSPlayerSliderView.xib in Resources */,
 				BCECE2182B3D5F0800C0D555 /* KSSortButtonView.xib in Resources */,
 				BC74010B2CD203B80056756A /* KSDelayCheckView.xib in Resources */,
-				BC74010C2CD203B80056756A /* delayCheck_ meteor.json in Resources */,
 				BC74010D2CD203B80056756A /* KSCloudPremissionAlertView.xib in Resources */,
-				BC74010E2CD203B80056756A /* delayCheck_musicAni.json in Resources */,
-				BC74010F2CD203B80056756A /* DelayCheckTipsView.xib in Resources */,
 				BCE6A09127F823BE00C97704 /* LiveCourseCell.xib in Resources */,
 				BC7401372CD264690056756A /* MergeTipsAlert.xib in Resources */,
 				BC86A2CA2CD36B6400A15A53 /* MineWorkSortView.xib in Resources */,
@@ -7652,6 +7650,11 @@
 				BC58E7DF281B96A4004B0893 /* MinePageTopView.xib in Resources */,
 				BCEA75322819336A00886A86 /* WithdrawBodyView.xib in Resources */,
 				BC71D20A2887FDD40010F14B /* launchAni.json in Resources */,
+				BC9DA0972CF9904500674ED9 /* delay_check_seaGrass_left.json in Resources */,
+				BC9DA0982CF9904500674ED9 /* delay_check_seaGrass_right.json in Resources */,
+				BC9DA0992CF9904500674ED9 /* delay_check_sandbeach.json in Resources */,
+				BC9DA09A2CF9904500674ED9 /* delay_check_ bubble.json in Resources */,
+				BC9DA09B2CF9904500674ED9 /* delay_check_ light.json in Resources */,
 				BC0A22A5284751F80065C1AB /* AccompanySongCell.xib in Resources */,
 				2723B68E27F1686100E0B90B /* HomeNavView.xib in Resources */,
 				BC71D1F22887FDD40010F14B /* img_16.png in Resources */,
@@ -8522,7 +8525,6 @@
 				277931E327E30FC20010E277 /* UITextView+ZWPlaceHolder.m in Sources */,
 				BC71DF1C2A89F470003F165E /* IACircleSliderThumbLayer.m in Sources */,
 				BC31BF912B219C5700F7D538 /* TunerSettingView.m in Sources */,
-				BC7401082CD203B80056756A /* DelayCheckTipsView.m in Sources */,
 				BC7401092CD203B80056756A /* KSDelayCheckView.m in Sources */,
 				BC74010A2CD203B80056756A /* KSCloudPremissionAlertView.m in Sources */,
 				2779320927E30FC30010E277 /* KSRecordPowerAnimationView.m in Sources */,

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

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

+ 6 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/Contents.json

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

+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_failedTips.imageset/check_failedTips@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_failedTips.imageset/check_failedTips@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_finishTips.imageset/check_finishTips@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_finishTips.imageset/check_finishTips@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_ingTips.imageset/check_ingTips@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_ingTips.imageset/check_ingTips@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_prepareTips.imageset/Contents.json

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

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_prepareTips.imageset/check_prepareTips@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_prepareTips.imageset/check_prepareTips@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_tips_icon.imageset/check_tips_icon@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/check_tips_icon.imageset/check_tips_icon@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_back.imageset/delayCheck_back@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_back.imageset/delayCheck_back@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_bg.imageset/delayCheck_bg@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_bg.imageset/delayCheck_bg@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_checking.imageset/delayCheck_ship_checking@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_checking.imageset/delayCheck_ship_checking@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_failer.imageset/delayCheck_ship_failer@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_failer.imageset/delayCheck_ship_failer@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_prepare.imageset/delayCheck_ship_prepare@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_prepare.imageset/delayCheck_ship_prepare@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/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
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_success.imageset/delayCheck_ship_success@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/DelayCheck/delayCheck_ship_success.imageset/delayCheck_ship_success@3x.png


File diff suppressed because it is too large
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delayCheck_ meteor.json


File diff suppressed because it is too large
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delayCheck_musicAni.json


File diff suppressed because it is too large
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_ bubble.json


File diff suppressed because it is too large
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_ light.json


File diff suppressed because it is too large
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_sandbeach.json


File diff suppressed because it is too large
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_seaGrass_left.json


File diff suppressed because it is too large
+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/AnimationSource/delay_check_seaGrass_right.json


+ 0 - 16
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/DelayCheckTipsView.h

@@ -1,16 +0,0 @@
-//
-//  DelayCheckTipsView.h
-//  KulexiuSchoolStudent
-//
-//  Created by 王智 on 2024/7/10.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface DelayCheckTipsView : UIView
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 20
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/DelayCheckTipsView.m

@@ -1,20 +0,0 @@
-//
-//  DelayCheckTipsView.m
-//  KulexiuSchoolStudent
-//
-//  Created by 王智 on 2024/7/10.
-//
-
-#import "DelayCheckTipsView.h"
-
-@implementation DelayCheckTipsView
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

+ 0 - 42
KulexiuForTeacher/KulexiuForTeacher/Common/Base/DelayCheck/DelayCheckTipsView.xib

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" 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="22689"/>
-        <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="DelayCheckTipsView">
-            <rect key="frame" x="0.0" y="0.0" width="335" height="38"/>
-            <autoresizingMask key="autoresizingMask"/>
-            <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9DK-V4-ePE">
-                    <rect key="frame" x="0.0" y="0.0" width="335" height="38"/>
-                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="38" id="8bn-Ep-4gq"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="19"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
-                </view>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <constraints>
-                <constraint firstAttribute="trailing" secondItem="9DK-V4-ePE" secondAttribute="trailing" id="S1P-Gf-b29"/>
-                <constraint firstAttribute="bottom" secondItem="9DK-V4-ePE" secondAttribute="bottom" id="Sza-as-Rga"/>
-                <constraint firstItem="9DK-V4-ePE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="U5d-ba-YAA"/>
-                <constraint firstItem="9DK-V4-ePE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="brD-ND-vHq"/>
-            </constraints>
-            <nil key="simulatedTopBarMetrics"/>
-            <nil key="simulatedBottomBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="-46.564885496183201" y="40.140845070422536"/>
-        </view>
-    </objects>
-</document>

+ 47 - 38
KulexiuForTeacher/KulexiuForTeacher/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,20 @@
 
 @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;
+
+@property (weak, nonatomic) IBOutlet UIView *bubbleBgView;
+@property (nonatomic, strong) LOTAnimationView *bubbleAniView;
 
 @end
 
@@ -61,11 +67,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 +115,21 @@
 
 
 - (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.musicAniView.isAnimationPlaying) {
-        [self.musicAniView stop];
+    if (self.seaGrassLeftAniView.isAnimationPlaying) {
+        [self.seaGrassLeftAniView stop];
+    }
+    if (self.seaGrassRightAniView.isAnimationPlaying) {
+        [self.seaGrassRightAniView stop];
+    }
+    if (self.bubbleAniView.isAnimationPlaying) {
+        [self.bubbleAniView stop];
     }
-    [self removeAnimation];
     [self removeMoveAnimation];
 }
 
@@ -149,13 +163,21 @@
 
 - (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 addRotationAnimation];
+    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.bubbleAniView = [self configAnimation:@"delay_check_ bubble" attachInView:self.bubbleBgView];
+    [self.bubbleAniView play];
     [self addMoveAnimation];
 }
 
@@ -180,7 +202,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 +214,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 +236,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 +346,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; // 保持动画完成后的状态

+ 76 - 63
KulexiuForTeacher/KulexiuForTeacher/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,46 @@
                 <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="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" secondItem="u3c-a0-cG0" secondAttribute="height" multiplier="2436:1125" id="YMd-RO-iQP"/>
+                    </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="FYc-te-vMr">
+                    <rect key="frame" x="566.66666666666663" y="41" width="96" height="87"/>
                     <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="height" constant="87" id="acW-3n-54g"/>
+                        <constraint firstAttribute="width" constant="96" id="osr-kj-hjx"/>
+                    </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 +64,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 +83,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 +139,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 +188,31 @@
                         </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="FYc-te-vMr" firstAttribute="leading" secondItem="1N3-2i-t6U" secondAttribute="trailing" constant="11" id="ePR-fT-lQJ"/>
+                <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="FYc-te-vMr" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="41" id="jh7-kQ-a86"/>
+                <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 +221,17 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="backButtonLeft" destination="z0b-B2-XKR" id="mwK-Dp-cdh"/>
+                <outlet property="bubbleBgView" destination="FYc-te-vMr" id="ZY3-uI-L4m"/>
+                <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 +239,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>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Define/KSDomain.h

@@ -32,6 +32,6 @@
 #define OPEN_URL ([NSString stringWithFormat:@"https://%@",OPEN_DOMAIN])
 
 // 云教练
-#define CLOUD_URL ([NSString stringWithFormat:@"https://%@%@",ACCOMPANY_DOMAIN, WEBPATH])
+#define CLOUD_URL ([NSString stringWithFormat:@"https://%@/%@",ACCOMPANY_DOMAIN, @"klx-music-score?systemType=teacher"])
 
 #endif /* KSDomain_h */

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSCustomLoadingView.m

@@ -64,7 +64,7 @@
 
 - (LOTAnimationView *)animationView {
     if (!_animationView) {
-        _animationView = [LOTAnimationView animationWithFilePath:[[NSBundle mainBundle] pathForResource:@"teacher_refresh" ofType:@"json"]];
+        _animationView = [LOTAnimationView animationWithFilePath:[[NSBundle mainBundle] pathForResource:@"student_refresh" ofType:@"json"]];
         _animationView.contentMode = UIViewContentModeScaleAspectFill;
         _animationView.animationSpeed = 1.0;
         _animationView.loopAnimation = YES;

+ 7 - 7
KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSCustomLoadingView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" 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="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -23,10 +23,10 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2VA-sp-63Q">
-                            <rect key="frame" x="29.333333333333343" y="5" width="41" height="55"/>
+                            <rect key="frame" x="4" y="10" width="91.666666666666671" height="55"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
-                                <constraint firstAttribute="width" secondItem="2VA-sp-63Q" secondAttribute="height" multiplier="150:200" id="xAs-Tw-7GM"/>
+                                <constraint firstAttribute="width" secondItem="2VA-sp-63Q" secondAttribute="height" multiplier="300:180" id="xAs-Tw-7GM"/>
                                 <constraint firstAttribute="height" constant="55" id="zdG-5h-LwF"/>
                             </constraints>
                         </view>
@@ -38,8 +38,8 @@
                         <constraint firstItem="jQZ-bq-s4l" firstAttribute="centerX" secondItem="Ftd-2r-orp" secondAttribute="centerX" id="BZp-te-gfI"/>
                         <constraint firstAttribute="width" constant="100" id="E8b-Gp-LDR"/>
                         <constraint firstAttribute="trailing" secondItem="jQZ-bq-s4l" secondAttribute="trailing" constant="2" id="YpK-FP-G3Q"/>
-                        <constraint firstItem="2VA-sp-63Q" firstAttribute="top" secondItem="Ftd-2r-orp" secondAttribute="top" constant="5" id="aS3-r0-aMu"/>
-                        <constraint firstItem="jQZ-bq-s4l" firstAttribute="top" secondItem="2VA-sp-63Q" secondAttribute="bottom" constant="10" id="lLr-cs-u9n"/>
+                        <constraint firstItem="2VA-sp-63Q" firstAttribute="top" secondItem="Ftd-2r-orp" secondAttribute="top" constant="10" id="aS3-r0-aMu"/>
+                        <constraint firstItem="jQZ-bq-s4l" firstAttribute="top" secondItem="2VA-sp-63Q" secondAttribute="bottom" constant="5" id="lLr-cs-u9n"/>
                         <constraint firstItem="jQZ-bq-s4l" firstAttribute="leading" secondItem="Ftd-2r-orp" secondAttribute="leading" constant="2" id="w6a-hx-sAr"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
@@ -56,7 +56,7 @@
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" title="取消上传"/>
+                    <state key="normal" title="取消"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
                             <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

+ 16 - 2
KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/KSMediaMergeView.m

@@ -212,7 +212,7 @@
 }
 
 - (void)prepareSource {
-    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中,请稍等…" cancel:^{
+    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中" cancel:^{
         [self cancelTask];
     }];
 
@@ -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;
@@ -295,7 +309,7 @@
 
 
 - (void)downloadFileSource {
-    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中,请稍等…" cancel:^{
+    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中" cancel:^{
         [self cancelTask];
     }];
     

+ 110 - 1
KulexiuForTeacher/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -8,244 +8,353 @@
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>1</integer>
 		</dict>
 		<key>AlipaySDK-iOS.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>2</integer>
 		</dict>
 		<key>Bugly.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>3</integer>
 		</dict>
 		<key>CocoaAsyncSocket.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>4</integer>
 		</dict>
 		<key>CocoaHTTPServer.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>5</integer>
 		</dict>
 		<key>CocoaLumberjack-CocoaLumberjackPrivacy.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>7</integer>
 		</dict>
 		<key>CocoaLumberjack.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>6</integer>
 		</dict>
 		<key>IQKeyboardManager-IQKeyboardManager.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>9</integer>
 		</dict>
 		<key>IQKeyboardManager.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>8</integer>
 		</dict>
 		<key>JCore.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>10</integer>
 		</dict>
 		<key>JPush.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>11</integer>
 		</dict>
 		<key>JXCategoryView-JXCategoryView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>13</integer>
 		</dict>
 		<key>JXCategoryView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>12</integer>
 		</dict>
 		<key>JXPagingView-JXPagerView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>15</integer>
 		</dict>
 		<key>JXPagingView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>14</integer>
 		</dict>
 		<key>KSCloudAccompanyLibrary.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>16</integer>
 		</dict>
 		<key>KSToolsLibrary-LLPhotoBrowse.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>18</integer>
 		</dict>
 		<key>KSToolsLibrary-WMPlayer.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>19</integer>
 		</dict>
 		<key>KSToolsLibrary.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>17</integer>
 		</dict>
 		<key>MBProgressHUD.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>22</integer>
 		</dict>
 		<key>MJExtension.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>23</integer>
 		</dict>
 		<key>MJRefresh.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>24</integer>
 		</dict>
 		<key>Masonry.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>21</integer>
 		</dict>
 		<key>NTLBridge.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>25</integer>
 		</dict>
 		<key>Pods-KulexiuForTeacher.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>26</integer>
 		</dict>
 		<key>QCloudCOSXML.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>28</integer>
 		</dict>
 		<key>QCloudCore.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>27</integer>
 		</dict>
 		<key>RSKImageCropper.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>32</integer>
 		</dict>
 		<key>Reachability-Reachability_Privacy.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>30</integer>
 		</dict>
 		<key>Reachability.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>29</integer>
 		</dict>
 		<key>ReactiveObjC.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>31</integer>
 		</dict>
 		<key>SDWebImage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>33</integer>
 		</dict>
 		<key>SSZipArchive.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>35</integer>
 		</dict>
 		<key>SocketRocket.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>34</integer>
 		</dict>
 		<key>TIMCommon.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>36</integer>
 		</dict>
 		<key>TUIChat.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>37</integer>
 		</dict>
 		<key>TUIConversation.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>38</integer>
 		</dict>
 		<key>TUICore.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>39</integer>
 		</dict>
 		<key>TUIGroup.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>40</integer>
 		</dict>
 		<key>TUISearch.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>41</integer>
 		</dict>
 		<key>TXIMSDK_Plus_iOS.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>42</integer>
 		</dict>
 		<key>TXLiteAVSDK_Professional.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>43</integer>
 		</dict>
 		<key>TYCyclePagerView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>44</integer>
 		</dict>
 		<key>TZImagePickerController.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>45</integer>
 		</dict>
 		<key>White_YYModel.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>49</integer>
 		</dict>
 		<key>Whiteboard-Whiteboard.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>47</integer>
 		</dict>
 		<key>Whiteboard.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>46</integer>
+		</dict>
+		<key>YYModel.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>48</integer>
 		</dict>
 		<key>lottie-ios.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
+			<key>orderHint</key>
+			<integer>20</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
-	<dict/>
+	<dict>
+		<key>FEEEDB4DB934091EF678C85CA5283F97</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
 </dict>
 </plist>

Some files were not shown because too many files changed in this diff