合成详情

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -481,7 +481,6 @@
 		BC38C4262AF900E100ABFCC2 /* KSMediaMergeView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC38C4072AF900E100ABFCC2 /* KSMediaMergeView.m */; };
 		BC38C4272AF900E100ABFCC2 /* KSVideoPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC38C40C2AF900E100ABFCC2 /* KSVideoPlayerView.m */; };
 		BC38C4292AF900E100ABFCC2 /* KSAudioAnimationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC38C40F2AF900E100ABFCC2 /* KSAudioAnimationView.xib */; };
-		BC38C42A2AF900E100ABFCC2 /* KSAudioPlayAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC38C4112AF900E100ABFCC2 /* KSAudioPlayAnimationView.m */; };
 		BC38C42B2AF900E100ABFCC2 /* KSMergeAudioControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC38C4142AF900E100ABFCC2 /* KSMergeAudioControlView.xib */; };
 		BC38C42D2AF900E100ABFCC2 /* KSPlayerSliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC38C4172AF900E100ABFCC2 /* KSPlayerSliderView.m */; };
 		BC38C42E2AF900E100ABFCC2 /* KSPlayerSliderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC38C4182AF900E100ABFCC2 /* KSPlayerSliderView.xib */; };
@@ -765,6 +764,16 @@
 		BC8418462AC2D9FB00D8F90E /* PasswordCheckBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8418442AC2D9FB00D8F90E /* PasswordCheckBodyView.m */; };
 		BC85A9D32C6B4D4A003C1ABE /* KSRealtimeAnalyzer.m in Sources */ = {isa = PBXBuildFile; fileRef = BC85A9CF2C6B4D4A003C1ABE /* KSRealtimeAnalyzer.m */; };
 		BC85A9D42C6B4D4A003C1ABE /* KSSpectrumView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC85A9D12C6B4D4A003C1ABE /* KSSpectrumView.m */; };
+		BC86A2B92CD3574400A15A53 /* VideoCoverChooseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC86A2B72CD3574400A15A53 /* VideoCoverChooseView.m */; };
+		BC86A2BA2CD3574400A15A53 /* MusicPublistAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = BC86A2B42CD3574400A15A53 /* MusicPublistAlert.m */; };
+		BC86A2BB2CD3574400A15A53 /* MusicPublicContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC86A2B12CD3574400A15A53 /* MusicPublicContentView.m */; };
+		BC86A2BC2CD3574400A15A53 /* MusicCoverChooseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC86A2AD2CD3574400A15A53 /* MusicCoverChooseView.m */; };
+		BC86A2BD2CD3574400A15A53 /* MusicPublicContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC86A2B22CD3574400A15A53 /* MusicPublicContentView.xib */; };
+		BC86A2BE2CD3574400A15A53 /* MusicCoverChooseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC86A2AE2CD3574400A15A53 /* MusicCoverChooseView.xib */; };
+		BC86A2BF2CD3574400A15A53 /* VideoCoverChooseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC86A2B82CD3574400A15A53 /* VideoCoverChooseView.xib */; };
+		BC86A2C02CD3574400A15A53 /* MusicPublistAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC86A2B52CD3574400A15A53 /* MusicPublistAlert.xib */; };
+		BC86A2C92CD36B6400A15A53 /* MineWorkSortView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC86A2C72CD36B6400A15A53 /* MineWorkSortView.m */; };
+		BC86A2CA2CD36B6400A15A53 /* MineWorkSortView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC86A2C82CD36B6400A15A53 /* MineWorkSortView.xib */; };
 		BC86CB172AC2E72000450EED /* KSNewConfirmAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC86CB162AC2E72000450EED /* KSNewConfirmAlertView.m */; };
 		BC86CB192AC2E72500450EED /* KSNewConfirmAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC86CB182AC2E72500450EED /* KSNewConfirmAlertView.xib */; };
 		BC8831002873D26000C702A0 /* LiveVideoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8830FE2873D25F00C702A0 /* LiveVideoModel.m */; };
@@ -945,12 +954,6 @@
 		BCC408D82AFCE0D700C60249 /* KSVideoImageSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC408D12AFCE0D600C60249 /* KSVideoImageSlider.m */; };
 		BCC408D92AFCE0D700C60249 /* KSCropImageNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC408D22AFCE0D600C60249 /* KSCropImageNavView.m */; };
 		BCC408DA2AFCE0D700C60249 /* VideoCropImageViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC408D32AFCE0D600C60249 /* VideoCropImageViewCell.xib */; };
-		BCC408E52AFCE11900C60249 /* MusicPublistAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC408DB2AFCE11700C60249 /* MusicPublistAlert.m */; };
-		BCC408E62AFCE11900C60249 /* MusicPublicContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC408DC2AFCE11700C60249 /* MusicPublicContentView.m */; };
-		BCC408E72AFCE11900C60249 /* MusicPublicContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC408DD2AFCE11800C60249 /* MusicPublicContentView.xib */; };
-		BCC408E82AFCE11900C60249 /* VideoCoverChooseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC408DF2AFCE11800C60249 /* VideoCoverChooseView.xib */; };
-		BCC408E92AFCE11900C60249 /* MusicPublistAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC408E02AFCE11800C60249 /* MusicPublistAlert.xib */; };
-		BCC408EA2AFCE11900C60249 /* VideoCoverChooseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC408E32AFCE11900C60249 /* VideoCoverChooseView.m */; };
 		BCC583F428A9FA8100BAB4CF /* cloud_animation_9.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583D528A9FA8100BAB4CF /* cloud_animation_9.png */; };
 		BCC583F528A9FA8100BAB4CF /* cloud_animation_8.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583D628A9FA8100BAB4CF /* cloud_animation_8.png */; };
 		BCC583F628A9FA8100BAB4CF /* cloud_animation_20.png in Resources */ = {isa = PBXBuildFile; fileRef = BCC583D728A9FA8100BAB4CF /* cloud_animation_20.png */; };
@@ -1977,8 +1980,6 @@
 		BC38C40C2AF900E100ABFCC2 /* KSVideoPlayerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSVideoPlayerView.m; sourceTree = "<group>"; };
 		BC38C40E2AF900E100ABFCC2 /* UIView+KSCovertImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+KSCovertImage.h"; sourceTree = "<group>"; };
 		BC38C40F2AF900E100ABFCC2 /* KSAudioAnimationView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSAudioAnimationView.xib; sourceTree = "<group>"; };
-		BC38C4112AF900E100ABFCC2 /* KSAudioPlayAnimationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSAudioPlayAnimationView.m; sourceTree = "<group>"; };
-		BC38C4122AF900E100ABFCC2 /* KSAudioPlayAnimationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSAudioPlayAnimationView.h; sourceTree = "<group>"; };
 		BC38C4132AF900E100ABFCC2 /* KSPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSPlayerView.h; sourceTree = "<group>"; };
 		BC38C4142AF900E100ABFCC2 /* KSMergeAudioControlView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSMergeAudioControlView.xib; sourceTree = "<group>"; };
 		BC38C4162AF900E100ABFCC2 /* KSNewAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSNewAlertView.h; sourceTree = "<group>"; };
@@ -2421,6 +2422,22 @@
 		BC85A9CF2C6B4D4A003C1ABE /* KSRealtimeAnalyzer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSRealtimeAnalyzer.m; sourceTree = "<group>"; };
 		BC85A9D02C6B4D4A003C1ABE /* KSSpectrumView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSSpectrumView.h; sourceTree = "<group>"; };
 		BC85A9D12C6B4D4A003C1ABE /* KSSpectrumView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSSpectrumView.m; sourceTree = "<group>"; };
+		BC86A2AC2CD3574400A15A53 /* MusicCoverChooseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicCoverChooseView.h; sourceTree = "<group>"; };
+		BC86A2AD2CD3574400A15A53 /* MusicCoverChooseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicCoverChooseView.m; sourceTree = "<group>"; };
+		BC86A2AE2CD3574400A15A53 /* MusicCoverChooseView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicCoverChooseView.xib; sourceTree = "<group>"; };
+		BC86A2AF2CD3574400A15A53 /* MusicPubHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicPubHeader.h; sourceTree = "<group>"; };
+		BC86A2B02CD3574400A15A53 /* MusicPublicContentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicPublicContentView.h; sourceTree = "<group>"; };
+		BC86A2B12CD3574400A15A53 /* MusicPublicContentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicPublicContentView.m; sourceTree = "<group>"; };
+		BC86A2B22CD3574400A15A53 /* MusicPublicContentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicPublicContentView.xib; sourceTree = "<group>"; };
+		BC86A2B32CD3574400A15A53 /* MusicPublistAlert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicPublistAlert.h; sourceTree = "<group>"; };
+		BC86A2B42CD3574400A15A53 /* MusicPublistAlert.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicPublistAlert.m; sourceTree = "<group>"; };
+		BC86A2B52CD3574400A15A53 /* MusicPublistAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicPublistAlert.xib; sourceTree = "<group>"; };
+		BC86A2B62CD3574400A15A53 /* VideoCoverChooseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoCoverChooseView.h; sourceTree = "<group>"; };
+		BC86A2B72CD3574400A15A53 /* VideoCoverChooseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoCoverChooseView.m; sourceTree = "<group>"; };
+		BC86A2B82CD3574400A15A53 /* VideoCoverChooseView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VideoCoverChooseView.xib; sourceTree = "<group>"; };
+		BC86A2C62CD36B6400A15A53 /* MineWorkSortView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineWorkSortView.h; sourceTree = "<group>"; };
+		BC86A2C72CD36B6400A15A53 /* MineWorkSortView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineWorkSortView.m; sourceTree = "<group>"; };
+		BC86A2C82CD36B6400A15A53 /* MineWorkSortView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineWorkSortView.xib; sourceTree = "<group>"; };
 		BC86CB152AC2E72000450EED /* KSNewConfirmAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSNewConfirmAlertView.h; sourceTree = "<group>"; };
 		BC86CB162AC2E72000450EED /* KSNewConfirmAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSNewConfirmAlertView.m; sourceTree = "<group>"; };
 		BC86CB182AC2E72500450EED /* KSNewConfirmAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KSNewConfirmAlertView.xib; sourceTree = "<group>"; };
@@ -2710,16 +2727,6 @@
 		BCC408D32AFCE0D600C60249 /* VideoCropImageViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VideoCropImageViewCell.xib; sourceTree = "<group>"; };
 		BCC408D42AFCE0D700C60249 /* KSVideoImageSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSVideoImageSlider.h; sourceTree = "<group>"; };
 		BCC408D52AFCE0D700C60249 /* VideoCropImageViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoCropImageViewCell.h; sourceTree = "<group>"; };
-		BCC408DB2AFCE11700C60249 /* MusicPublistAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MusicPublistAlert.m; sourceTree = "<group>"; };
-		BCC408DC2AFCE11700C60249 /* MusicPublicContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MusicPublicContentView.m; sourceTree = "<group>"; };
-		BCC408DD2AFCE11800C60249 /* MusicPublicContentView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MusicPublicContentView.xib; sourceTree = "<group>"; };
-		BCC408DE2AFCE11800C60249 /* MusicPublistAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicPublistAlert.h; sourceTree = "<group>"; };
-		BCC408DF2AFCE11800C60249 /* VideoCoverChooseView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VideoCoverChooseView.xib; sourceTree = "<group>"; };
-		BCC408E02AFCE11800C60249 /* MusicPublistAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MusicPublistAlert.xib; sourceTree = "<group>"; };
-		BCC408E12AFCE11900C60249 /* MusicPubHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicPubHeader.h; sourceTree = "<group>"; };
-		BCC408E22AFCE11900C60249 /* VideoCoverChooseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoCoverChooseView.h; sourceTree = "<group>"; };
-		BCC408E32AFCE11900C60249 /* VideoCoverChooseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoCoverChooseView.m; sourceTree = "<group>"; };
-		BCC408E42AFCE11900C60249 /* MusicPublicContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicPublicContentView.h; sourceTree = "<group>"; };
 		BCC583D528A9FA8100BAB4CF /* cloud_animation_9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_9.png; sourceTree = "<group>"; };
 		BCC583D628A9FA8100BAB4CF /* cloud_animation_8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_8.png; sourceTree = "<group>"; };
 		BCC583D728A9FA8100BAB4CF /* cloud_animation_20.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cloud_animation_20.png; sourceTree = "<group>"; };
@@ -5115,7 +5122,6 @@
 				BC74012F2CD264560056756A /* MergeGuide */,
 				BC85A9D22C6B4D4A003C1ABE /* MergeAudioAnimation */,
 				BCED0AE52C463E8D00369AED /* MergePlayer */,
-				BC38C4102AF900E100ABFCC2 /* AudioPlayAnimationView */,
 				BC38C4062AF900E100ABFCC2 /* KSAudioAnimationView.h */,
 				BC38C41B2AF900E100ABFCC2 /* KSAudioAnimationView.m */,
 				BC38C40F2AF900E100ABFCC2 /* KSAudioAnimationView.xib */,
@@ -5156,15 +5162,6 @@
 			path = VideoPlayerView;
 			sourceTree = "<group>";
 		};
-		BC38C4102AF900E100ABFCC2 /* AudioPlayAnimationView */ = {
-			isa = PBXGroup;
-			children = (
-				BC38C4112AF900E100ABFCC2 /* KSAudioPlayAnimationView.m */,
-				BC38C4122AF900E100ABFCC2 /* KSAudioPlayAnimationView.h */,
-			);
-			path = AudioPlayAnimationView;
-			sourceTree = "<group>";
-		};
 		BC38C4642AFA1F4B00ABFCC2 /* Works */ = {
 			isa = PBXGroup;
 			children = (
@@ -5200,6 +5197,9 @@
 		BC38C46D2AFA1F4B00ABFCC2 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				BC86A2C62CD36B6400A15A53 /* MineWorkSortView.h */,
+				BC86A2C72CD36B6400A15A53 /* MineWorkSortView.m */,
+				BC86A2C82CD36B6400A15A53 /* MineWorkSortView.xib */,
 				BC38C4722AFA1F4B00ABFCC2 /* MineWorksBodyView.h */,
 				BC38C4792AFA1F4B00ABFCC2 /* MineWorksBodyView.m */,
 				BC38C4732AFA1F4B00ABFCC2 /* MineWorksBottomView.h */,
@@ -5222,16 +5222,19 @@
 				BCC408D52AFCE0D700C60249 /* VideoCropImageViewCell.h */,
 				BCC408D02AFCE0D600C60249 /* VideoCropImageViewCell.m */,
 				BCC408D32AFCE0D600C60249 /* VideoCropImageViewCell.xib */,
-				BCC408E12AFCE11900C60249 /* MusicPubHeader.h */,
-				BCC408E42AFCE11900C60249 /* MusicPublicContentView.h */,
-				BCC408DC2AFCE11700C60249 /* MusicPublicContentView.m */,
-				BCC408DD2AFCE11800C60249 /* MusicPublicContentView.xib */,
-				BCC408DE2AFCE11800C60249 /* MusicPublistAlert.h */,
-				BCC408DB2AFCE11700C60249 /* MusicPublistAlert.m */,
-				BCC408E02AFCE11800C60249 /* MusicPublistAlert.xib */,
-				BCC408E22AFCE11900C60249 /* VideoCoverChooseView.h */,
-				BCC408E32AFCE11900C60249 /* VideoCoverChooseView.m */,
-				BCC408DF2AFCE11800C60249 /* VideoCoverChooseView.xib */,
+				BC86A2AC2CD3574400A15A53 /* MusicCoverChooseView.h */,
+				BC86A2AD2CD3574400A15A53 /* MusicCoverChooseView.m */,
+				BC86A2AE2CD3574400A15A53 /* MusicCoverChooseView.xib */,
+				BC86A2AF2CD3574400A15A53 /* MusicPubHeader.h */,
+				BC86A2B02CD3574400A15A53 /* MusicPublicContentView.h */,
+				BC86A2B12CD3574400A15A53 /* MusicPublicContentView.m */,
+				BC86A2B22CD3574400A15A53 /* MusicPublicContentView.xib */,
+				BC86A2B32CD3574400A15A53 /* MusicPublistAlert.h */,
+				BC86A2B42CD3574400A15A53 /* MusicPublistAlert.m */,
+				BC86A2B52CD3574400A15A53 /* MusicPublistAlert.xib */,
+				BC86A2B62CD3574400A15A53 /* VideoCoverChooseView.h */,
+				BC86A2B72CD3574400A15A53 /* VideoCoverChooseView.m */,
+				BC86A2B82CD3574400A15A53 /* VideoCoverChooseView.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -7524,12 +7527,12 @@
 				BC74010F2CD203B80056756A /* DelayCheckTipsView.xib in Resources */,
 				BCE6A09127F823BE00C97704 /* LiveCourseCell.xib in Resources */,
 				BC7401372CD264690056756A /* MergeTipsAlert.xib in Resources */,
+				BC86A2CA2CD36B6400A15A53 /* MineWorkSortView.xib in Resources */,
 				BC3673D828A606A500059721 /* accomapny_animation_1.png in Resources */,
 				275B172B27EB269F0081FDEF /* ChatAddressHeaderView.xib in Resources */,
 				BC41104F280678ED00800BD9 /* HomeworkSortView.xib in Resources */,
 				275FA56427F31AEE00EB6240 /* MinePageHeadView.xib in Resources */,
 				BC71D294288811BF0010F14B /* tabbar5.json in Resources */,
-				BCC408E72AFCE11900C60249 /* MusicPublicContentView.xib in Resources */,
 				BC56C97529238CC300AF301F /* CoursewareAlertView.xib in Resources */,
 				BCC583F528A9FA8100BAB4CF /* cloud_animation_8.png in Resources */,
 				BCDF820C2A8A2955005F8B82 /* ClassMemberSettingView.xib in Resources */,
@@ -7582,7 +7585,6 @@
 				BC3673DE28A606A500059721 /* musicRoom_animation_1.png in Resources */,
 				BC1553532AB3279500C1C347 /* TenentGroupAddMemberCell.xib in Resources */,
 				BCC0F7062A8CF13D00C4EFA4 /* TXDanBottomView.xib in Resources */,
-				BCC408E92AFCE11900C60249 /* MusicPublistAlert.xib in Resources */,
 				BC9EFEB42C0480A500CFA7B1 /* GroupBanBottomView.xib in Resources */,
 				2780C92927E490CA00A95A4F /* VefiBodyView.xib in Resources */,
 				BCC5840828A9FA8100BAB4CF /* cloud_animation_10.png in Resources */,
@@ -7628,6 +7630,10 @@
 				27BC3B2B27F2DB9600D81E30 /* MusicUploadView.xib in Resources */,
 				BC56C95A29233F1D00AF301F /* CoursewareBottomView.xib in Resources */,
 				BC3673DA28A606A500059721 /* accomapny_animation_0.png in Resources */,
+				BC86A2BD2CD3574400A15A53 /* MusicPublicContentView.xib in Resources */,
+				BC86A2BE2CD3574400A15A53 /* MusicCoverChooseView.xib in Resources */,
+				BC86A2BF2CD3574400A15A53 /* VideoCoverChooseView.xib in Resources */,
+				BC86A2C02CD3574400A15A53 /* MusicPublistAlert.xib in Resources */,
 				BC31BF8D2B219C5700F7D538 /* TuningNavView.xib in Resources */,
 				BC2456F4286BEFDA00D1F7C0 /* MineEmptyVideoCell.xib in Resources */,
 				BCA1134928A22A66007FAFB9 /* HomeHotMusicCollectionCell.xib in Resources */,
@@ -7742,7 +7748,6 @@
 				BC84182D2AC2D82900D8F90E /* ForgetPasswordBodyView.xib in Resources */,
 				BC7F7B722C92D04D00265AE1 /* KSDeleteAccountTipsAlert.xib in Resources */,
 				BC8B6E6E285836B600866917 /* low_staff.png in Resources */,
-				BCC408E82AFCE11900C60249 /* VideoCoverChooseView.xib in Resources */,
 				BCB399BD27F9831D00AFF376 /* CourseForLiveCell.xib in Resources */,
 				2723B68927F1643B00E0B90B /* HomeBodyView.xib in Resources */,
 				BCFE541A2817BE0800AD6786 /* IncomeHeaderView.xib in Resources */,
@@ -8043,6 +8048,10 @@
 				BCDB093728058BBE00D0BDAD /* AccompanyLessonModel.m in Sources */,
 				BC12639028FEC8C200509E90 /* KSChatTagView.m in Sources */,
 				BC3744D428DB156F004EDFCF /* KSImageShareViewController.m in Sources */,
+				BC86A2B92CD3574400A15A53 /* VideoCoverChooseView.m in Sources */,
+				BC86A2BA2CD3574400A15A53 /* MusicPublistAlert.m in Sources */,
+				BC86A2BB2CD3574400A15A53 /* MusicPublicContentView.m in Sources */,
+				BC86A2BC2CD3574400A15A53 /* MusicCoverChooseView.m in Sources */,
 				27FC2F6627F1BBFE00FCC239 /* MyMusicViewController.m in Sources */,
 				277D432827E9A48000107DB7 /* ModifyPhoneChangeController.m in Sources */,
 				275FA56227F31AE100EB6240 /* MinePageHeadView.m in Sources */,
@@ -8148,11 +8157,9 @@
 				BCE6A0A927F852CD00C97704 /* MineFansGroupCell.m in Sources */,
 				BCC03F88280460C000461B7C /* InstrumentHeaderView.m in Sources */,
 				27F902F127E8614D00C08A19 /* SettingViewController.m in Sources */,
-				BCC408EA2AFCE11900C60249 /* VideoCoverChooseView.m in Sources */,
 				BC71DE9B2A89F450003F165E /* TXClassroomViewController.m in Sources */,
 				BCC9F42F27F69BD200647449 /* HTTPUtility.m in Sources */,
 				BC56C97C2923A3FD00AF301F /* CoursewareAlertCell.m in Sources */,
-				BCC408E52AFCE11900C60249 /* MusicPublistAlert.m in Sources */,
 				275E3DE227F467410010EC30 /* KSChatEmojiCollectionCell.m in Sources */,
 				BC14E4952AB31059000C4983 /* TenantCreateGroupBodyView.m in Sources */,
 				BCA1134828A22A66007FAFB9 /* HomeHotMusicCollectionCell.m in Sources */,
@@ -8211,6 +8218,7 @@
 				BC7B0F5029271B5E0044CF61 /* CourseWarePreviewView.m in Sources */,
 				BC28886D2A8101310064B773 /* KSSearchResultListController.m in Sources */,
 				BC106BA42A8F45AA000759A9 /* TXLiveChatListCell.m in Sources */,
+				BC86A2C92CD36B6400A15A53 /* MineWorkSortView.m in Sources */,
 				BC31BF9C2B219C5700F7D538 /* WidgetBottomButtonView.m in Sources */,
 				BC1263A428FF98BB00509E90 /* HomeNewMusicView.m in Sources */,
 				BCDE359E289BC03E00A9A560 /* HomeAlbumModel.m in Sources */,
@@ -8394,7 +8402,6 @@
 				BC7CFFC52817F29800CAEB21 /* CashRecordViewController.m in Sources */,
 				BC000DA12A84E6D5006C5A89 /* KSTXC2CChatViewController.m in Sources */,
 				BC71DF002A89F470003F165E /* MainDisplayView.m in Sources */,
-				BCC408E62AFCE11900C60249 /* MusicPublicContentView.m in Sources */,
 				BC7CFFA92817E3BD00CAEB21 /* IncomeCountTopView.m in Sources */,
 				BC965AE82925D1D700AB90B0 /* ClassroomCoursewarePlayView.m in Sources */,
 				BCA353D82858B18100377661 /* StudentHomeworkList.m in Sources */,
@@ -8539,7 +8546,6 @@
 				BC1365CF280D48B800EB03E2 /* HomeworkListModel.m in Sources */,
 				BCFC09DD2C48E4A0009A727F /* UserVip.m in Sources */,
 				BCECE2142B3D5F0800C0D555 /* FeedbackListModel.m in Sources */,
-				BC38C42A2AF900E100ABFCC2 /* KSAudioPlayAnimationView.m in Sources */,
 				BC71DF0E2A89F470003F165E /* KSRateSliderView.m in Sources */,
 				2779326427E30FD80010E277 /* FSCalendarDelegationProxy.m in Sources */,
 				BC106B852A8F4586000759A9 /* TXLiveMessageCardMessage.m in Sources */,

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Mine/search_button_bg.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Mine/workType_audio.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Mine/workType_video.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/PlayerImage/merge_back_black.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/PlayerImage/merge_back_white.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/PlayerImage/musc_publish_cancel.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/PlayerImage/publish_colorLayer.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h

@@ -1487,11 +1487,13 @@ NS_ASSUME_NONNULL_BEGIN
 /// 我的作品分页查询
 /// @param post post json
 /// @param type 草稿 DRAFT 作品FORMAL
+/// @param keyword 关键字
+/// @param fileType 文件类型
 /// @param page 分页
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)userMusicPageRequest:(NSString *)post type:(NSString *)type page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)userMusicPageRequest:(NSString *)post type:(NSString *)type keyword:(NSString *)keyword fileType:(NSString *)fileType page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 // /userMusic/remove
 

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -2750,19 +2750,23 @@
 // edu-app/userMusic/page
 
 /// 我的作品分页查询
-/// @param post post
+/// @param post post json
 /// @param type 草稿 DRAFT 作品FORMAL
+/// @param keyword 关键字
+/// @param fileType 文件类型
 /// @param page 分页
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)userMusicPageRequest:(NSString *)post type:(NSString *)type page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)userMusicPageRequest:(NSString *)post type:(NSString *)type keyword:(NSString *)keyword fileType:(NSString *)fileType page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodJSON];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/userMusic/page"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
     [parm setValue:type forKey:@"type"];
+    [parm setValue:keyword forKey:@"keyword"];
+    [parm setValue:fileType forKey:@"fileType"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Common/Base/TabbarController/KSTabBarViewController.m

@@ -11,6 +11,7 @@
 #import <UIImage+Color.h>
 #import "AnimationHelper.h"
 #import "MineWorksViewController.h"
+#import "KSBaseWKWebViewController.h"
 
 @interface KSTabBarViewController ()<UITabBarControllerDelegate>
 
@@ -23,20 +24,38 @@
     // Do any additional setup after loading the view.
     self.delegate = self;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showDraftPage) name:@"DisplayDraft" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showWorksPage:) name:@"displayWorks" object:nil];
 
     [self configItems];
 }
 
-- (void)showDraftPage {
+- (void)showWorksPage:(NSNotification *)notification {
+    [self showWorksDraft:NO info:notification.object];
+}
+
+- (void)showWorksDraft:(BOOL)isDraft info:(NSDictionary *)info {
     [self tabBarSelectedWithIndex:4];
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         CustomNavViewController *navCtrl = self.selectedViewController;
         MineWorksViewController *ctrl = [[MineWorksViewController alloc] init];
-        [ctrl displayDraft:YES];
+        [ctrl displayDraft:isDraft];
         [navCtrl pushViewController:ctrl animated:YES];
+        if (isDraft == NO) {
+            // 显示作品详情
+            NSString *url = [info ks_stringValueForKey:@"url"];
+            if (![NSString isEmptyString:url]) {
+                KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
+                ctrl.url = url;
+                [navCtrl pushViewController:ctrl animated:YES];
+            }
+        }
     });
 }
 
+- (void)showDraftPage {
+    [self showWorksDraft:YES info:nil];
+}
+
 - (void)configItems {
     NSArray *controllerArray = @[@"HomeViewController",@"CourseViewController",@"ChatViewController",@"ShopMallViewController",@"MineViewController"];
     NSArray *titleArray = @[@"首页",@"课表",@"聊天",@"商城",@"我的"];

KulexiuForTeacher/KulexiuForTeacher/Common/Base/WebView/KSBaseWKWebViewController.m

@@ -1502,17 +1502,30 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
 }
 
 - (void)dealloc {
-    [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:@"COLEXIU"];
+    [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:SCRIPT_NAME];
     [_myWebView removeObserver:self forKeyPath:@"estimatedProgress"];
     [_myWebView loadHTMLString:@"" baseURL:nil];
     [_myWebView removeFromSuperview];
     _myWebView = nil;
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-    [[NSURLCache sharedURLCache] setDiskCapacity:0];
+    [self clearWebCache];
+//    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+//    [[NSURLCache sharedURLCache] setDiskCapacity:0];
     [[NSURLCache sharedURLCache] setMemoryCapacity:0];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (void)clearWebCache {
+    NSSet *websiteDataTypes = [NSSet setWithArray:@[
+        WKWebsiteDataTypeMemoryCache,
+    ]];
+
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes
+                                               modifiedSince:dateFrom
+                                           completionHandler:^{
+        NSLog(@"Caches cleared");
+    }];
+}
 
 - (NSString *)getSaveSpeedPath {
     //  在Documents目录下创建一个名为AudioSpeedFile的文件夹

KulexiuForTeacher/KulexiuForTeacher/Common/Base/WebView/KSLocalWebViewController.m

@@ -316,10 +316,25 @@
     [_myWebView loadHTMLString:@"" baseURL:nil];
     [_myWebView removeFromSuperview];
     _myWebView = nil;
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-    [[NSURLCache sharedURLCache] setDiskCapacity:0];
+    [self clearWebCache];
+//    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+//    [[NSURLCache sharedURLCache] setDiskCapacity:0];
     [[NSURLCache sharedURLCache] setMemoryCapacity:0];
 }
+
+- (void)clearWebCache {
+    NSSet *websiteDataTypes = [NSSet setWithArray:@[
+        WKWebsiteDataTypeMemoryCache,
+    ]];
+
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes
+                                               modifiedSince:dateFrom
+                                           completionHandler:^{
+        NSLog(@"Caches cleared");
+    }];
+}
+
 /*
 #pragma mark - Navigation
 

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/AudioPlayAnimationView/KSAudioPlayAnimationView.h

@@ -1,22 +0,0 @@
-//
-//  KSAudioPlayAnimationView.h
-//  KulexiuSchoolStudent
-//
-//  Created by 王智 on 2023/9/6.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KSAudioPlayAnimationView : UIView
-
-- (void)startAnimation;
-
-- (void)stopAnimation;
-
-- (void)setSoundsValue:(CGFloat)value;
-
-@end
-
-NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/AudioPlayAnimationView/KSAudioPlayAnimationView.m

@@ -1,315 +0,0 @@
-//
-//  KSAudioPlayAnimationView.m
-//  KulexiuSchoolStudent
-//
-//  Created by 王智 on 2023/9/6.
-//
-
-#import "KSAudioPlayAnimationView.h"
-
-@interface KSAudioPlayAnimationView ()
-
-@property (nonatomic, assign) CGFloat itemLineWidth;
-
-@property (nonatomic, assign) CGFloat itemLineSeparate;
-
-
-
-@property (nonatomic, strong) UIColor *itemColor;
-
-@property (nonatomic, strong) UIColor *itemBackColor;
-
-@property (nonatomic, strong) CADisplayLink *displayLink;
-
-
-@property (nonatomic, assign) CGFloat soundsValue;
-
-
-@end
-
-@implementation KSAudioPlayAnimationView
-
-- (instancetype)init{
-
-    if (self = [super init]) {
-
-        _itemLineWidth = 5;
-
-        _itemLineSeparate = 8;
-
-        _soundsValue = 0;
-
-        _itemColor =  HexRGB(0x2DC7AA);
-
-        _itemBackColor =  HexRGB(0xffffff);
-
-    }
-    return self;
-}
-
-- (void)setFrame:(CGRect)frame{
-
-    [super setFrame:frame];
-
-    [self setItems];
-
-    [self stopLayer];
-}
-
-
-
-- (void)setSoundsValue:(CGFloat)value{
-
-    _soundsValue = value;
-}
-
-
-
-- (void)setItems{
-
-    [self removeAllSubLayers];
-
-    CGFloat width = self.frame.size.width;
-
-    NSInteger numberItem = (width - self.itemLineWidth) / (_itemLineWidth + _itemLineSeparate);
-
-    
-
-    CGFloat layer_w = _itemLineWidth;
-
-    CGFloat layer_x = _itemLineSeparate;
-
-    CGFloat layer_h = self.frame.size.height;
-
-    CGFloat layer_y = self.frame.size.height - layer_h;
-
-    
-
-    CGFloat min_x = (width - 48 - 34 * 2) / 2;
-
-    CGFloat max_x = (width - (width - 48 - 34 * 2) / 2);
-
-    for (int i = 0; i < numberItem; i++) {
-
-        layer_x = _itemLineSeparate + (_itemLineSeparate + _itemLineWidth) * i;
-
-        if (layer_x > min_x && layer_x < max_x) {
-
-            continue;
-
-        }
-
-
-
-        layer_y = [self layer_y:i];
-
-        layer_h = [self layer_h:layer_y];
-
-        
-
-        UIBezierPath *itemLinePath = [UIBezierPath bezierPath];
-
-        [itemLinePath moveToPoint:CGPointMake(0, layer_y)];
-
-        [itemLinePath addLineToPoint:CGPointMake(0, layer_y + layer_h)];
-
-        
-
-        CAShapeLayer *itemline = [CAShapeLayer layer];
-
-        itemline.lineCap       = kCALineCapButt;
-
-        itemline.lineJoin      = kCALineJoinRound;
-
-        [itemline setLineWidth:layer_w * 2];
-
-        itemline.strokeColor   = [self.itemColor CGColor];
-
-        
-
-        itemline.path = [itemLinePath CGPath];
-
-        
-
-        UIView *dynamicView = [[UIView alloc]initWithFrame:CGRectMake(layer_x, layer_y, layer_w, layer_h)];
-
-        dynamicView.backgroundColor = self.itemBackColor;
-
-        dynamicView.layer.masksToBounds = YES;
-
-        dynamicView.layer.cornerRadius = layer_w / 2;
-
-        dynamicView.tag = 111;
-
-        
-
-        [dynamicView.layer addSublayer:itemline];
-
-        [self addSubview:dynamicView];
-
-    }
-
-}
-
-
-
-- (CGFloat)layer_y:(int)i{
-
-    CGFloat layer_y = 0;
-
-    if (i % 4 == 0) {
-
-        layer_y = (self.height - self.height * 2 / 4) / 2;
-
-    }else if (i % 4 == 1){
-
-        layer_y = (self.height - self.height * 3 / 4) / 2;
-
-    }else if (i % 4 == 2){
-
-        layer_y = 0;
-
-    }else{
-
-        layer_y = (self.height - self.height * 3 / 4) / 2;;
-
-    }
-
-    return layer_y;
-
-}
-
-
-
-- (CGFloat)layer_h:(CGFloat)layer_y{
-
-    return (self.height - layer_y * 2);
-
-}
-
-
-
-- (void)removeAllSubLayers{
-
-    for (UIView *view in self.subviews) {
-
-        [view removeFromSuperview];
-
-    }
-
-}
-
-
-
-- (void)updateItemLevel{
-
-    NSArray *subViews = self.subviews;
-
-    for (int i = 0; i < subViews.count; i++) {
-
-        UIView *subView = subViews[i];
-
-        if (subView.tag == 111) {
-
-            NSArray *layers = subView.layer.sublayers;
-
-            CAShapeLayer *lineItem = (CAShapeLayer*)layers.firstObject;
-
-            CGFloat height = arc4random() % (NSInteger)self.frame.size.height * 2;
-
-            height *= self.soundsValue;
-
-            CGFloat value = (1 - height * 1.0 / self.frame.size.height);
-
-            value = value < 0 ? 0 : value;
-
-            lineItem.strokeStart = value;
-
-            lineItem.strokeEnd = 1;
-
-        }
-
-    }
-
-}
-
-
-
-- (void)stopLayer{
-
-    NSArray *subViews = self.subviews;
-
-    for (int i = 0; i < subViews.count; i++) {
-
-        UIView *subView = subViews[i];
-
-        if (subView.tag == 111) {
-
-            NSArray *layers = subView.layer.sublayers;
-
-            CAShapeLayer *lineItem = (CAShapeLayer*)layers.firstObject;
-
-            lineItem.strokeStart = 1;
-
-            lineItem.strokeEnd = 1;
-
-        }
-
-    }
-
-}
-
-
-
-#pragma mark - displayLink 定时器  动画
-
-- (CADisplayLink *)displayLink{
-
-    if (!_displayLink) {
-
-        _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(start)];
-
-    }
-
-    return _displayLink;
-
-}
-
-
-
-- (void)start{
-
-    [self updateItemLevel];
-
-}
-
-
-
-- (void)startAnimation{
-
-    self.displayLink.frameInterval = 6;
-
-    [self.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
-
-}
-
-
-
-- (void)stopAnimation{
-
-    if (self.displayLink) {
-        [self.displayLink invalidate];
-        self.displayLink = nil;
-        [self stopLayer];
-    }
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/KSAudioAnimationView.m

@@ -7,6 +7,8 @@
 
 #import "KSAudioAnimationView.h"
 
+#define ANIMATION_RATIO (0.9)
+
 @interface KSAudioAnimationView ()
 
 // 💿旋转view
@@ -22,8 +24,8 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     [self addSubview:self.stylusImage];
-    self.stylusImage.frame = CGRectMake(132, 17, 43, 117);
-    [self setAnchorPoint:CGPointMake(28.5 / 43, 25.0 / 117) forView:self.stylusImage];
+    self.stylusImage.frame = CGRectMake(132*ANIMATION_RATIO, 17*ANIMATION_RATIO, 43*ANIMATION_RATIO, 117*ANIMATION_RATIO);
+    [self setAnchorPoint:CGPointMake(28.5 / 43*ANIMATION_RATIO, 25.0 / 117*ANIMATION_RATIO) forView:self.stylusImage];
     [self transformStylusView:YES];
 }
 - (void)setAnchorPoint:(CGPoint)anchorPoint forView:(UIView *)stylusImage {
@@ -36,15 +38,6 @@
     stylusImage.center = CGPointMake(stylusImage.center.x - transition.x, stylusImage.center.y - transition.y);
 }
 
-- (void)configWithImageWithUrl:(NSString *)imageUrl {
-    if ([NSString isEmptyString:imageUrl]) {
-        [self.music_image setImage:[UIImage imageNamed:@"pub_music_placeholder"]];
-    }
-    else {
-        [self.music_image sd_setImageWithURL:[NSURL URLWithString:[imageUrl getUrlEndcodeString]]];
-    }
-}
-
 - (void)transformStylusView:(BOOL)isHide {
     if (isHide) {
         self.stylusImage.transform = CGAffineTransformIdentity;
@@ -56,11 +49,9 @@
 }
 
 
-
-
 + (instancetype)shareInstance {
     KSAudioAnimationView *view = [[[NSBundle mainBundle] loadNibNamed:@"KSAudioAnimationView" owner:nil options:nil] firstObject];
-    view.frame = CGRectMake(0, 0, 200, 200);
+    view.frame = CGRectMake(0, 0, 180, 180);
     return view;
 }
 
@@ -94,7 +85,14 @@
     [self.discView.layer removeAllAnimations];
 }
 
-
+- (void)configWithImageWithUrl:(NSString *)imageUrl {
+    if ([NSString isEmptyString:imageUrl]) {
+        [self.music_image setImage:[UIImage imageNamed:@"pub_music_placeholder"]];
+    }
+    else {
+        [self.music_image sd_setImageWithURL:[NSURL URLWithString:imageUrl]];
+    }
+}
 
 - (UIImageView *)stylusImage {
     if (!_stylusImage) {

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/KSAudioAnimationView.xib

@@ -1,47 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" 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="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <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="KSAudioAnimationView">
-            <rect key="frame" x="0.0" y="0.0" width="200" height="200"/>
+            <rect key="frame" x="0.0" y="0.0" width="180" height="180"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="disc_bg" translatesAutoresizingMaskIntoConstraints="NO" id="lFV-It-Bm6">
-                    <rect key="frame" x="20" y="19" width="160" height="162"/>
+                    <rect key="frame" x="18" y="18" width="144" height="144"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="162" id="Ta9-nk-h9I"/>
-                        <constraint firstAttribute="width" constant="160" id="Tna-yG-6fx"/>
+                        <constraint firstAttribute="height" constant="144" id="Ta9-nk-h9I"/>
+                        <constraint firstAttribute="width" constant="144" id="Tna-yG-6fx"/>
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9rU-kO-9oA">
-                    <rect key="frame" x="37.666666666666657" y="37" width="125" height="126"/>
+                    <rect key="frame" x="33.666666666666664" y="33.333333333333336" width="112.66666666666669" height="113.33333333333331"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vinyl_image" translatesAutoresizingMaskIntoConstraints="NO" id="4la-AT-u8a">
-                            <rect key="frame" x="0.0" y="0.0" width="125" height="126"/>
+                            <rect key="frame" x="0.0" y="0.0" width="112.66666666666667" height="113.33333333333333"/>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pub_music_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="lVm-zv-Cjp">
-                            <rect key="frame" x="28.333333333333336" y="29" width="68" height="68"/>
+                            <rect key="frame" x="26.333333333333336" y="26.666666666666664" width="60.000000000000007" height="59.999999999999993"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="68" id="Hfl-IX-QGD"/>
-                                <constraint firstAttribute="height" constant="68" id="JIb-Al-3Z6"/>
+                                <constraint firstAttribute="width" constant="60" id="Hfl-IX-QGD"/>
+                                <constraint firstAttribute="width" secondItem="lVm-zv-Cjp" secondAttribute="height" multiplier="1:1" id="IMv-1e-NVE"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="34"/>
+                                    <integer key="value" value="30"/>
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
+                        <constraint firstAttribute="width" constant="112.5" id="7OQ-oq-1ZT"/>
                         <constraint firstItem="lVm-zv-Cjp" firstAttribute="centerY" secondItem="9rU-kO-9oA" secondAttribute="centerY" id="bvX-pt-zFO"/>
+                        <constraint firstAttribute="width" secondItem="9rU-kO-9oA" secondAttribute="height" multiplier="125:126" id="jpf-EQ-Sad"/>
                         <constraint firstAttribute="bottom" secondItem="4la-AT-u8a" secondAttribute="bottom" id="k6r-mb-QBC"/>
                         <constraint firstItem="4la-AT-u8a" firstAttribute="leading" secondItem="9rU-kO-9oA" secondAttribute="leading" id="onS-d1-2aK"/>
                         <constraint firstItem="lVm-zv-Cjp" firstAttribute="centerX" secondItem="9rU-kO-9oA" secondAttribute="centerX" id="uQx-nX-QGw"/>
@@ -50,17 +52,17 @@
                     </constraints>
                 </view>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="disc_dot" translatesAutoresizingMaskIntoConstraints="NO" id="HET-TE-ojn">
-                    <rect key="frame" x="92.666666666666671" y="92.666666666666671" width="15" height="15"/>
+                    <rect key="frame" x="82.666666666666671" y="82.666666666666671" width="15" height="15"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="15" id="DqX-FY-VWd"/>
                         <constraint firstAttribute="height" constant="15" id="Z1s-oL-yaK"/>
                     </constraints>
                 </imageView>
                 <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stylus_image" translatesAutoresizingMaskIntoConstraints="NO" id="BbL-Qa-JrN">
-                    <rect key="frame" x="132" y="17" width="43" height="117"/>
+                    <rect key="frame" x="118.66666666666669" y="16.333333333333336" width="39" height="105.33333333333331"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="117" id="tph-20-Zry"/>
-                        <constraint firstAttribute="width" constant="43" id="vap-ud-LAc"/>
+                        <constraint firstAttribute="width" secondItem="BbL-Qa-JrN" secondAttribute="height" multiplier="43:117" id="j2s-5P-2xp"/>
+                        <constraint firstAttribute="width" constant="38.700000000000003" id="vap-ud-LAc"/>
                     </constraints>
                 </imageView>
             </subviews>
@@ -69,8 +71,8 @@
                 <constraint firstItem="lFV-It-Bm6" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="GXc-Zo-uni"/>
                 <constraint firstItem="9rU-kO-9oA" firstAttribute="centerX" secondItem="lFV-It-Bm6" secondAttribute="centerX" id="LW3-gO-4q0"/>
                 <constraint firstItem="9rU-kO-9oA" firstAttribute="centerY" secondItem="lFV-It-Bm6" secondAttribute="centerY" id="Moj-RK-hoi"/>
-                <constraint firstItem="BbL-Qa-JrN" firstAttribute="trailing" secondItem="lFV-It-Bm6" secondAttribute="trailing" constant="-5" id="WOU-6T-tLp"/>
-                <constraint firstItem="BbL-Qa-JrN" firstAttribute="top" secondItem="lFV-It-Bm6" secondAttribute="top" constant="-2" id="duw-YQ-bd5"/>
+                <constraint firstItem="BbL-Qa-JrN" firstAttribute="trailing" secondItem="lFV-It-Bm6" secondAttribute="trailing" constant="-4.5" id="WOU-6T-tLp"/>
+                <constraint firstItem="BbL-Qa-JrN" firstAttribute="top" secondItem="lFV-It-Bm6" secondAttribute="top" constant="-1.8" id="duw-YQ-bd5"/>
                 <constraint firstItem="lFV-It-Bm6" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="gzL-Wi-8kW"/>
                 <constraint firstItem="HET-TE-ojn" firstAttribute="centerY" secondItem="lFV-It-Bm6" secondAttribute="centerY" id="l1V-zT-gbc"/>
                 <constraint firstItem="HET-TE-ojn" firstAttribute="centerX" secondItem="lFV-It-Bm6" secondAttribute="centerX" id="m0l-RH-T8x"/>

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/KSMediaMergeView.m

@@ -12,7 +12,6 @@
 #import "KSPlayerView.h"
 #import "KSPlayerSliderView.h"
 #import "KSVideoPlayerView.h"
-#import "KSAudioPlayAnimationView.h"
 #import "MergeTipsAlert.h"
 #import "MusicPublistAlert.h"
 #import "KSMediaManager.h"
@@ -72,8 +71,6 @@
 
 @property (nonatomic, strong) UIButton *showButton;
 
-@property (nonatomic, strong) KSAudioPlayAnimationView *playAnimationView;
-
 // 远端资源
 @property (nonatomic, strong) NSString *remoteVideoUrl;
 
@@ -984,7 +981,7 @@
 - (void)refreshViewCoverImg:(NSMutableArray *)imageArray {
     UIImage *img = [imageArray lastObject];
     self.settingImage = img;
-    [self.publishAlert.publishContainView.musicImage setImage:self.settingImage];
+    [self.publishAlert.musicCoverView.musicImage setImage:self.settingImage];
 }
 
 
@@ -1456,6 +1453,20 @@
             [LOADING_MANAGER MBShowAUTOHidingInWindow:@"复制成功"];
         }
             break;
+        case MINESHARETYPE_DETAIL: // 作品详情
+        {
+            NSString *detailUrl = [NSString stringWithFormat:@"%@%@?id=%@",WEBHOST, @"/#/creation", productId];
+            if (self.fromDraftPage == NO) {
+                [self displayWorks:detailUrl];
+            }
+            else {
+                [self removeViewTips:NO];
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [[NSNotificationCenter defaultCenter] postNotificationName:@"displayWorksPage" object:@{@"url":detailUrl}];
+                });
+            }
+        }
+            break;
         case MINESHARETYPE_CANCEL:
         {
             [self removeView];
@@ -1463,9 +1474,20 @@
         default:
             break;
     }
-
 }
 
+- (void)displayWorks:(NSString *)url {
+    [self freePlayer];
+    // 跳转到我的作品
+    UIViewController *baseCtrl = [self findViewController];
+    [self removeFromSuperview];
+    
+    [baseCtrl.navigationController popToRootViewControllerAnimated:YES];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"displayWorks" object:@{@"url" : url}];
+    });
+    
+}
 
 - (void)showSaveDraftTipsAlert {
     MJWeakSelf;
@@ -1482,6 +1504,8 @@
     [self freePlayer];
     // 跳转到我的作品
     UIViewController *baseCtrl = [self findViewController];
+    [self removeFromSuperview];
+
     [baseCtrl.navigationController popToRootViewControllerAnimated:YES];
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [[NSNotificationCenter defaultCenter] postNotificationName:@"DisplayDraft" object:nil];
@@ -1556,20 +1580,6 @@
     }
 }
 
-- (KSAudioPlayAnimationView *)playAnimationView {
-    if (!_playAnimationView) {
-        _playAnimationView = [[KSAudioPlayAnimationView alloc] init];
-        _playAnimationView.frame = CGRectMake(0, 0, 424, 80);
-    }
-    return _playAnimationView;
-}
-
-
-
-- (void)timerAction {
-    float value = drand48();
-    [self.playAnimationView setSoundsValue:value];
-}
 
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -1658,7 +1668,7 @@
     }
     else {
         self.settingImage = croppedImage;
-        [self.publishAlert.publishContainView.musicImage setImage:self.settingImage];
+        [self.publishAlert.musicCoverView.musicImage setImage:self.settingImage];
     }
     
     [controller dismissViewControllerAnimated:YES completion:nil];

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/KSMergeAudioControlView.xib

@@ -18,7 +18,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="289" height="388"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="unX-kF-GoX">
-                            <rect key="frame" x="11" y="52" width="277" height="158"/>
+                            <rect key="frame" x="11" y="52" width="277" height="178"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kcU-rG-UWE">
@@ -345,6 +345,7 @@
                         <constraint firstItem="gDU-D3-OZv" firstAttribute="centerY" secondItem="xzg-Xa-du5" secondAttribute="centerY" id="Ebk-nq-Udu"/>
                         <constraint firstItem="ucS-Gd-cx3" firstAttribute="top" secondItem="if2-R5-Tul" secondAttribute="bottom" constant="16" id="Eyw-26-LDZ"/>
                         <constraint firstItem="imR-Qo-Jpf" firstAttribute="top" secondItem="zGK-Nm-bhv" secondAttribute="top" constant="2" id="FhE-Kf-3Oq"/>
+                        <constraint firstItem="oyf-C4-Pe3" firstAttribute="top" secondItem="unX-kF-GoX" secondAttribute="top" constant="10" id="GMD-wf-qUu"/>
                         <constraint firstItem="f5Q-wh-6l8" firstAttribute="bottom" secondItem="GuK-qa-jwH" secondAttribute="bottom" id="IBd-T0-PP8"/>
                         <constraint firstItem="53S-gG-Fsg" firstAttribute="leading" secondItem="Jqd-bC-HWT" secondAttribute="trailing" constant="20" id="JYZ-kj-UgG"/>
                         <constraint firstItem="VTj-cX-p66" firstAttribute="leading" secondItem="dNG-od-Opv" secondAttribute="leading" id="Juc-95-lKd"/>
@@ -372,7 +373,7 @@
                         <constraint firstItem="slK-h7-P25" firstAttribute="top" secondItem="XPO-nW-Uox" secondAttribute="bottom" constant="12" id="ZPv-OR-vc2"/>
                         <constraint firstItem="f5Q-wh-6l8" firstAttribute="centerX" secondItem="Jqd-bC-HWT" secondAttribute="centerX" id="aUL-2e-p91"/>
                         <constraint firstItem="53S-gG-Fsg" firstAttribute="trailing" secondItem="beO-nV-nu5" secondAttribute="trailing" constant="-5" id="aUt-lF-11M"/>
-                        <constraint firstItem="DAF-iV-Mgw" firstAttribute="bottom" secondItem="unX-kF-GoX" secondAttribute="bottom" constant="10" id="cqL-cM-9bX"/>
+                        <constraint firstItem="DAF-iV-Mgw" firstAttribute="bottom" secondItem="unX-kF-GoX" secondAttribute="bottom" constant="-10" id="cqL-cM-9bX"/>
                         <constraint firstItem="GuK-qa-jwH" firstAttribute="leading" secondItem="4uQ-6L-UfR" secondAttribute="leading" constant="8.5" id="dAg-hx-VdR"/>
                         <constraint firstItem="ZEM-tW-WX9" firstAttribute="top" secondItem="dNG-od-Opv" secondAttribute="top" constant="14" id="ddY-o0-jeB"/>
                         <constraint firstAttribute="trailing" secondItem="VTj-cX-p66" secondAttribute="trailing" id="dw9-31-S22"/>
@@ -386,7 +387,6 @@
                         <constraint firstItem="slK-h7-P25" firstAttribute="leading" secondItem="96g-7r-vnm" secondAttribute="trailing" constant="6" id="gWj-rN-OUA"/>
                         <constraint firstItem="XPO-nW-Uox" firstAttribute="leading" secondItem="dNG-od-Opv" secondAttribute="leading" constant="26" id="h5x-Vo-RBz"/>
                         <constraint firstItem="MX8-jr-euo" firstAttribute="leading" secondItem="dNG-od-Opv" secondAttribute="leading" id="hPK-xS-fSR"/>
-                        <constraint firstItem="unX-kF-GoX" firstAttribute="top" secondItem="oyf-C4-Pe3" secondAttribute="top" constant="-10" id="hPS-T9-LHg"/>
                         <constraint firstItem="Mqk-Mg-Pni" firstAttribute="top" secondItem="NBl-15-e5U" secondAttribute="top" constant="10" id="hSM-Po-KXc"/>
                         <constraint firstItem="53S-gG-Fsg" firstAttribute="top" secondItem="beO-nV-nu5" secondAttribute="top" constant="9" id="hnc-Bj-geW"/>
                         <constraint firstItem="xzg-Xa-du5" firstAttribute="bottom" secondItem="kcU-rG-UWE" secondAttribute="bottom" constant="-10" id="hr2-nQ-JRi"/>
@@ -463,7 +463,7 @@
     <resources>
         <image name="align_left_bg" width="27" height="23"/>
         <image name="align_right_bg" width="27" height="23"/>
-        <image name="aligningSlider_bg" width="181" height="11"/>
+        <image name="aligningSlider_bg" width="180.66667175292969" height="11.333333015441895"/>
         <image name="cancleMerge_image" width="24" height="24"/>
         <image name="merge_next" width="14" height="14"/>
         <image name="merge_upload" width="24" height="24"/>

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/MergeTipsAlert.m

@@ -9,8 +9,6 @@
 
 @interface MergeTipsAlert ()
 
-@property (weak, nonatomic) IBOutlet UIView *colorView;
-
 @property (weak, nonatomic) IBOutlet UILabel *tipsLabel;
 
 @property (weak, nonatomic) IBOutlet UIButton *leftButton;

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/ShareFunctionView.h

@@ -11,7 +11,8 @@ typedef NS_ENUM(NSInteger, MINESHARETYPE) {
     MINESHARETYPE_FRIEND,  // 微信好友
     MINESHARETYPE_CIRCLE,  // 朋友圈
     MINESHARETYPE_SAVE,    // 保存链接
-    MINESHARETYPE_CANCEL,  // 取消下载
+    MINESHARETYPE_DETAIL,  // 查看作品
+    MINESHARETYPE_CANCEL,  // 取消
 };
 
 typedef void(^ShareChooseCallback)(MINESHARETYPE type);

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/ShareFunctionView.m

@@ -11,8 +11,6 @@
 
 @property (weak, nonatomic) IBOutlet UIView *containerView;
 
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bottomSpace;
-
 @property (nonatomic, copy) ShareChooseCallback callback;
 
 @end
@@ -21,7 +19,6 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-//    [self addGesture];
 }
 
 + (instancetype)shareInstance {
@@ -69,6 +66,11 @@
     }
 }
 
+- (IBAction)showWorks:(id)sender {
+    if (self.callback) {
+        self.callback(MINESHARETYPE_DETAIL);
+    }
+}
 
 - (IBAction)cancelAction:(id)sender {
     [self cancelShareAction];

KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/AudioMerge/ShareFunctionView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" 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="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -15,26 +15,26 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xxd-Rj-n4H">
-                    <rect key="frame" x="46.666666666666657" y="229" width="300" height="204.33333333333337"/>
+                    <rect key="frame" x="53" y="227" width="287" height="208"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="作品发布成功！快来分享吧！" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="whi-jN-odv">
-                            <rect key="frame" x="22.000000000000014" y="15" width="204.33333333333337" height="22"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="作品发布成功，快来分享吧！" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="whi-jN-odv">
+                            <rect key="frame" x="50.333333333333329" y="23" width="186.66666666666669" height="26"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="22" id="mcC-RU-mid"/>
+                                <constraint firstAttribute="height" constant="26" id="mcC-RU-mid"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                            <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cancle_button" translatesAutoresizingMaskIntoConstraints="NO" id="d68-wP-nqr">
-                            <rect key="frame" x="278" y="11" width="12" height="12"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="musc_publish_cancel" translatesAutoresizingMaskIntoConstraints="NO" id="d68-wP-nqr">
+                            <rect key="frame" x="261" y="12" width="14" height="14"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="12" id="2dO-Ib-kPr"/>
-                                <constraint firstAttribute="height" constant="12" id="UWh-M8-xRo"/>
+                                <constraint firstAttribute="width" constant="14" id="2dO-Ib-kPr"/>
+                                <constraint firstAttribute="height" constant="14" id="UWh-M8-xRo"/>
                             </constraints>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1X7-2b-H7z">
-                            <rect key="frame" x="260" y="0.0" width="40" height="40"/>
+                            <rect key="frame" x="247" y="0.0" width="40" height="40"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="mfV-tg-6hm"/>
                                 <constraint firstAttribute="width" constant="40" id="twM-LS-3el"/>
@@ -45,7 +45,7 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3o6-xF-kdP">
-                            <rect key="frame" x="52" y="60.999999999999993" width="52" height="68.333333333333314"/>
+                            <rect key="frame" x="35.666666666666671" y="66" width="52" height="70"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="share_friendIcon" translatesAutoresizingMaskIntoConstraints="NO" id="hP0-qM-Y11">
                                     <rect key="frame" x="4" y="0.0" width="44" height="44"/>
@@ -55,16 +55,17 @@
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="微信好友" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vjl-Z1-6Mv">
-                                    <rect key="frame" x="0.0" y="54" width="52" height="14.333333333333329"/>
+                                    <rect key="frame" x="0.0" y="54" width="52" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="52" id="5M4-h2-Hz5"/>
+                                        <constraint firstAttribute="height" constant="16" id="s3E-ay-hg9"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <color key="textColor" red="0.39215686274509803" green="0.396078431372549" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Iho-8X-SD1">
-                                    <rect key="frame" x="0.0" y="0.0" width="52" height="68.333333333333329"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="52" height="70"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                     <connections>
                                         <action selector="shareFriend:" destination="iN0-l3-epB" eventType="touchUpInside" id="eSM-hz-qsf"/>
@@ -86,31 +87,27 @@
                                 <constraint firstAttribute="bottom" secondItem="vjl-Z1-6Mv" secondAttribute="bottom" id="s7r-eh-W7i"/>
                             </constraints>
                         </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cJu-Gs-vEw">
-                            <rect key="frame" x="13" y="146.33333333333331" width="274" height="1"/>
-                            <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="1" id="h5e-T1-Xll"/>
-                            </constraints>
-                        </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="取消" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KgM-5w-lll">
-                            <rect key="frame" x="133.33333333333334" y="162.33333333333331" width="33.333333333333343" height="22"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hbd-Au-HVO">
+                            <rect key="frame" x="71.666666666666686" y="154" width="144" height="36"/>
+                            <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="22" id="233-tf-otD"/>
+                                <constraint firstAttribute="height" constant="36" id="3fn-zb-bgE"/>
+                                <constraint firstAttribute="width" constant="144" id="bBb-V7-BVz"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                            <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hbd-Au-HVO">
-                            <rect key="frame" x="0.0" y="147.33333333333331" width="300" height="57"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" title="查看作品"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <integer key="value" value="18"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
                             <connections>
-                                <action selector="cancelAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="RDg-wT-LHI"/>
+                                <action selector="showWorks:" destination="iN0-l3-epB" eventType="touchUpInside" id="Bzy-zB-XAL"/>
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pii-x4-YtS">
-                            <rect key="frame" x="124" y="60.999999999999993" width="52" height="68.333333333333314"/>
+                            <rect key="frame" x="117.66666666666666" y="66" width="52" height="70"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="share_friendCircle" translatesAutoresizingMaskIntoConstraints="NO" id="5ej-dh-tsG">
                                     <rect key="frame" x="4" y="0.0" width="44" height="44"/>
@@ -120,16 +117,17 @@
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="朋友圈" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="12Q-cw-qeX">
-                                    <rect key="frame" x="0.0" y="54" width="52" height="14.333333333333329"/>
+                                    <rect key="frame" x="0.0" y="54" width="52" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="52" id="6pb-Kd-q83"/>
+                                        <constraint firstAttribute="height" constant="16" id="yJN-LF-FwC"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <color key="textColor" red="0.3921568627" green="0.39607843139999999" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pJm-Pm-dKW">
-                                    <rect key="frame" x="0.0" y="0.0" width="52" height="68.333333333333329"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="52" height="70"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                     <connections>
                                         <action selector="shareCircle:" destination="iN0-l3-epB" eventType="touchUpInside" id="rGy-7k-Iyh"/>
@@ -152,18 +150,19 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="972-C6-GND">
-                            <rect key="frame" x="196" y="60.999999999999993" width="52" height="68.333333333333314"/>
+                            <rect key="frame" x="199.66666666666666" y="66" width="52" height="70"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="save_linkIcon" translatesAutoresizingMaskIntoConstraints="NO" id="HFC-kg-Cnl">
-                                    <rect key="frame" x="4" y="0.0" width="44" height="44"/>
+                                    <rect key="frame" x="4.0000000000000284" y="0.0" width="44" height="44"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="44" id="Pun-mH-KQi"/>
                                         <constraint firstAttribute="width" constant="44" id="bAc-gW-UQ6"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="复制链接" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NrI-8j-lth">
-                                    <rect key="frame" x="0.0" y="54" width="52" height="14.333333333333329"/>
+                                    <rect key="frame" x="0.0" y="54" width="52" height="16"/>
                                     <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="wqU-GK-cwm"/>
                                         <constraint firstAttribute="width" constant="52" id="z0T-Iz-msj"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -171,7 +170,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mlB-f7-6X8">
-                                    <rect key="frame" x="0.0" y="0.0" width="52" height="68.333333333333329"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="52" height="70"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                     <connections>
                                         <action selector="saveLink:" destination="iN0-l3-epB" eventType="touchUpInside" id="rSH-Ut-2gO"/>
@@ -197,28 +196,23 @@
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="1X7-2b-H7z" firstAttribute="top" secondItem="xxd-Rj-n4H" secondAttribute="top" id="0eY-1Q-fY5"/>
-                        <constraint firstItem="whi-jN-odv" firstAttribute="leading" secondItem="xxd-Rj-n4H" secondAttribute="leading" constant="22" id="77b-d3-fXo"/>
-                        <constraint firstItem="pii-x4-YtS" firstAttribute="leading" secondItem="3o6-xF-kdP" secondAttribute="trailing" constant="20" id="8oP-dH-jon"/>
-                        <constraint firstItem="Hbd-Au-HVO" firstAttribute="top" secondItem="cJu-Gs-vEw" secondAttribute="bottom" id="AXs-66-0Hc"/>
-                        <constraint firstItem="cJu-Gs-vEw" firstAttribute="top" secondItem="3o6-xF-kdP" secondAttribute="bottom" constant="17" id="DJm-3W-Ppo"/>
+                        <constraint firstItem="whi-jN-odv" firstAttribute="centerX" secondItem="xxd-Rj-n4H" secondAttribute="centerX" id="4Ek-TC-mQX"/>
+                        <constraint firstItem="pii-x4-YtS" firstAttribute="leading" secondItem="3o6-xF-kdP" secondAttribute="trailing" constant="30" id="8oP-dH-jon"/>
+                        <constraint firstItem="pii-x4-YtS" firstAttribute="top" secondItem="whi-jN-odv" secondAttribute="bottom" constant="17" id="D09-jS-nY6"/>
                         <constraint firstAttribute="trailing" secondItem="1X7-2b-H7z" secondAttribute="trailing" id="Fg7-FP-q51"/>
                         <constraint firstItem="pii-x4-YtS" firstAttribute="centerX" secondItem="xxd-Rj-n4H" secondAttribute="centerX" id="HkN-nL-ZkK"/>
-                        <constraint firstAttribute="trailing" secondItem="d68-wP-nqr" secondAttribute="trailing" constant="10" id="I0M-Uk-GhE"/>
-                        <constraint firstAttribute="trailing" secondItem="cJu-Gs-vEw" secondAttribute="trailing" constant="13" id="Idm-7d-lED"/>
-                        <constraint firstAttribute="bottom" secondItem="KgM-5w-lll" secondAttribute="bottom" constant="20" id="KaZ-ue-dRl"/>
-                        <constraint firstItem="3o6-xF-kdP" firstAttribute="top" secondItem="whi-jN-odv" secondAttribute="bottom" constant="24" id="QqV-SP-EIG"/>
-                        <constraint firstAttribute="trailing" secondItem="Hbd-Au-HVO" secondAttribute="trailing" id="Rgn-1H-6vP"/>
-                        <constraint firstItem="972-C6-GND" firstAttribute="leading" secondItem="pii-x4-YtS" secondAttribute="trailing" constant="20" id="Rlx-5Z-6Ld"/>
+                        <constraint firstAttribute="trailing" secondItem="d68-wP-nqr" secondAttribute="trailing" constant="12" id="I0M-Uk-GhE"/>
+                        <constraint firstAttribute="height" constant="208" id="PaS-i3-rbj"/>
+                        <constraint firstItem="3o6-xF-kdP" firstAttribute="top" secondItem="whi-jN-odv" secondAttribute="bottom" constant="17" id="QqV-SP-EIG"/>
+                        <constraint firstItem="972-C6-GND" firstAttribute="leading" secondItem="pii-x4-YtS" secondAttribute="trailing" constant="30" id="Rlx-5Z-6Ld"/>
                         <constraint firstItem="pii-x4-YtS" firstAttribute="centerY" secondItem="3o6-xF-kdP" secondAttribute="centerY" id="YaR-Tg-ZcD"/>
-                        <constraint firstItem="whi-jN-odv" firstAttribute="top" secondItem="xxd-Rj-n4H" secondAttribute="top" constant="15" id="ZWU-fk-uQU"/>
-                        <constraint firstItem="cJu-Gs-vEw" firstAttribute="leading" secondItem="xxd-Rj-n4H" secondAttribute="leading" constant="13" id="bD5-oG-A0K"/>
-                        <constraint firstAttribute="bottom" secondItem="Hbd-Au-HVO" secondAttribute="bottom" id="bw7-c0-8jw"/>
-                        <constraint firstItem="KgM-5w-lll" firstAttribute="centerX" secondItem="xxd-Rj-n4H" secondAttribute="centerX" id="iF6-pQ-QO3"/>
-                        <constraint firstItem="Hbd-Au-HVO" firstAttribute="leading" secondItem="xxd-Rj-n4H" secondAttribute="leading" id="mdL-48-aTV"/>
-                        <constraint firstItem="KgM-5w-lll" firstAttribute="top" secondItem="cJu-Gs-vEw" secondAttribute="bottom" constant="15" id="oKd-gp-JKZ"/>
+                        <constraint firstItem="whi-jN-odv" firstAttribute="top" secondItem="xxd-Rj-n4H" secondAttribute="top" constant="23" id="ZWU-fk-uQU"/>
+                        <constraint firstAttribute="bottom" secondItem="Hbd-Au-HVO" secondAttribute="bottom" constant="18" id="bw7-c0-8jw"/>
+                        <constraint firstItem="Hbd-Au-HVO" firstAttribute="centerX" secondItem="xxd-Rj-n4H" secondAttribute="centerX" id="q6Z-FK-gGd"/>
                         <constraint firstItem="972-C6-GND" firstAttribute="centerY" secondItem="3o6-xF-kdP" secondAttribute="centerY" id="q9s-ei-XU2"/>
-                        <constraint firstItem="d68-wP-nqr" firstAttribute="top" secondItem="xxd-Rj-n4H" secondAttribute="top" constant="11" id="qKv-jP-uao"/>
-                        <constraint firstAttribute="width" constant="300" id="tqA-Z0-lUX"/>
+                        <constraint firstItem="d68-wP-nqr" firstAttribute="top" secondItem="xxd-Rj-n4H" secondAttribute="top" constant="12" id="qKv-jP-uao"/>
+                        <constraint firstItem="972-C6-GND" firstAttribute="top" secondItem="whi-jN-odv" secondAttribute="bottom" constant="17" id="tfW-cA-bP3"/>
+                        <constraint firstAttribute="width" constant="287" id="tqA-Z0-lUX"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -236,14 +230,13 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
-                <outlet property="bottomSpace" destination="KaZ-ue-dRl" id="xJR-P0-MOI"/>
                 <outlet property="containerView" destination="xxd-Rj-n4H" id="xuA-Pw-lve"/>
             </connections>
             <point key="canvasLocation" x="104.58015267175573" y="-166.90140845070422"/>
         </view>
     </objects>
     <resources>
-        <image name="cancle_button" width="20" height="20"/>
+        <image name="musc_publish_cancel" width="14" height="14"/>
         <image name="save_linkIcon" width="44" height="44"/>
         <image name="share_friendCircle" width="44" height="44"/>
         <image name="share_friendIcon" width="44" height="44"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/IncomeCountViewController.m

@@ -617,10 +617,25 @@
     [_myWebView loadHTMLString:@"" baseURL:nil];
     [_myWebView removeFromSuperview];
     _myWebView = nil;
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-    [[NSURLCache sharedURLCache] setDiskCapacity:0];
+    [self clearWebCache];
+//    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+//    [[NSURLCache sharedURLCache] setDiskCapacity:0];
     [[NSURLCache sharedURLCache] setMemoryCapacity:0];
 }
+
+- (void)clearWebCache {
+    NSSet *websiteDataTypes = [NSSet setWithArray:@[
+        WKWebsiteDataTypeMemoryCache,
+    ]];
+
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes
+                                               modifiedSince:dateFrom
+                                           completionHandler:^{
+        NSLog(@"Caches cleared");
+    }];
+}
+
 /*
 #pragma mark - Navigation
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/SettingViewController.m

@@ -23,6 +23,7 @@
 #import "TenantUnbindDetailViewController.h"
 
 #import "CoursewareDownloadManager.h"
+#import "KSBaseGuideManager.h"
 
 @interface SettingViewController ()
  
@@ -144,12 +145,29 @@
     }
 }
 
-
-- (void)clearCache {
-    [VoNetworking clearDownloadData];
+- (void)closeDownload {
     if (COURSEWARE_MANAGER.isDownloading) { // 如果在下载 取消
         [COURSEWARE_MANAGER cancleDownloadCourseware];
     }
+}
+
+- (void)deleteWebCache {
+
+    //allWebsiteDataTypes清除所有缓存
+    NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
+        
+    }];
+}
+
+- (void)clearCache {
+    [self closeDownload];
+    [self deleteWebCache];
+    [VoNetworking clearDownloadData];
+    UserDefaultSetBoolForKey(NO, MERGE_GUIDEKEY);
+    
     NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
     NSString *bundlePath = [documentsPath stringByAppendingPathComponent:@"CoursewarePath"];
     NSFileManager *fileManager = [NSFileManager defaultManager];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/Controller/MineWorksViewController.m

@@ -10,6 +10,7 @@
 #import "MineWorksBodyView.h"
 #import "JXCategoryView.h"
 #import "JXPagerListRefreshView.h"
+#import "KSBaseWKWebViewController.h"
 
 @interface MineWorksViewController ()<JXPagerViewDelegate, JXPagerMainTableViewGestureDelegate,JXCategoryViewDelegate>
 
@@ -26,20 +27,35 @@
 @end
 
 @implementation MineWorksViewController
+
 - (void)displayDraft:(BOOL)displayDraft {
     self.displayDraftPage = displayDraft;
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self configUI];
+    //    displayWorksPage
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showFirstPage:) name:@"displayWorksPage" object:nil];
+}
+
+- (void)showFirstPage:(NSNotification *)notification {
+    [self.categoryView selectItemAtIndex:0];
+    NSDictionary *info = notification.object;
+    NSString *url = [info ks_stringValueForKey:@"url"];
+    if (![NSString isEmptyString:url]) {
+        KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
+        ctrl.url = url;
+        ctrl.ks_landScape = NO;
+        [self.navigationController pushViewController:ctrl animated:YES];
+    }
 }
 
 - (void)configUI {
     self.ks_prefersNavigationBarHidden = YES;
     [self.scrollView removeFromSuperview];
     NSString *bgName = IS_IPAD ? @"mineWorks_bgPad" : @"mineWorks_bg";
-
     UIImage *bgImage = [UIImage imageNamed:bgName];
     NSInteger height = (NSInteger)(bgImage.size.height / bgImage.size.width * KPortraitWidth);
     UIImageView *imageView = [[UIImageView alloc] initWithImage:bgImage];
@@ -57,8 +73,8 @@
 }
 
 - (void)configCategoryUI:(NSInteger)topHeight {
-    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, topHeight-20, KPortraitWidth, 58)];
-    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth, 58) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(20, 20)];
+    _categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, topHeight-20, KPortraitWidth, 44)];
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KPortraitWidth, 44) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(20, 20)];
     CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
     maskLayer.frame = _categoryView.bounds;
     maskLayer.path = maskPath.CGPath;
@@ -72,11 +88,13 @@
     self.categoryView.titleSelectedColor = HexRGB(0x333333);
     self.categoryView.titleColor = HexRGB(0x777777);
     self.categoryView.titleColorGradientEnabled = YES;
+    self.categoryView.cellWidth = 70;
+    self.categoryView.contentEdgeInsetLeft = (KPortraitWidth - 70 * 2) / 4;
+    self.categoryView.contentEdgeInsetRight = (KPortraitWidth - 70 * 2) / 4;
     
     JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init];
     [lineView.indicatorImageView setImage:[UIImage imageNamed:@"minework_Line"]];
     lineView.indicatorImageViewSize = CGSizeMake(16, 4);
-    lineView.verticalMargin = 10;
     self.categoryView.indicators = @[lineView];
     
     _pagerView = [self preferredPagingView];
@@ -141,7 +159,7 @@
 }
 
 - (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
-    return 58;
+    return 44;
 }
 
 - (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/KSCropImageNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" 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="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -34,14 +34,14 @@
                             </connections>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="编辑封面" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GGz-C6-Tp4">
-                            <rect key="frame" x="163.66666666666666" y="20.666666666666668" width="66" height="20.000000000000004"/>
+                            <rect key="frame" x="164.66666666666666" y="20.666666666666668" width="63.666666666666657" height="20.000000000000004"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dGw-mB-Z1v">
                             <rect key="frame" x="305" y="14.666666666666664" width="64" height="32"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="64" id="UdM-ZV-lN9"/>
                                 <constraint firstAttribute="height" constant="32" id="k09-mz-AeM"/>
@@ -49,7 +49,7 @@
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="保存">
-                                <color key="titleColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </state>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/KSVideoImageSlider.m

@@ -70,7 +70,7 @@
     if (_knobView == nil) {
         _knobView = [[UIImageView alloc]init];
         _knobView.layer.cornerRadius = 10.0f;
-        _knobView.layer.borderColor = HexRGB(0x279FFE).CGColor;
+        _knobView.layer.borderColor = HexRGB(0x2DC7AA).CGColor;
         _knobView.layer.borderWidth = 4.0f;
         _knobView.layer.masksToBounds = YES;
         _knobView.contentMode = UIViewContentModeScaleAspectFill;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorkSortView.h

@@ -0,0 +1,35 @@
+//
+//  MineWorkSortView.h
+//  StudentDaya
+//
+//  Created by 王智 on 2024/10/14.
+//  Copyright © 2024 DayaMusic. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSInteger, MINEWORKS_SEARCH) {
+    MINEWORKS_SEARCH_SORT,   // 筛选
+    MINEWORKS_SEARCH_SEARCH, // 搜索
+};
+typedef void(^MineWorksSortCallback)(MINEWORKS_SEARCH type, NSString * _Nullable searchKey);
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MineWorkSortView : UIView
+
++ (instancetype)shareInstance;
+
+- (void)configSortDesc:(NSString *)sortDesc;
+
+- (void)configPlaceholder:(NSString *)placeholder;
+
+- (void)searchAction:(MineWorksSortCallback)callback;
+
+- (void)changeArrowDisplay:(BOOL)isSort;
+
++ (CGFloat)getViewHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorkSortView.m

@@ -0,0 +1,103 @@
+//
+//  MineWorkSortView.m
+//  StudentDaya
+//
+//  Created by 王智 on 2024/10/14.
+//  Copyright © 2024 DayaMusic. All rights reserved.
+//
+
+#import "MineWorkSortView.h"
+
+@interface MineWorkSortView ()<UITextFieldDelegate>
+
+@property (weak, nonatomic) IBOutlet UILabel *sortTitle;
+
+@property (weak, nonatomic) IBOutlet UIImageView *arrowImage;
+
+@property (weak, nonatomic) IBOutlet UITextField *searchField;
+
+@property (nonatomic, copy) MineWorksSortCallback callback;
+
+@end
+
+@implementation MineWorkSortView
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    self.searchField.delegate = self;
+}
+
++ (instancetype)shareInstance {
+    MineWorkSortView *view = [[[NSBundle mainBundle] loadNibNamed:@"MineWorkSortView" owner:nil options:nil] firstObject];
+    return view;
+}
+
+- (void)configSortDesc:(NSString *)sortDesc {
+    if ([NSString isEmptyString:sortDesc]) {
+        sortDesc = @"全部";
+    }
+    if (sortDesc.length > 3) {
+        sortDesc = [NSString stringWithFormat:@"%@...",[sortDesc substringWithRange:NSMakeRange(0, 3)]];
+    }
+    self.sortTitle.text = sortDesc;
+}
+
+- (void)configPlaceholder:(NSString *)placeholder {
+    self.searchField.placeholder = placeholder;
+}
+
+- (void)searchAction:(MineWorksSortCallback)callback {
+    if (callback) {
+        self.callback = callback;
+    }
+}
+
+- (IBAction)sortAction:(id)sender {
+    [self changeArrowDisplay:YES];
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(MINEWORKS_SEARCH_SORT, self.searchField.text);
+    }
+}
+
+- (IBAction)searchButtonAction:(id)sender {
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(MINEWORKS_SEARCH_SEARCH, self.searchField.text);
+    }
+}
+
+- (void)changeArrowDisplay:(BOOL)isSort {
+    if (isSort) {
+        self.sortTitle.textColor = THEMECOLOR;
+        [self.arrowImage setImage:[UIImage imageNamed:@"sort_up_blue"]];
+    }
+    else {
+        self.sortTitle.textColor = HexRGB(0x333333);
+        [self.arrowImage setImage:[UIImage imageNamed:@"sort_up_grey"]];
+    }
+}
+
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+    if ([string isEqualToString:@" "]) {
+        return NO;
+    }
+    if ([string isEqualToString:@"\n"]) {
+        [self endEditing:YES];
+        return YES;
+    }
+    return YES;
+}
+
++ (CGFloat)getViewHeight {
+    return 35.0f + 12 * 2;
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorkSortView.xib

@@ -0,0 +1,136 @@
+<?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">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
+        <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="MineWorkSortView">
+            <rect key="frame" x="0.0" y="0.0" width="393" height="62"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dOb-hY-YVi">
+                    <rect key="frame" x="80" y="13.666666666666664" width="295" height="35"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="search_green" translatesAutoresizingMaskIntoConstraints="NO" id="vVA-3n-RKC">
+                            <rect key="frame" x="12" y="10" width="15" height="15"/>
+                        </imageView>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yH8-3p-M3A">
+                            <rect key="frame" x="234" y="4" width="56" height="27"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="56" id="4PL-Qr-Nlm"/>
+                                <constraint firstAttribute="height" constant="27" id="t9h-73-Jd6"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" title="搜索" backgroundImage="search_button_bg">
+                                <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </state>
+                            <connections>
+                                <action selector="searchButtonAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="L0a-Je-BxT"/>
+                            </connections>
+                        </button>
+                        <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入曲目名称" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="zBY-uY-xzS">
+                            <rect key="frame" x="32" y="0.0" width="197" height="35"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <textInputTraits key="textInputTraits" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
+                        </textField>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.60999999999999999" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstItem="zBY-uY-xzS" firstAttribute="leading" secondItem="vVA-3n-RKC" secondAttribute="trailing" constant="5" id="2ZY-C9-lg1"/>
+                        <constraint firstItem="vVA-3n-RKC" firstAttribute="centerY" secondItem="dOb-hY-YVi" secondAttribute="centerY" id="4vM-tN-xLb"/>
+                        <constraint firstAttribute="trailing" secondItem="yH8-3p-M3A" secondAttribute="trailing" constant="5" id="6BM-Zp-sv6"/>
+                        <constraint firstItem="vVA-3n-RKC" firstAttribute="leading" secondItem="dOb-hY-YVi" secondAttribute="leading" constant="12" id="AVs-FY-0Fc"/>
+                        <constraint firstItem="yH8-3p-M3A" firstAttribute="centerY" secondItem="dOb-hY-YVi" secondAttribute="centerY" id="Eiu-kb-ht4"/>
+                        <constraint firstItem="yH8-3p-M3A" firstAttribute="leading" secondItem="zBY-uY-xzS" secondAttribute="trailing" constant="5" id="K94-dI-Ohg"/>
+                        <constraint firstItem="zBY-uY-xzS" firstAttribute="top" secondItem="dOb-hY-YVi" secondAttribute="top" id="Scm-vn-9yB"/>
+                        <constraint firstAttribute="bottom" secondItem="zBY-uY-xzS" secondAttribute="bottom" id="U4T-eT-Y4e"/>
+                        <constraint firstAttribute="height" constant="35" id="WBQ-4Y-Kfg"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="17.5"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                            <real key="value" value="0.5"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                            <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="phd-bA-adF">
+                    <rect key="frame" x="6" y="13.666666666666664" width="74" height="35"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8On-rE-dYl">
+                            <rect key="frame" x="16" y="7.3333333333333357" width="28" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="BB2-Aw-5a7"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_up_grey" translatesAutoresizingMaskIntoConstraints="NO" id="Yma-bz-br4">
+                            <rect key="frame" x="48" y="15" width="9" height="5"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="9" id="YHw-Ic-aQL"/>
+                                <constraint firstAttribute="height" constant="5" id="kgC-zg-tN5"/>
+                            </constraints>
+                        </imageView>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="31m-mg-pv6">
+                            <rect key="frame" x="0.0" y="0.0" width="74" height="35"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="35" id="zuG-dX-YUg"/>
+                            </constraints>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <connections>
+                                <action selector="sortAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="7kg-Z5-GZe"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="Yma-bz-br4" firstAttribute="leading" secondItem="8On-rE-dYl" secondAttribute="trailing" constant="4" id="5DF-Uq-w2b"/>
+                        <constraint firstItem="31m-mg-pv6" firstAttribute="width" secondItem="phd-bA-adF" secondAttribute="width" id="OKo-tA-ecs"/>
+                        <constraint firstAttribute="trailing" secondItem="Yma-bz-br4" secondAttribute="trailing" constant="17" id="Rb1-uT-U8L"/>
+                        <constraint firstItem="8On-rE-dYl" firstAttribute="centerY" secondItem="phd-bA-adF" secondAttribute="centerY" id="Xds-gu-eag"/>
+                        <constraint firstItem="31m-mg-pv6" firstAttribute="centerY" secondItem="phd-bA-adF" secondAttribute="centerY" id="a6K-cE-3Aa"/>
+                        <constraint firstAttribute="height" constant="35" id="aVM-5Z-oSR"/>
+                        <constraint firstItem="Yma-bz-br4" firstAttribute="centerY" secondItem="8On-rE-dYl" secondAttribute="centerY" id="pSH-qs-Lhk"/>
+                        <constraint firstItem="31m-mg-pv6" firstAttribute="centerX" secondItem="phd-bA-adF" secondAttribute="centerX" id="y8l-VI-2qG"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="dOb-hY-YVi" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="80" id="E1m-bM-wEz"/>
+                <constraint firstItem="dOb-hY-YVi" firstAttribute="leading" secondItem="phd-bA-adF" secondAttribute="trailing" id="JNt-Ab-nRP"/>
+                <constraint firstItem="phd-bA-adF" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="6" id="M0I-cX-rmb"/>
+                <constraint firstItem="dOb-hY-YVi" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="hJS-7l-T4A"/>
+                <constraint firstItem="dOb-hY-YVi" firstAttribute="centerY" secondItem="phd-bA-adF" secondAttribute="centerY" id="iai-2s-Vj2"/>
+                <constraint firstAttribute="trailing" secondItem="dOb-hY-YVi" secondAttribute="trailing" constant="18" id="zWu-RX-jC3"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="arrowImage" destination="Yma-bz-br4" id="8Pz-35-iRz"/>
+                <outlet property="searchField" destination="zBY-uY-xzS" id="wln-n3-QCl"/>
+                <outlet property="sortTitle" destination="8On-rE-dYl" id="MZM-Ke-cyL"/>
+            </connections>
+            <point key="canvasLocation" x="41.984732824427482" y="135.91549295774649"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="search_button_bg" width="56" height="27"/>
+        <image name="search_green" width="15" height="15"/>
+        <image name="sort_up_grey" width="9" height="5"/>
+    </resources>
+</document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorksBodyView.m

@@ -16,6 +16,8 @@
 #import "MineWorksBottomView.h"
 #import "KSNewAlertView.h"
 #import "KSDraftMergeViewController.h"
+#import "MineWorkSortView.h"
+#import "KSSmallChoosePicker.h"
 
 @interface MineWorksBodyView ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -37,6 +39,16 @@
 
 @property (nonatomic, assign) NSInteger chooseCount;
 
+@property (nonatomic, strong) MineWorkSortView *sortView;
+
+@property (nonatomic, strong) NSString *searchKey;
+
+@property (nonatomic, strong) NSString *fileType;
+
+@property (nonatomic, assign) NSInteger lastChooseIndex;
+
+@property (nonatomic, strong) NSMutableArray *fileTypeArray;
+
 @end
 
 @implementation MineWorksBodyView
@@ -85,6 +97,11 @@
     }
     return self;
 }
+
+- (void)configChooseIndex {
+    self.lastChooseIndex = 1;
+}
+
 - (void)endRefresh {
     [self.tableView.mj_header endRefreshing];
     [self.tableView.mj_footer endRefreshing];
@@ -111,7 +128,7 @@
     else {
         self.type = @"DRAFT";
     }
-    [KSNetworkingManager userMusicPageRequest:KS_POST type:self.type page:self.page rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager userMusicPageRequest:KS_POST type:self.type keyword:self.searchKey fileType:self.fileType page:self.page rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200) {
             NSArray *fileArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -146,6 +163,19 @@
     [self requestData];
 }
 
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    CGFloat height = [MineWorkSortView getViewHeight];
+    if (![self.subviews containsObject:self.sortView]) {
+        [self configChooseIndex];
+        [self addSubview:self.sortView];
+        self.sortView.frame = CGRectMake(0, 0, self.bounds.size.width, height);
+    }
+    [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self).mas_offset(height);
+    }];
+}
+
 - (void)selectCellAtIndexPath:(NSIndexPath *)indexPath {
     
     if (self.lastSelectedIndexPath == indexPath) {
@@ -244,9 +274,9 @@
 - (void)displayMergeView:(UserMusicFormalModel *)model {
     KSDraftMergeViewController *ctrl = [[KSDraftMergeViewController alloc] init];
     ctrl.sourceModel = model;
-    MJWeakSelf;
+    
     [ctrl editCallback:^{
-//        [weakSelf refreshAndRequestData];
+
     }];
     [self.naviController pushViewController:ctrl animated:YES];
 }
@@ -444,6 +474,53 @@
     }];
 }
 
+- (MineWorkSortView *)sortView {
+    if (!_sortView) {
+        _sortView = [MineWorkSortView shareInstance];
+        [_sortView configPlaceholder:@"请输入曲目名称"];
+        MJWeakSelf;
+        [_sortView searchAction:^(MINEWORKS_SEARCH type, NSString * _Nullable searchKey) {
+            [weakSelf searchWithType:type searchKey:searchKey];
+        }];
+    }
+    return _sortView;
+}
+
+- (void)searchWithType:(MINEWORKS_SEARCH)type searchKey:(NSString *)searchKey {
+    if (type == MINEWORKS_SEARCH_SORT) {
+        [self sortTypeAction];
+    }
+    else {
+        self.searchKey = searchKey;
+        [self refreshAndRequestData];
+    }
+}
+
+- (void)sortTypeAction {
+    KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部",@"视频",@"音频"] lastChoose:self.lastChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+        [self.sortView changeArrowDisplay:NO];
+        self.lastChooseIndex = chooseIndex;
+        if (chooseIndex == 1) {
+            [self.sortView configSortDesc:@"全部"];
+            self.fileType = nil;
+        }
+        else {
+            [self.sortView configSortDesc:returnValue];
+            self.fileType = self.fileTypeArray[chooseIndex-1];
+        }
+        [self refreshAndRequestData];
+    } cancel:^{
+        [self.sortView changeArrowDisplay:NO];
+    }];
+    [picker showPicker];
+}
+
+- (NSMutableArray *)fileTypeArray {
+    if (!_fileTypeArray) {
+        _fileTypeArray = [NSMutableArray arrayWithArray:@[@"",@"VIDEO",@"AUDIO"]];
+    }
+    return _fileTypeArray;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorksDraftsCell.m

@@ -8,6 +8,7 @@
 #import "MineWorksDraftsCell.h"
 
 @interface MineWorksDraftsCell ()
+@property (weak, nonatomic) IBOutlet UIImageView *worksTypeImage;
 
 @property (weak, nonatomic) IBOutlet UIImageView *chooseStatusImage;
 
@@ -83,6 +84,14 @@
         self.chooseStatusImage.hidden = YES;
         self.publishTips.hidden = NO;
     }
+    NSString *imgName = @"";
+    if ([model.videoUrl hasSuffix:@".mp4"]) {
+        imgName = @"workType_video";
+    }
+    else {
+        imgName = @"workType_audio";
+    }
+    [self.worksTypeImage setImage:[UIImage imageNamed:imgName]];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorksDraftsCell.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" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,7 +18,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sbM-p5-CSI">
-                        <rect key="frame" x="13" y="12" width="351" height="122"/>
+                        <rect key="frame" x="13" y="0.0" width="351" height="122"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_coverBg" translatesAutoresizingMaskIntoConstraints="NO" id="1jM-kS-ueU">
                                 <rect key="frame" x="19" y="16" width="54" height="54"/>
@@ -35,7 +35,7 @@
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="4"/>
+                                        <integer key="value" value="8"/>
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
@@ -117,7 +117,7 @@
                                 <rect key="frame" x="277" y="88" width="62" height="25"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="去发布" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cZL-qI-9zG">
-                                        <rect key="frame" x="12.666666666666686" y="5.3333333333333295" width="37" height="14.333333333333336"/>
+                                        <rect key="frame" x="13" y="5.3333333333333295" width="36" height="14.333333333333336"/>
                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
@@ -136,6 +136,13 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="workType_audio" translatesAutoresizingMaskIntoConstraints="NO" id="3IW-3q-bzC">
+                                <rect key="frame" x="40" y="15" width="28" height="14"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="28" id="ZDn-yd-Dq6"/>
+                                    <constraint firstAttribute="height" constant="14" id="wlk-B5-JES"/>
+                                </constraints>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
@@ -158,6 +165,8 @@
                             <constraint firstItem="r93-WW-AsM" firstAttribute="top" secondItem="sbM-p5-CSI" secondAttribute="top" constant="23" id="gSD-y8-h6X"/>
                             <constraint firstItem="MCo-vL-Avx" firstAttribute="leading" secondItem="WOO-8s-BT6" secondAttribute="trailing" constant="4" id="gWK-ze-Cac"/>
                             <constraint firstItem="r93-WW-AsM" firstAttribute="leading" secondItem="1jM-kS-ueU" secondAttribute="trailing" constant="12" id="jtU-xR-hVE"/>
+                            <constraint firstItem="3IW-3q-bzC" firstAttribute="top" secondItem="rxQ-sS-z9K" secondAttribute="top" id="lEY-bI-smS"/>
+                            <constraint firstItem="3IW-3q-bzC" firstAttribute="trailing" secondItem="rxQ-sS-z9K" secondAttribute="trailing" id="lU0-Hz-fgG"/>
                             <constraint firstItem="1jM-kS-ueU" firstAttribute="top" secondItem="sbM-p5-CSI" secondAttribute="top" constant="16" id="nBE-gH-aqV"/>
                             <constraint firstAttribute="trailing" secondItem="MCo-vL-Avx" secondAttribute="trailing" constant="12" id="r4i-PG-ZM4"/>
                             <constraint firstItem="09X-I4-Gx4" firstAttribute="leading" secondItem="ihw-ja-g5P" secondAttribute="trailing" constant="12" id="ryl-f0-0C3"/>
@@ -172,10 +181,10 @@
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="bottom" secondItem="sbM-p5-CSI" secondAttribute="bottom" id="8cN-OE-pt7"/>
+                    <constraint firstAttribute="bottom" secondItem="sbM-p5-CSI" secondAttribute="bottom" constant="12" id="8cN-OE-pt7"/>
                     <constraint firstItem="sbM-p5-CSI" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="13" id="aI1-xv-OmA"/>
                     <constraint firstAttribute="trailing" secondItem="sbM-p5-CSI" secondAttribute="trailing" constant="13" id="ajT-AN-Seb"/>
-                    <constraint firstItem="sbM-p5-CSI" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="lqh-S6-Y8o"/>
+                    <constraint firstItem="sbM-p5-CSI" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="lqh-S6-Y8o"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
@@ -189,6 +198,7 @@
                 <outlet property="musicName" destination="r93-WW-AsM" id="7LH-IV-lKm"/>
                 <outlet property="publishTips" destination="09X-I4-Gx4" id="Fo4-im-dZy"/>
                 <outlet property="timeLabel" destination="MCo-vL-Avx" id="4oT-ak-gLh"/>
+                <outlet property="worksTypeImage" destination="3IW-3q-bzC" id="F4j-nd-xAz"/>
             </connections>
             <point key="canvasLocation" x="95.419847328244273" y="55.633802816901408"/>
         </tableViewCell>
@@ -198,5 +208,6 @@
         <image name="pub_music_placeholder" width="205" height="205"/>
         <image name="time_grey" width="12" height="12"/>
         <image name="unChoose_status" width="18" height="18"/>
+        <image name="workType_audio" width="28" height="14"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorksOpenDisplayCell.m

@@ -9,6 +9,8 @@
 
 @interface MineWorksOpenDisplayCell ()
 
+@property (weak, nonatomic) IBOutlet UIImageView *worksTypeImage;
+
 @property (weak, nonatomic) IBOutlet UIImageView *musicCoverImg;
 
 @property (weak, nonatomic) IBOutlet UILabel *musicName;
@@ -42,6 +44,14 @@
     self.likeLabel.text = countString;
     // 设置渐变色
     [self configGrandLayer:countString];
+    NSString *imgName = @"";
+    if ([model.videoUrl hasSuffix:@".mp4"]) {
+        imgName = @"workType_video";
+    }
+    else {
+        imgName = @"workType_audio";
+    }
+    [self.worksTypeImage setImage:[UIImage imageNamed:imgName]];
 }
 
 - (void)configGrandLayer:(NSString *)countString {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MineWorksOpenDisplayCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,7 +18,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dg0-fR-1bH">
-                        <rect key="frame" x="13" y="12" width="362" height="88"/>
+                        <rect key="frame" x="13" y="0.0" width="362" height="88"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_coverBg" translatesAutoresizingMaskIntoConstraints="NO" id="8WS-Si-IGE">
                                 <rect key="frame" x="19" y="17" width="54" height="54"/>
@@ -35,12 +35,19 @@
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="4"/>
+                                        <integer key="value" value="8"/>
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="workType_audio" translatesAutoresizingMaskIntoConstraints="NO" id="8QI-mG-VGi">
+                                <rect key="frame" x="40" y="16" width="28" height="14"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="14" id="7s4-Dx-lmw"/>
+                                    <constraint firstAttribute="width" constant="28" id="Rgb-or-giI"/>
+                                </constraints>
+                            </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="山茶花读不懂白玫瑰" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EaD-CA-BJf">
-                                <rect key="frame" x="83" y="20" width="147" height="22"/>
+                                <rect key="frame" x="83" y="20" width="143" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="Da0-04-OcQ"/>
                                 </constraints>
@@ -98,6 +105,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="EaD-CA-BJf" firstAttribute="leading" secondItem="8WS-Si-IGE" secondAttribute="trailing" constant="10" id="0qq-Lb-6SF"/>
+                            <constraint firstItem="8QI-mG-VGi" firstAttribute="top" secondItem="Dmr-3m-MAH" secondAttribute="top" id="69e-V9-cOg"/>
                             <constraint firstItem="8WS-Si-IGE" firstAttribute="leading" secondItem="dg0-fR-1bH" secondAttribute="leading" constant="19" id="6fs-wq-ZsT"/>
                             <constraint firstItem="olA-a5-JqX" firstAttribute="leading" secondItem="puC-Bo-Iu5" secondAttribute="trailing" constant="9" id="DJD-o6-bed"/>
                             <constraint firstItem="8WS-Si-IGE" firstAttribute="centerY" secondItem="dg0-fR-1bH" secondAttribute="centerY" id="G9Y-Q6-6LY"/>
@@ -107,6 +115,7 @@
                             <constraint firstItem="EaD-CA-BJf" firstAttribute="top" secondItem="dg0-fR-1bH" secondAttribute="top" constant="20" id="SlA-ht-9WB"/>
                             <constraint firstItem="Dmr-3m-MAH" firstAttribute="leading" secondItem="dg0-fR-1bH" secondAttribute="leading" constant="12" id="X2z-cQ-PwW"/>
                             <constraint firstItem="puC-Bo-Iu5" firstAttribute="leading" secondItem="6oO-oK-DFO" secondAttribute="leading" id="asf-8h-8y8"/>
+                            <constraint firstItem="8QI-mG-VGi" firstAttribute="trailing" secondItem="Dmr-3m-MAH" secondAttribute="trailing" id="bJg-rx-ZrJ"/>
                             <constraint firstItem="puC-Bo-Iu5" firstAttribute="top" secondItem="EaD-CA-BJf" secondAttribute="bottom" constant="7" id="e3V-X8-xht"/>
                             <constraint firstItem="Dmr-3m-MAH" firstAttribute="centerY" secondItem="dg0-fR-1bH" secondAttribute="centerY" id="fV1-Gc-kDZ"/>
                             <constraint firstItem="DyO-nc-d96" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="EaD-CA-BJf" secondAttribute="trailing" constant="10" id="hPk-V9-Hq1"/>
@@ -124,9 +133,9 @@
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="bottom" secondItem="dg0-fR-1bH" secondAttribute="bottom" id="FDj-hV-kEh"/>
+                    <constraint firstAttribute="bottom" secondItem="dg0-fR-1bH" secondAttribute="bottom" constant="12" id="FDj-hV-kEh"/>
                     <constraint firstItem="dg0-fR-1bH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="13" id="MI9-SF-RaG"/>
-                    <constraint firstItem="dg0-fR-1bH" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="MMy-Vo-38a"/>
+                    <constraint firstItem="dg0-fR-1bH" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="MMy-Vo-38a"/>
                     <constraint firstAttribute="trailing" secondItem="dg0-fR-1bH" secondAttribute="trailing" constant="13" id="lFf-q5-f2W"/>
                 </constraints>
             </tableViewCellContentView>
@@ -138,6 +147,7 @@
                 <outlet property="musicCoverImg" destination="Dmr-3m-MAH" id="6Pa-PQ-dRj"/>
                 <outlet property="musicName" destination="EaD-CA-BJf" id="rUI-ik-QCe"/>
                 <outlet property="publishTime" destination="olA-a5-JqX" id="pwO-QV-m9Q"/>
+                <outlet property="worksTypeImage" destination="8QI-mG-VGi" id="dVQ-yp-pN7"/>
             </connections>
             <point key="canvasLocation" x="103.81679389312977" y="12.67605633802817"/>
         </tableViewCell>
@@ -147,5 +157,6 @@
         <image name="product_like" width="13" height="13"/>
         <image name="product_play" width="20" height="20"/>
         <image name="pub_music_placeholder" width="205" height="205"/>
+        <image name="workType_audio" width="28" height="14"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicCoverChooseView.h

@@ -0,0 +1,29 @@
+//
+//  MusicCoverChooseView.h
+//  KulexiuSchoolStudent
+//
+//  Created by 王智 on 2024/7/16.
+//
+
+#import <UIKit/UIKit.h>
+#import "MusicPubHeader.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MusicCoverChooseView : UIView
+
+@property (weak, nonatomic) IBOutlet UIImageView *musicImage;
+
+@property (weak, nonatomic) IBOutlet UILabel *musicName;
+
+@property (weak, nonatomic) IBOutlet UILabel *userName;
+
++ (instancetype)shareInstance;
+
+- (void)musicCoverChooseAction:(MusicPublishCallback)callback;
+
++ (CGFloat)getViewHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicCoverChooseView.m

@@ -0,0 +1,55 @@
+//
+//  MusicCoverChooseView.m
+//  KulexiuSchoolStudent
+//
+//  Created by 王智 on 2024/7/16.
+//
+
+#import "MusicCoverChooseView.h"
+
+@interface MusicCoverChooseView ()
+
+@property (weak, nonatomic) IBOutlet UIView *backView;
+
+@property (nonatomic, copy) MusicPublishCallback callback;
+
+@end
+
+@implementation MusicCoverChooseView
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    self.backView.layer.cornerRadius = 4;
+    self.backView.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner;
+}
+
+
++ (instancetype)shareInstance {
+    MusicCoverChooseView *view = [[[NSBundle mainBundle] loadNibNamed:@"MusicCoverChooseView" owner:nil options:nil] firstObject];
+    return view;
+}
+
+- (void)musicCoverChooseAction:(MusicPublishCallback)callback {
+    if (callback) {
+        self.callback = callback;
+    }
+}
+
+- (IBAction)chooseCover:(id)sender {
+    if (self.callback) {
+        self.callback(PUBLISH_ACTION_CHOOSEIMG);
+    }
+}
+
++ (CGFloat)getViewHeight {
+    return 98.0f;
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicCoverChooseView.xib

@@ -0,0 +1,145 @@
+<?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">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
+        <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="MusicCoverChooseView">
+            <rect key="frame" x="0.0" y="0.0" width="393" height="98"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cMP-G6-hso">
+                    <rect key="frame" x="12" y="0.0" width="369" height="86"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_coverBg" translatesAutoresizingMaskIntoConstraints="NO" id="Mdq-N4-IqT">
+                            <rect key="frame" x="19" y="12.666666666666664" width="61" height="60.999999999999993"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="61" id="B7l-Cr-pak"/>
+                                <constraint firstAttribute="height" constant="61" id="PwF-2O-nCE"/>
+                            </constraints>
+                        </imageView>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pub_music_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="3xZ-ol-W91">
+                            <rect key="frame" x="12" y="12" width="62" height="62"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="62" id="7Yp-5c-Fpy"/>
+                                <constraint firstAttribute="width" constant="62" id="MpJ-Yl-0B7"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="8"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vc1-Mv-UUI">
+                            <rect key="frame" x="90" y="20" width="267" height="22"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="22" id="KRW-L0-cIT"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
+                            <color key="textColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A4v-BC-yQS">
+                            <rect key="frame" x="90" y="46" width="267" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="ZA7-4R-xEp"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unChoose_status" translatesAutoresizingMaskIntoConstraints="NO" id="bYf-0x-hjj">
+                            <rect key="frame" x="0.0" y="34" width="0.0" height="18"/>
+                            <constraints>
+                                <constraint firstAttribute="width" id="6En-J5-ZYc"/>
+                                <constraint firstAttribute="height" constant="18" id="bgH-Wd-GJp"/>
+                            </constraints>
+                        </imageView>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aTa-Oq-dt0">
+                            <rect key="frame" x="12" y="54" width="62" height="20"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选封面" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZVh-f1-NZj">
+                                    <rect key="frame" x="11.666666666666664" y="0.0" width="39" height="18"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="18" id="Utn-Yy-k8W"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.37" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstItem="ZVh-f1-NZj" firstAttribute="top" secondItem="aTa-Oq-dt0" secondAttribute="top" id="SuC-Vu-BPr"/>
+                                <constraint firstItem="ZVh-f1-NZj" firstAttribute="centerX" secondItem="aTa-Oq-dt0" secondAttribute="centerX" id="XnG-HM-Dr4"/>
+                                <constraint firstAttribute="width" constant="62" id="jeH-9k-buy"/>
+                                <constraint firstAttribute="height" constant="20" id="r5u-HE-uFj"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VQ1-cH-3SS">
+                            <rect key="frame" x="12" y="12" width="62" height="62"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <connections>
+                                <action selector="chooseCover:" destination="iN0-l3-epB" eventType="touchUpInside" id="PxD-VD-ISS"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="A4v-BC-yQS" firstAttribute="top" secondItem="vc1-Mv-UUI" secondAttribute="bottom" constant="4" id="1EZ-0J-Gag"/>
+                        <constraint firstItem="bYf-0x-hjj" firstAttribute="leading" secondItem="cMP-G6-hso" secondAttribute="leading" id="3oQ-xq-dM4"/>
+                        <constraint firstItem="aTa-Oq-dt0" firstAttribute="bottom" secondItem="3xZ-ol-W91" secondAttribute="bottom" id="5nN-Mv-Cgy"/>
+                        <constraint firstItem="VQ1-cH-3SS" firstAttribute="top" secondItem="3xZ-ol-W91" secondAttribute="top" id="Aem-8K-1r9"/>
+                        <constraint firstItem="Mdq-N4-IqT" firstAttribute="centerY" secondItem="cMP-G6-hso" secondAttribute="centerY" id="Ahc-xH-uUa"/>
+                        <constraint firstItem="3xZ-ol-W91" firstAttribute="leading" secondItem="bYf-0x-hjj" secondAttribute="trailing" constant="12" id="BAc-jQ-Eph"/>
+                        <constraint firstItem="VQ1-cH-3SS" firstAttribute="leading" secondItem="3xZ-ol-W91" secondAttribute="leading" id="Ssi-uk-lLX"/>
+                        <constraint firstItem="3xZ-ol-W91" firstAttribute="trailing" secondItem="Mdq-N4-IqT" secondAttribute="trailing" constant="-6" id="Vtp-2L-Py4"/>
+                        <constraint firstItem="vc1-Mv-UUI" firstAttribute="top" secondItem="cMP-G6-hso" secondAttribute="top" constant="20" id="Xec-4j-7cX"/>
+                        <constraint firstItem="vc1-Mv-UUI" firstAttribute="leading" secondItem="Mdq-N4-IqT" secondAttribute="trailing" constant="10" id="YZH-lD-bU4"/>
+                        <constraint firstItem="VQ1-cH-3SS" firstAttribute="bottom" secondItem="3xZ-ol-W91" secondAttribute="bottom" id="aFr-23-Fxu"/>
+                        <constraint firstAttribute="height" constant="86" id="cdA-zU-iQ8"/>
+                        <constraint firstItem="3xZ-ol-W91" firstAttribute="centerY" secondItem="cMP-G6-hso" secondAttribute="centerY" id="flX-54-iJf"/>
+                        <constraint firstItem="aTa-Oq-dt0" firstAttribute="leading" secondItem="3xZ-ol-W91" secondAttribute="leading" id="ka9-wK-3XG"/>
+                        <constraint firstAttribute="trailing" secondItem="A4v-BC-yQS" secondAttribute="trailing" constant="12" id="o8h-NS-XfJ"/>
+                        <constraint firstItem="VQ1-cH-3SS" firstAttribute="trailing" secondItem="3xZ-ol-W91" secondAttribute="trailing" id="oXZ-SA-d2b"/>
+                        <constraint firstItem="bYf-0x-hjj" firstAttribute="centerY" secondItem="cMP-G6-hso" secondAttribute="centerY" id="ovY-U6-dgp"/>
+                        <constraint firstAttribute="trailing" secondItem="vc1-Mv-UUI" secondAttribute="trailing" constant="12" id="pUn-0v-fne"/>
+                        <constraint firstItem="aTa-Oq-dt0" firstAttribute="trailing" secondItem="3xZ-ol-W91" secondAttribute="trailing" id="rRf-xn-FAl"/>
+                        <constraint firstItem="A4v-BC-yQS" firstAttribute="leading" secondItem="vc1-Mv-UUI" secondAttribute="leading" id="tcq-IG-KwY"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="10"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="cMP-G6-hso" secondAttribute="trailing" constant="12" id="03W-P9-zbd"/>
+                <constraint firstItem="cMP-G6-hso" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="FjV-jh-FQW"/>
+                <constraint firstItem="cMP-G6-hso" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="mup-Ab-oVh"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="backView" destination="aTa-Oq-dt0" id="YBv-h6-cwq"/>
+                <outlet property="musicImage" destination="3xZ-ol-W91" id="alh-l5-JB7"/>
+                <outlet property="musicName" destination="vc1-Mv-UUI" id="62J-LY-lhy"/>
+                <outlet property="userName" destination="A4v-BC-yQS" id="434-9F-QBh"/>
+            </connections>
+            <point key="canvasLocation" x="-2.2900763358778624" y="-161.61971830985917"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="music_coverBg" width="54" height="54"/>
+        <image name="pub_music_placeholder" width="205" height="205"/>
+        <image name="unChoose_status" width="18" height="18"/>
+    </resources>
+</document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicPublicContentView.h

@@ -16,17 +16,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (weak, nonatomic) IBOutlet UITextView *textView;
 
-@property (weak, nonatomic) IBOutlet UIImageView *musicImage;
+@property (nonatomic, assign) BOOL hideScore;
 
-@property (weak, nonatomic) IBOutlet UILabel *musicName;
-
-@property (weak, nonatomic) IBOutlet UILabel *userName;
 
 + (instancetype)shareInstance;
 
-- (void)musicContentPubAction:(MusicPublishCallback)callback;
-
-- (void)publishEditCallback:(PublishInputCallback)callback;
+- (void)musicContentPubAction:(PublishInputCallback)callback;
 
 + (CGFloat)getViewHeight;
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicPublicContentView.m

@@ -9,17 +9,13 @@
 
 @interface MusicPublicContentView ()<UITextViewDelegate>
 
-@property (weak, nonatomic) IBOutlet UIButton *sureButton;
+@property (weak, nonatomic) IBOutlet UIImageView *statusImage;
 
 @property (weak, nonatomic) IBOutlet UILabel *countLabel;
 
 @property (weak, nonatomic) IBOutlet UILabel *tipsLabel;
 
-@property (weak, nonatomic) IBOutlet UIView *backView;
-
-@property (nonatomic, copy) MusicPublishCallback callback;
-
-@property (nonatomic, copy) PublishInputCallback editCallback;
+@property (nonatomic, copy) PublishInputCallback callback;
 
 @end
 
@@ -28,9 +24,6 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.textView.delegate = self;
-    
-    self.backView.layer.cornerRadius = 4;
-    self.backView.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner;
 }
 
 + (instancetype)shareInstance {
@@ -38,45 +31,35 @@
     return view;
 }
 
-- (void)musicContentPubAction:(MusicPublishCallback)callback {
+- (void)musicContentPubAction:(PublishInputCallback)callback; {
     if (callback) {
         self.callback = callback;
     }
 }
 
-- (void)publishEditCallback:(PublishInputCallback)callback {
-    if (callback) {
-        self.editCallback = callback;
-    }
+- (IBAction)statusButtonAction:(id)sender {
+    self.hideScore = !self.hideScore;
 }
 
-- (IBAction)sureAction:(id)sender {
-    if (self.callback) {
-        self.callback(PUBLISH_ACTION_PUBLISH);
-    }
-}
-
-- (IBAction)chooseCover:(id)sender {
-    if (self.callback) {
-        self.callback(PUBLISH_ACTION_CHOOSEIMG);
-    }
-}
 
 #pragma mark   ---- delegate
 - (BOOL)textViewShouldBeginEditing:(UITextView *)textView {
-    if (self.editCallback) {
-        self.editCallback(YES);
+    if (self.callback) {
+        self.callback(YES);
     }
     return YES;
 }
-
 - (void)textViewDidBeginEditing:(UITextView *)textView {
     self.tipsLabel.hidden = YES;
 }
+
 - (void)textViewDidEndEditing:(UITextView *)textView {
     if ([NSString isEmptyString:textView.text]) {
         self.tipsLabel.hidden = NO;
     }
+    if (self.callback) {
+        self.callback(NO);
+    }
 }
 
 - (BOOL)textViewShouldEndEditing:(UITextView *)textView {
@@ -128,10 +111,22 @@
     [self updateTextViewLineHeight:textView];
 }
 
-
 + (CGFloat)getViewHeight {
-    return 230.0f;
+    return 207.0f - 60.0f;
 }
+
+- (void)setHideScore:(BOOL)hideScore {
+    _hideScore = hideScore;
+    NSString *imageName = @"";
+    if (hideScore) {
+        imageName = @"choose_status";
+    }
+    else {
+        imageName = @"unChoose_status";
+    }
+    [self.statusImage setImage:[UIImage imageNamed:imageName]];
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicPublicContentView.xib

@@ -11,107 +11,47 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MusicPublicContentView">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="246"/>
+            <rect key="frame" x="0.0" y="0.0" width="393" height="160"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ySm-Or-cry">
-                    <rect key="frame" x="12" y="99" width="369" height="73"/>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ySm-Or-cry">
+                    <rect key="frame" x="12" y="99" width="369" height="48"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="music_coverBg" translatesAutoresizingMaskIntoConstraints="NO" id="vJP-em-vzJ">
-                            <rect key="frame" x="19" y="6" width="61" height="61"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unChoose_status" translatesAutoresizingMaskIntoConstraints="NO" id="Z2c-Y5-JPA">
+                            <rect key="frame" x="11" y="15" width="18" height="18"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="61" id="7rv-9b-MmO"/>
-                                <constraint firstAttribute="width" constant="61" id="DAq-YP-o88"/>
-                            </constraints>
-                        </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pub_music_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="IbR-gO-EMr">
-                            <rect key="frame" x="12" y="5.6666666666666714" width="62" height="62"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="62" id="FyK-dq-xsq"/>
-                                <constraint firstAttribute="width" constant="62" id="v2f-ci-KsA"/>
+                                <constraint firstAttribute="width" constant="18" id="Hkp-6N-xov"/>
+                                <constraint firstAttribute="height" constant="18" id="ihT-D0-sko"/>
                             </constraints>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="8"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lq4-ga-A7R">
-                            <rect key="frame" x="90" y="20" width="267" height="22"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="22" id="Q4v-O1-QEK"/>
-                            </constraints>
-                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
-                            <color key="textColor" red="0.074509803920000006" green="0.078431372550000003" blue="0.08235294118" alpha="1" colorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I8N-pM-mro">
-                            <rect key="frame" x="90" y="46" width="267" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="20" id="NGk-7d-ARq"/>
-                            </constraints>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发布时不让别人看到我的评级和分数" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xhd-vA-KJ5">
+                            <rect key="frame" x="35.000000000000014" y="15.666666666666671" width="222.33333333333337" height="17"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <color key="textColor" red="0.46666666670000001" green="0.46666666670000001" blue="0.46666666670000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="unChoose_status" translatesAutoresizingMaskIntoConstraints="NO" id="Z2c-Y5-JPA">
-                            <rect key="frame" x="0.0" y="27.666666666666671" width="0.0" height="18"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UyH-Gn-xpc">
+                            <rect key="frame" x="0.0" y="0.0" width="44" height="48"/>
                             <constraints>
-                                <constraint firstAttribute="width" id="Hkp-6N-xov"/>
-                                <constraint firstAttribute="height" constant="18" id="ihT-D0-sko"/>
+                                <constraint firstAttribute="width" constant="44" id="6YB-sI-mzg"/>
                             </constraints>
-                        </imageView>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xB0-uR-3Vs">
-                            <rect key="frame" x="12" y="47.666666666666657" width="62" height="20"/>
-                            <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选封面" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dcs-Oi-GdD">
-                                    <rect key="frame" x="11.666666666666664" y="0.0" width="39" height="18"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="18" id="b6r-rS-afy"/>
-                                    </constraints>
-                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
-                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.37" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                            <constraints>
-                                <constraint firstItem="Dcs-Oi-GdD" firstAttribute="centerX" secondItem="xB0-uR-3Vs" secondAttribute="centerX" id="0wX-YL-1c6"/>
-                                <constraint firstAttribute="height" constant="20" id="brl-Li-9m9"/>
-                                <constraint firstItem="Dcs-Oi-GdD" firstAttribute="top" secondItem="xB0-uR-3Vs" secondAttribute="top" id="e1c-2K-Qry"/>
-                                <constraint firstAttribute="width" constant="62" id="ls3-YT-lFD"/>
-                            </constraints>
-                        </view>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mGl-dI-rCl">
-                            <rect key="frame" x="12" y="5.6666666666666714" width="62" height="62"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <connections>
-                                <action selector="chooseCover:" destination="iN0-l3-epB" eventType="touchUpInside" id="5Fe-41-6ZC"/>
+                                <action selector="statusButtonAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="EPo-Ho-g2g"/>
                             </connections>
                         </button>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="IbR-gO-EMr" firstAttribute="centerY" secondItem="ySm-Or-cry" secondAttribute="centerY" id="2m2-TL-KDB"/>
-                        <constraint firstItem="IbR-gO-EMr" firstAttribute="trailing" secondItem="vJP-em-vzJ" secondAttribute="trailing" constant="-6" id="3Vr-NZ-5Yj"/>
-                        <constraint firstItem="vJP-em-vzJ" firstAttribute="centerY" secondItem="ySm-Or-cry" secondAttribute="centerY" id="4to-6o-TIt"/>
                         <constraint firstItem="Z2c-Y5-JPA" firstAttribute="centerY" secondItem="ySm-Or-cry" secondAttribute="centerY" id="7ab-Ws-Xuo"/>
-                        <constraint firstItem="mGl-dI-rCl" firstAttribute="trailing" secondItem="IbR-gO-EMr" secondAttribute="trailing" id="8Ta-sM-fmj"/>
-                        <constraint firstAttribute="trailing" secondItem="I8N-pM-mro" secondAttribute="trailing" constant="12" id="AGz-Fb-LnU"/>
-                        <constraint firstItem="Lq4-ga-A7R" firstAttribute="leading" secondItem="vJP-em-vzJ" secondAttribute="trailing" constant="10" id="AHW-HU-zhs"/>
-                        <constraint firstAttribute="height" constant="73" id="FGu-gU-ikC"/>
-                        <constraint firstItem="I8N-pM-mro" firstAttribute="leading" secondItem="Lq4-ga-A7R" secondAttribute="leading" id="FUA-xc-X82"/>
-                        <constraint firstItem="mGl-dI-rCl" firstAttribute="leading" secondItem="IbR-gO-EMr" secondAttribute="leading" id="FyH-Bg-WrU"/>
-                        <constraint firstItem="Lq4-ga-A7R" firstAttribute="top" secondItem="ySm-Or-cry" secondAttribute="top" constant="20" id="Mth-9R-s6K"/>
-                        <constraint firstItem="xB0-uR-3Vs" firstAttribute="leading" secondItem="IbR-gO-EMr" secondAttribute="leading" id="PGo-MX-r0D"/>
-                        <constraint firstItem="mGl-dI-rCl" firstAttribute="bottom" secondItem="IbR-gO-EMr" secondAttribute="bottom" id="UKV-dP-jb4"/>
-                        <constraint firstAttribute="trailing" secondItem="Lq4-ga-A7R" secondAttribute="trailing" constant="12" id="Wir-QO-mim"/>
-                        <constraint firstItem="I8N-pM-mro" firstAttribute="top" secondItem="Lq4-ga-A7R" secondAttribute="bottom" constant="4" id="XVM-Ko-OkK"/>
-                        <constraint firstItem="Z2c-Y5-JPA" firstAttribute="leading" secondItem="ySm-Or-cry" secondAttribute="leading" id="Xjv-we-kqb"/>
-                        <constraint firstItem="IbR-gO-EMr" firstAttribute="leading" secondItem="Z2c-Y5-JPA" secondAttribute="trailing" constant="12" id="cuD-f9-C1r"/>
-                        <constraint firstItem="mGl-dI-rCl" firstAttribute="top" secondItem="IbR-gO-EMr" secondAttribute="top" id="gfW-zB-wrB"/>
-                        <constraint firstItem="xB0-uR-3Vs" firstAttribute="trailing" secondItem="IbR-gO-EMr" secondAttribute="trailing" id="ikF-Uo-fWR"/>
-                        <constraint firstItem="xB0-uR-3Vs" firstAttribute="bottom" secondItem="IbR-gO-EMr" secondAttribute="bottom" id="qJA-gK-5iK"/>
+                        <constraint firstItem="UyH-Gn-xpc" firstAttribute="leading" secondItem="ySm-Or-cry" secondAttribute="leading" id="E8F-Aj-pc0"/>
+                        <constraint firstAttribute="height" constant="48" id="JcC-3M-WxK"/>
+                        <constraint firstItem="xhd-vA-KJ5" firstAttribute="leading" secondItem="Z2c-Y5-JPA" secondAttribute="trailing" constant="6" id="OiV-Je-UDy"/>
+                        <constraint firstItem="Z2c-Y5-JPA" firstAttribute="leading" secondItem="ySm-Or-cry" secondAttribute="leading" constant="11" id="Xjv-we-kqb"/>
+                        <constraint firstAttribute="bottom" secondItem="UyH-Gn-xpc" secondAttribute="bottom" id="bYu-4e-8qv"/>
+                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="xhd-vA-KJ5" secondAttribute="trailing" constant="12" id="eWd-aK-iHd"/>
+                        <constraint firstItem="UyH-Gn-xpc" firstAttribute="top" secondItem="ySm-Or-cry" secondAttribute="top" id="hbT-br-vym"/>
+                        <constraint firstItem="xhd-vA-KJ5" firstAttribute="centerY" secondItem="Z2c-Y5-JPA" secondAttribute="centerY" id="tro-Ne-Pyp"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -119,39 +59,20 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0wJ-e7-ouI">
-                    <rect key="frame" x="86.666666666666686" y="190" width="220" height="38"/>
-                    <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="38" id="K9L-wd-aJd"/>
-                        <constraint firstAttribute="width" constant="220" id="WV4-5d-yoT"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
-                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" title="发布作品"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="19"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
-                    <connections>
-                        <action selector="sureAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="TwC-pw-oyY"/>
-                    </connections>
-                </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NpE-3V-eM1">
                     <rect key="frame" x="12" y="0.0" width="369" height="87"/>
                     <subviews>
-                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EYP-nq-h0J">
-                            <rect key="frame" x="12" y="0.0" width="345" height="63"/>
+                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EYP-nq-h0J">
+                            <rect key="frame" x="12" y="2" width="345" height="61"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <color key="textColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.26666666666666666" green="0.26666666666666666" blue="0.26666666666666666" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences" enablesReturnKeyAutomatically="YES"/>
                         </textView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我发布了一首演奏作品，快来听听吧～" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="glk-go-0oW">
-                            <rect key="frame" x="11.999999999999986" y="10" width="236.66666666666663" height="17"/>
+                            <rect key="frame" x="11.999999999999986" y="12" width="236.66666666666663" height="17"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0/150" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lro-Xx-AAz">
@@ -160,20 +81,20 @@
                                 <constraint firstAttribute="height" constant="20" id="83V-tz-Cpg"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                            <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="glk-go-0oW" firstAttribute="leading" secondItem="NpE-3V-eM1" secondAttribute="leading" constant="12" id="3kw-tz-XVV"/>
-                        <constraint firstItem="EYP-nq-h0J" firstAttribute="top" secondItem="NpE-3V-eM1" secondAttribute="top" id="GLb-KA-3Zz"/>
-                        <constraint firstItem="lro-Xx-AAz" firstAttribute="top" secondItem="EYP-nq-h0J" secondAttribute="bottom" id="Lsb-oF-McB"/>
-                        <constraint firstAttribute="height" constant="87" id="MM1-lx-Cmu"/>
+                        <constraint firstItem="EYP-nq-h0J" firstAttribute="top" secondItem="NpE-3V-eM1" secondAttribute="top" constant="2" id="GLb-KA-3Zz"/>
                         <constraint firstAttribute="bottom" secondItem="lro-Xx-AAz" secondAttribute="bottom" constant="4" id="c5Y-ih-yEg"/>
                         <constraint firstItem="EYP-nq-h0J" firstAttribute="leading" secondItem="NpE-3V-eM1" secondAttribute="leading" constant="12" id="erk-lD-qR7"/>
-                        <constraint firstItem="glk-go-0oW" firstAttribute="top" secondItem="NpE-3V-eM1" secondAttribute="top" constant="10" id="ncg-6K-1re"/>
+                        <constraint firstItem="lro-Xx-AAz" firstAttribute="top" secondItem="EYP-nq-h0J" secondAttribute="bottom" id="hul-qi-OeR"/>
+                        <constraint firstItem="glk-go-0oW" firstAttribute="top" secondItem="NpE-3V-eM1" secondAttribute="top" constant="12" id="ncg-6K-1re"/>
                         <constraint firstAttribute="trailing" secondItem="lro-Xx-AAz" secondAttribute="trailing" constant="12" id="sOe-Ih-nSR"/>
+                        <constraint firstAttribute="height" constant="87" id="slu-bJ-Ylp"/>
                         <constraint firstAttribute="trailing" secondItem="EYP-nq-h0J" secondAttribute="trailing" constant="12" id="tXY-CK-lhd"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
@@ -185,35 +106,26 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstAttribute="bottom" secondItem="0wJ-e7-ouI" secondAttribute="bottom" constant="18" id="Ba7-0l-oGc"/>
                 <constraint firstAttribute="trailing" secondItem="NpE-3V-eM1" secondAttribute="trailing" constant="12" id="H3O-rj-Pdv"/>
                 <constraint firstAttribute="trailing" secondItem="ySm-Or-cry" secondAttribute="trailing" constant="12" id="Pqm-nZ-Nhi"/>
-                <constraint firstItem="0wJ-e7-ouI" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="Qhu-ND-VFC"/>
                 <constraint firstItem="ySm-Or-cry" firstAttribute="top" secondItem="NpE-3V-eM1" secondAttribute="bottom" constant="12" id="RVK-fV-L77"/>
                 <constraint firstItem="NpE-3V-eM1" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="YZ5-PY-Ced"/>
                 <constraint firstItem="ySm-Or-cry" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="ev9-kC-cbD"/>
                 <constraint firstItem="NpE-3V-eM1" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="jir-QV-hWq"/>
-                <constraint firstItem="0wJ-e7-ouI" firstAttribute="top" secondItem="ySm-Or-cry" secondAttribute="bottom" constant="18" id="n6Y-mi-EJu"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
-                <outlet property="backView" destination="xB0-uR-3Vs" id="J3a-fb-kKX"/>
                 <outlet property="countLabel" destination="lro-Xx-AAz" id="hyn-Cm-7d9"/>
-                <outlet property="musicImage" destination="IbR-gO-EMr" id="GX0-pM-jOo"/>
-                <outlet property="musicName" destination="Lq4-ga-A7R" id="hLK-Cr-9Vv"/>
-                <outlet property="sureButton" destination="0wJ-e7-ouI" id="qo3-HE-Z5X"/>
+                <outlet property="statusImage" destination="Z2c-Y5-JPA" id="MS7-AP-mld"/>
                 <outlet property="textView" destination="EYP-nq-h0J" id="yCJ-fa-yQp"/>
                 <outlet property="tipsLabel" destination="glk-go-0oW" id="V2E-OK-68E"/>
-                <outlet property="userName" destination="I8N-pM-mro" id="zzf-Zy-vet"/>
             </connections>
-            <point key="canvasLocation" x="58.778625954198468" y="-188.02816901408451"/>
+            <point key="canvasLocation" x="58.778625954198468" y="-219.71830985915494"/>
         </view>
     </objects>
     <resources>
-        <image name="music_coverBg" width="54" height="54"/>
-        <image name="pub_music_placeholder" width="205" height="205"/>
         <image name="unChoose_status" width="18" height="18"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicPublistAlert.h

@@ -9,6 +9,7 @@
 #import "VideoCoverChooseView.h"
 #import "MusicPublicContentView.h"
 #import "MusicPubHeader.h"
+#import "MusicCoverChooseView.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -16,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) VideoCoverChooseView *coverView;
 
+@property (nonatomic, strong) MusicCoverChooseView *musicCoverView;
+
 @property (nonatomic, strong) MusicPublicContentView *publishContainView;
 
 + (instancetype)shareInstance;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicPublistAlert.m

@@ -8,13 +8,14 @@
 #import "MusicPublistAlert.h"
 
 
-@interface MusicPublistAlert ()
+@interface MusicPublistAlert ()<UIScrollViewDelegate>
+
+@property (weak, nonatomic) IBOutlet UIImageView *buttonBottomLayer;
 
 @property (nonatomic, strong) UIScrollView *scrollView;
 
 @property (weak, nonatomic) IBOutlet UIView *containerView;
 
-
 @property (nonatomic, copy) MusicPublishCallback callback;
 
 @end
@@ -26,14 +27,32 @@
     [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(self.containerView);
     }];
+    self.scrollView.delegate = self;
 }
+
 + (instancetype)shareInstance {
     MusicPublistAlert *view = [[[NSBundle mainBundle] loadNibNamed:@"MusicPublistAlert" owner:nil options:nil] firstObject];
     return view;
 }
 
 - (void)configUI:(BOOL)isVideoPublish {
+    self.buttonBottomLayer.hidden = isVideoPublish ? NO : YES;
     MJWeakSelf;
+    self.musicCoverView = [MusicCoverChooseView shareInstance];
+    [self.musicCoverView musicCoverChooseAction:^(PUBLISH_ACTION type) {
+        [weakSelf endEditing:YES];
+        if (weakSelf.callback) {
+            weakSelf.callback(type);
+        }
+    }];
+    [self.scrollView addSubview:self.musicCoverView];
+    CGFloat musicCoverHeigt = [MusicCoverChooseView getViewHeight];
+    [self.musicCoverView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.containerView);
+        make.top.mas_equalTo(self.scrollView.mas_top);
+        make.height.mas_equalTo(musicCoverHeigt);
+    }];
+    
     if (isVideoPublish) {
         self.coverView = [VideoCoverChooseView shareInstance];
         [self.coverView chooseImageCallback:^(PUBLISH_ACTION type) {
@@ -46,9 +65,10 @@
         CGFloat coverHeigt = [VideoCoverChooseView getViewHeight];
         [self.coverView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.right.mas_equalTo(self.containerView);
-            make.top.mas_equalTo(self.scrollView.mas_top);
+            make.top.mas_equalTo(self.musicCoverView.mas_bottom);
             make.height.mas_equalTo(coverHeigt);
         }];
+        
         // container
         self.publishContainView = [MusicPublicContentView shareInstance];
         [self.scrollView addSubview:self.publishContainView];
@@ -59,27 +79,25 @@
             make.bottom.mas_equalTo(self.scrollView.mas_bottom);
             make.height.mas_equalTo(height);
         }];
+        [self.publishContainView musicContentPubAction:^(BOOL isEdit) {
+            [weakSelf changeStatus:isEdit];
+        }];
     }
     else {
         // container
         self.publishContainView = [MusicPublicContentView shareInstance];
-        [self addSubview:self.publishContainView];
+        [self.scrollView addSubview:self.publishContainView];
+        CGFloat height = [MusicPublicContentView getViewHeight];
         [self.publishContainView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.top.bottom.mas_equalTo(self.containerView);
+            make.top.mas_equalTo(self.musicCoverView.mas_bottom);
+            make.left.right.mas_equalTo(self.containerView);
+            make.bottom.mas_equalTo(self.scrollView.mas_bottom);
+            make.height.mas_equalTo(height);
+        }];
+        [self.publishContainView musicContentPubAction:^(BOOL isEdit) {
+            [weakSelf changeStatus:isEdit];
         }];
     }
-    [self.publishContainView musicContentPubAction:^(PUBLISH_ACTION type) {
-        [weakSelf endEditing:YES];
-        if (type == PUBLISH_ACTION_PUBLISH) {
-            [weakSelf hideAlert];
-        }
-        if (weakSelf.callback) {
-            weakSelf.callback(type);
-        }
-    }];
-    [self.publishContainView publishEditCallback:^(BOOL isEdit) {
-        [weakSelf changeStatus:isEdit];
-    }];
 }
 
 // 编辑状态下调整scroll 是否支持滚动
@@ -91,10 +109,11 @@
         self.scrollView.scrollEnabled = YES;
     }
 }
+
 - (void)evaluateMusicName:(NSString *)musicName userName:(NSString *)userName musicImage:(NSString *)musicImage {
-    self.publishContainView.musicName.text = [NSString returnNoNullStringWithString:musicName];
-    [self.publishContainView.musicImage sd_setImageWithURL:[NSURL URLWithString:[musicImage getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"pub_music_placeholder"]];
-    self.publishContainView.userName.text = [NSString returnNoNullStringWithString:userName];
+    self.musicCoverView.musicName.text = [NSString returnNoNullStringWithString:musicName];
+    [self.musicCoverView.musicImage sd_setImageWithURL:[NSURL URLWithString:[musicImage getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"pub_music_placeholder"]];
+    self.musicCoverView.userName.text = [NSString returnNoNullStringWithString:userName];
 }
 
 - (void)chooseAction:(MusicPublishCallback)callback {
@@ -103,6 +122,13 @@
     }
 }
 
+- (IBAction)sureAction:(id)sender {
+    [self endEditing:YES];
+    if (self.callback) {
+        self.callback(PUBLISH_ACTION_PUBLISH);
+    }
+    [self hideAlert];
+}
 
 - (IBAction)cancleAction:(id)sender {
     if (self.callback) {
@@ -111,11 +137,13 @@
     [self hideAlert];
 }
 
-- (void)showAlert {
-    UIWindow *window = [NSObject getKeyWindow];
-    [window addSubview:self];
+- (void)showAlertInView:(UIView *)displayView {
+    if (!displayView) {
+        displayView = [NSObject getKeyWindow];
+    }
+    [displayView addSubview:self];
     [self mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.top.bottom.mas_equalTo(window);
+        make.left.right.top.bottom.mas_equalTo(displayView);
     }];
 }
 
@@ -132,6 +160,30 @@
     }
     return _scrollView;
 }
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    // 获取滚动视图的内容高度
+    CGFloat contentHeight = scrollView.contentSize.height;
+    
+    // 获取滚动视图的可见高度
+    CGFloat visibleHeight = scrollView.bounds.size.height;
+    
+    // 获取当前滚动的偏移量
+    CGFloat yOffset = scrollView.contentOffset.y;
+    
+    // 计算到达底部时的偏移量
+    CGFloat threshold = contentHeight - visibleHeight;
+    
+    // 判断是否滚动到底部
+    if (yOffset >= threshold) {
+        NSLog(@"Scrolled to bottom");
+        // 在此处执行滚动到底部后的操作
+        self.buttonBottomLayer.hidden = YES;
+    }
+    else {
+        self.buttonBottomLayer.hidden = NO;
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/MusicPublistAlert.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" 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="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,7 +17,7 @@
                     <rect key="frame" x="185.66666666666663" y="104.66666666666669" width="316" height="311"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="作品详情" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="te4-O1-RAs">
-                            <rect key="frame" x="125.33333333333334" y="15" width="65.333333333333343" height="22"/>
+                            <rect key="frame" x="126.00000000000004" y="15" width="63.666666666666671" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="9P9-gf-TQs"/>
                             </constraints>
@@ -29,11 +29,33 @@
                             <rect key="frame" x="0.0" y="56" width="316" height="255"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cancle_button" translatesAutoresizingMaskIntoConstraints="NO" id="uSL-RT-oX5">
-                            <rect key="frame" x="287" y="11" width="19" height="19"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="publish_colorLayer" translatesAutoresizingMaskIntoConstraints="NO" id="vn4-XS-h2J">
+                            <rect key="frame" x="0.0" y="237.33333333333329" width="316" height="73.666666666666657"/>
+                        </imageView>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0oK-CV-rll">
+                            <rect key="frame" x="86.000000000000028" y="265" width="144" height="36"/>
+                            <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="144" id="M5f-Qd-bWa"/>
+                                <constraint firstAttribute="height" constant="36" id="gXT-YX-dId"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" title="发布作品"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <integer key="value" value="18"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="sureAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="ipm-pf-Cov"/>
+                            </connections>
+                        </button>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="musc_publish_cancel" translatesAutoresizingMaskIntoConstraints="NO" id="uSL-RT-oX5">
+                            <rect key="frame" x="290" y="19" width="14" height="14"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="19" id="LRY-32-rBI"/>
-                                <constraint firstAttribute="height" constant="19" id="dWq-Go-3Vb"/>
+                                <constraint firstAttribute="width" constant="14" id="LRY-32-rBI"/>
+                                <constraint firstAttribute="height" constant="14" id="dWq-Go-3Vb"/>
                             </constraints>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8mM-Qw-PGH">
@@ -50,16 +72,21 @@
                     </subviews>
                     <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
+                        <constraint firstAttribute="trailing" secondItem="vn4-XS-h2J" secondAttribute="trailing" id="07i-Bm-IfQ"/>
                         <constraint firstAttribute="height" constant="311" id="3bE-RT-gdX"/>
                         <constraint firstAttribute="width" constant="316" id="5Vp-Nm-Phf"/>
                         <constraint firstItem="VSu-Ld-Rbu" firstAttribute="leading" secondItem="crp-Dg-bEh" secondAttribute="leading" id="Ar8-21-yBw"/>
-                        <constraint firstAttribute="trailing" secondItem="uSL-RT-oX5" secondAttribute="trailing" constant="10" id="JvH-Ld-uxt"/>
+                        <constraint firstAttribute="bottom" secondItem="vn4-XS-h2J" secondAttribute="bottom" id="ESX-4d-mqy"/>
+                        <constraint firstAttribute="trailing" secondItem="uSL-RT-oX5" secondAttribute="trailing" constant="12" id="JvH-Ld-uxt"/>
                         <constraint firstItem="8mM-Qw-PGH" firstAttribute="top" secondItem="crp-Dg-bEh" secondAttribute="top" id="P4Y-hH-uUz"/>
                         <constraint firstAttribute="bottom" secondItem="VSu-Ld-Rbu" secondAttribute="bottom" id="Qul-Iw-vdi"/>
+                        <constraint firstAttribute="bottom" secondItem="0oK-CV-rll" secondAttribute="bottom" constant="10" id="ZUh-Th-fdK"/>
+                        <constraint firstItem="vn4-XS-h2J" firstAttribute="leading" secondItem="crp-Dg-bEh" secondAttribute="leading" id="aGo-ZK-gHr"/>
                         <constraint firstItem="te4-O1-RAs" firstAttribute="top" secondItem="crp-Dg-bEh" secondAttribute="top" constant="15" id="ci5-BA-awW"/>
                         <constraint firstAttribute="trailing" secondItem="8mM-Qw-PGH" secondAttribute="trailing" id="ehJ-JA-HqW"/>
+                        <constraint firstItem="0oK-CV-rll" firstAttribute="centerX" secondItem="crp-Dg-bEh" secondAttribute="centerX" id="f9f-9u-rMK"/>
                         <constraint firstItem="VSu-Ld-Rbu" firstAttribute="top" secondItem="te4-O1-RAs" secondAttribute="bottom" constant="19" id="ncm-iM-Is7"/>
-                        <constraint firstItem="uSL-RT-oX5" firstAttribute="top" secondItem="crp-Dg-bEh" secondAttribute="top" constant="11" id="nwL-G4-dhm"/>
+                        <constraint firstItem="uSL-RT-oX5" firstAttribute="top" secondItem="crp-Dg-bEh" secondAttribute="top" constant="19" id="nwL-G4-dhm"/>
                         <constraint firstItem="te4-O1-RAs" firstAttribute="centerX" secondItem="crp-Dg-bEh" secondAttribute="centerX" id="xB7-AF-HP0"/>
                         <constraint firstAttribute="trailing" secondItem="VSu-Ld-Rbu" secondAttribute="trailing" id="z0h-ml-YDQ"/>
                     </constraints>
@@ -79,12 +106,14 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="buttonBottomLayer" destination="vn4-XS-h2J" id="Vu9-60-SW2"/>
                 <outlet property="containerView" destination="VSu-Ld-Rbu" id="IVZ-aq-krM"/>
             </connections>
             <point key="canvasLocation" x="121.37404580152672" y="-23.239436619718312"/>
         </view>
     </objects>
     <resources>
-        <image name="cancle_button" width="20" height="20"/>
+        <image name="musc_publish_cancel" width="14" height="14"/>
+        <image name="publish_colorLayer" width="316" height="73.666664123535156"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/VideoCoverChooseView.m

@@ -6,8 +6,10 @@
 //
 
 #import "VideoCoverChooseView.h"
+#import "UIView+KSLayer.h"
 
 @interface VideoCoverChooseView ()
+
 @property (weak, nonatomic) IBOutlet UIView *layerView;
 
 @property (nonatomic, copy) VideoCoverChooseCallback callback;
@@ -20,6 +22,7 @@
     CAGradientLayer *viewLayer = [UIView createGradientLayerFromColor:HexRGB(0x80B1C8) startPoint:CGPointMake(0, 0.5) endColor:HexRGB(0x3A98A2) endPoint:CGPointMake(0.5, 1) bounds:CGRectMake(0, 0, 248, 30)];
     [self.layerView.layer addSublayer:viewLayer];
 }
+
 + (instancetype)shareInstance {
     VideoCoverChooseView *view = [[[NSBundle mainBundle] loadNibNamed:@"VideoCoverChooseView" owner:nil options:nil] firstObject];
     return view;
@@ -45,7 +48,7 @@
 
 
 + (CGFloat)getViewHeight {
-    return 163.0f;
+    return 172.0f;
 }
 /*
 // Only override drawRect: if you perform custom drawing.

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Works/View/VideoCoverChooseView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" 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="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,17 +11,17 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="VideoCoverChooseView">
-            <rect key="frame" x="0.0" y="0.0" width="316" height="163"/>
+            <rect key="frame" x="0.0" y="0.0" width="316" height="172"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rod-ju-kqd">
-                    <rect key="frame" x="13" y="0.0" width="290" height="136"/>
+                    <rect key="frame" x="12" y="0.0" width="292" height="163"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="videoMerge_cover" translatesAutoresizingMaskIntoConstraints="NO" id="Yfw-f3-ca2">
-                            <rect key="frame" x="0.0" y="0.0" width="290" height="136"/>
+                            <rect key="frame" x="0.0" y="0.0" width="292" height="163"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="290" id="Y3x-VJ-rHI"/>
-                                <constraint firstAttribute="height" constant="136" id="lI1-dt-PmD"/>
+                                <constraint firstAttribute="height" constant="163" id="45m-PE-reM"/>
+                                <constraint firstAttribute="width" constant="292" id="8U0-4o-sSv"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -33,15 +33,15 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="Yfw-f3-ca2" secondAttribute="trailing" id="2ZX-mF-kFV"/>
-                        <constraint firstAttribute="height" constant="136" id="C6o-HO-W1z"/>
+                        <constraint firstAttribute="height" constant="163" id="C6o-HO-W1z"/>
                         <constraint firstAttribute="bottom" secondItem="Yfw-f3-ca2" secondAttribute="bottom" id="GsL-sh-WZO"/>
                         <constraint firstItem="Yfw-f3-ca2" firstAttribute="leading" secondItem="Rod-ju-kqd" secondAttribute="leading" id="I70-AY-OHA"/>
                         <constraint firstItem="Yfw-f3-ca2" firstAttribute="top" secondItem="Rod-ju-kqd" secondAttribute="top" id="WVR-yM-gfe"/>
                     </constraints>
                 </view>
                 <view alpha="0.58999999999999997" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Eoj-tF-ifL">
-                    <rect key="frame" x="34" y="121" width="248" height="30"/>
-                    <color key="backgroundColor" red="0.50196078431372548" green="0.61960784313725492" blue="0.78431372549019607" alpha="1" colorSpace="calibratedRGB"/>
+                    <rect key="frame" x="34" y="123" width="248" height="30"/>
+                    <color key="backgroundColor" red="0.50196078431372548" green="0.69411764705882351" blue="0.78431372549019607" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="7rL-iS-MKS"/>
                         <constraint firstAttribute="width" constant="248" id="hHH-4o-745"/>
@@ -53,7 +53,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TOX-dY-1lt">
-                    <rect key="frame" x="34" y="121" width="248" height="30"/>
+                    <rect key="frame" x="34" y="123" width="248" height="30"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sPz-fl-Upn">
                             <rect key="frame" x="0.0" y="0.0" width="123" height="30"/>
@@ -66,7 +66,7 @@
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="相册获取封面" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wD9-9N-1Ea">
-                                    <rect key="frame" x="35" y="7.6666666666666572" width="74" height="15"/>
+                                    <rect key="frame" x="35.000000000000007" y="7.6666666666666572" width="71.666666666666686" height="15"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
@@ -99,7 +99,7 @@
                                     <rect key="frame" x="16" y="7" width="16" height="16"/>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="视频截取封面" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oaL-43-caz">
-                                    <rect key="frame" x="36.000000000000007" y="7.6666666666666572" width="73.666666666666686" height="15"/>
+                                    <rect key="frame" x="36.000000000000007" y="7.6666666666666572" width="71.666666666666686" height="15"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
@@ -152,13 +152,13 @@
             <constraints>
                 <constraint firstItem="Eoj-tF-ifL" firstAttribute="trailing" secondItem="TOX-dY-1lt" secondAttribute="trailing" id="0LO-uR-sgt"/>
                 <constraint firstItem="Eoj-tF-ifL" firstAttribute="bottom" secondItem="TOX-dY-1lt" secondAttribute="bottom" id="1sv-yO-kGe"/>
-                <constraint firstItem="Rod-ju-kqd" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="J0h-Tv-qF6"/>
+                <constraint firstItem="Rod-ju-kqd" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="J0h-Tv-qF6"/>
                 <constraint firstItem="Eoj-tF-ifL" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="U1o-fC-wzj"/>
                 <constraint firstItem="Eoj-tF-ifL" firstAttribute="leading" secondItem="TOX-dY-1lt" secondAttribute="leading" id="aJA-3E-8js"/>
                 <constraint firstItem="Eoj-tF-ifL" firstAttribute="top" secondItem="TOX-dY-1lt" secondAttribute="top" id="aVH-Me-QLU"/>
                 <constraint firstItem="Rod-ju-kqd" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="plL-e8-8KF"/>
-                <constraint firstAttribute="trailing" secondItem="Rod-ju-kqd" secondAttribute="trailing" constant="13" id="rTU-2d-xDG"/>
-                <constraint firstItem="Eoj-tF-ifL" firstAttribute="centerY" secondItem="Rod-ju-kqd" secondAttribute="bottom" id="uG3-w7-Tgg"/>
+                <constraint firstAttribute="trailing" secondItem="Rod-ju-kqd" secondAttribute="trailing" constant="12" id="rTU-2d-xDG"/>
+                <constraint firstItem="Eoj-tF-ifL" firstAttribute="bottom" secondItem="Rod-ju-kqd" secondAttribute="bottom" constant="-10" id="uG3-w7-Tgg"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
@@ -167,13 +167,13 @@
                 <outlet property="coverImage" destination="Yfw-f3-ca2" id="Ejy-W6-GpP"/>
                 <outlet property="layerView" destination="Eoj-tF-ifL" id="qsd-FK-3bg"/>
             </connections>
-            <point key="canvasLocation" x="58.015267175572518" y="-171.83098591549296"/>
+            <point key="canvasLocation" x="58.015267175572518" y="-165.14084507042256"/>
         </view>
     </objects>
     <resources>
         <image name="cover_choose_image" width="16" height="16"/>
         <image name="cover_crop_image" width="16" height="16"/>
-        <image name="videoMerge_cover" width="291" height="136"/>
+        <image name="videoMerge_cover" width="292" height="164"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/TXClassRoom/View/NewWhiteboard/KSNewWhiteBoard.m

@@ -382,8 +382,9 @@
     [_myWebView loadHTMLString:@"" baseURL:nil];
     [_myWebView removeFromSuperview];
     _myWebView = nil;
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-    [[NSURLCache sharedURLCache] setDiskCapacity:0];
+    [self clearWebCache];
+//    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+//    [[NSURLCache sharedURLCache] setDiskCapacity:0];
     [[NSURLCache sharedURLCache] setMemoryCapacity:0];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     _refreshButton = nil;
@@ -392,6 +393,19 @@
     }
 }
 
+- (void)clearWebCache {
+    NSSet *websiteDataTypes = [NSSet setWithArray:@[
+        WKWebsiteDataTypeMemoryCache,
+    ]];
+
+    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes
+                                               modifiedSince:dateFrom
+                                           completionHandler:^{
+        NSLog(@"Caches cleared");
+    }];
+}
+
 #pragma mark ------- 曲库下载或者相册选择
 - (void)uploadImage {
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:IS_IPAD ? UIAlertControllerStyleAlert : UIAlertControllerStyleActionSheet];
@@ -783,8 +797,9 @@
     [_myWebView removeFromSuperview];
     
     _myWebView = nil;
-    [[NSURLCache sharedURLCache] removeAllCachedResponses];
-    [[NSURLCache sharedURLCache] setDiskCapacity:0];
+    [self clearWebCache];
+//    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+//    [[NSURLCache sharedURLCache] setDiskCapacity:0];
     [[NSURLCache sharedURLCache] setMemoryCapacity:0];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [_refreshButton removeFromSuperview];