版本发布1.4.5

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -7007,8 +7007,8 @@
 		BCC9F40127F69BD200647449 /* RTC */ = {
 			isa = PBXGroup;
 			children = (
-				BCC9F40227F69BD200647449 /* RTCService.m */,
 				BCC9F40327F69BD200647449 /* RTCService.h */,
+				BCC9F40227F69BD200647449 /* RTCService.m */,
 			);
 			path = RTC;
 			sourceTree = "<group>";
@@ -8556,7 +8556,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.4.3;
+				CURRENT_PROJECT_VERSION = 1.4.4;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8602,7 +8602,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.4.3;
+				MARKETING_VERSION = 1.4.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -8622,7 +8622,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.4.3;
+				CURRENT_PROJECT_VERSION = 1.4.4;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8668,7 +8668,7 @@
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/KulexiuForTeacher/Common/ThirdPart/UMSocialSDK/share/share_ios_6.10.4/UMSocialSDKPlugin",
 				);
-				MARKETING_VERSION = 1.4.3;
+				MARKETING_VERSION = 1.4.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Colexiu.KulexiuForTeacher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

KulexiuForTeacher/KulexiuForTeacher/Common/Base/AccompanyLoadingView.m

@@ -10,6 +10,12 @@
 
 
 @interface AccompanyLoadingView ()
+{
+    NSTimer *_timer;
+    NSInteger _timeCount;
+    CGFloat _count;
+}
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *loadWidth;
 
 @property (weak, nonatomic) IBOutlet UIView *loadContainer;
 
@@ -41,6 +47,8 @@
 
 - (void)showLoading {
     self.layer.opacity = 1.0f;
+    [self resetTimeCount];
+    [self startTimer];
     if (self.animationView.isAnimationPlaying) {
         return;
     }
@@ -54,17 +62,24 @@
 }
 
 - (void)stopLoading {
-    if (self.animationView.isAnimationPlaying) {
-        [self.animationView stop];
-    }
-    [UIView animateWithDuration:1.0f animations:^{
-        self.layer.opacity = 0.0f;
+    [UIView animateWithDuration:0.3 animations:^{
+        self.loadWidth.constant = 300.0f;
     } completion:^(BOOL finished) {
-        [self removeFromSuperview];
+        [self stopTimer];
+        if (self.animationView.isAnimationPlaying) {
+            [self.animationView stop];
+        }
+        [UIView animateWithDuration:1.0f animations:^{
+            self.layer.opacity = 0.0f;
+        } completion:^(BOOL finished) {
+            [self resetTimeCount];
+            [self removeFromSuperview];
+        }];
     }];
 }
 
 - (IBAction)cancleAction:(id)sender {
+    [self stopTimer];
     if (self.animationView.isAnimationPlaying) {
         [self.animationView stop];
     }
@@ -83,6 +98,57 @@
     }
     return _animationView;
 }
+
+- (void)resetTimeCount {
+    _timeCount = 0;
+    _count = 0;
+    self.loadWidth.constant = 0.0f;
+}
+
+- (void)startTimer {
+    _timer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(loadingAction) userInfo:nil repeats:YES];
+    [[NSRunLoop mainRunLoop] addTimer:_timer forMode:NSRunLoopCommonModes];
+}
+
+- (void)stopTimer {
+    if (_timer) {
+        [_timer invalidate];
+        _timer = nil;
+    }
+}
+
+- (void)loadingAction {
+    _timeCount++;
+    if (_count >= 99.9) {
+        return;
+    }
+    if (_timeCount <= 10) {
+        _count +=5;
+    }
+    else if (10 < _timeCount && _timeCount <= 30) {
+        _count = _count + 2;
+    }
+    else if ( 30 < _timeCount && _timeCount <= 60) {
+        _count = _count + 0.3;
+    }
+    else if (60 < _timeCount && _timeCount <= 120) {
+        _count = _count + 0.01;
+    }
+    else {
+        _count = _count + 0.002;
+    }
+    [UIView animateWithDuration:0.1f animations:^{
+        self.loadWidth.constant = 300.0f * self->_count / 100;
+    }];
+}
+
+- (void)dealloc {
+    if (_timer) {
+        [_timer invalidate];
+        _timer = nil;
+    }
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Common/Base/AccompanyLoadingView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -25,7 +25,7 @@
                     </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="Bjn-zM-LJW">
-                    <rect key="frame" x="258" y="293" width="183.5" height="17"/>
+                    <rect key="frame" x="257.5" y="276" width="184" height="17"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
@@ -48,6 +48,42 @@
                         <action selector="cancleAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="dvV-tf-Ggg"/>
                     </connections>
                 </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ppE-Yx-0QI">
+                    <rect key="frame" x="199.5" y="308" width="300" height="12"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b8q-89-oSh">
+                            <rect key="frame" x="0.0" y="0.0" width="0.0" height="12"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="width" id="ikU-UU-nkd"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="6"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="b8q-89-oSh" secondAttribute="bottom" id="3cD-8n-2eD"/>
+                        <constraint firstItem="b8q-89-oSh" firstAttribute="top" secondItem="ppE-Yx-0QI" secondAttribute="top" id="8Oo-da-H3u"/>
+                        <constraint firstAttribute="width" constant="300" id="A08-6W-XJ9"/>
+                        <constraint firstItem="b8q-89-oSh" firstAttribute="leading" secondItem="ppE-Yx-0QI" secondAttribute="leading" id="EFd-q6-f3W"/>
+                        <constraint firstAttribute="height" constant="12" id="mO8-Zr-x5x"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="6"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                            <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                            <real key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
@@ -55,20 +91,23 @@
                 <constraint firstAttribute="trailing" secondItem="ZV3-qJ-uxE" secondAttribute="trailing" id="QY7-u1-n6M"/>
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" constant="-20" id="QuP-sd-KI7"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="centerY" secondItem="ncV-eS-8Yx" secondAttribute="centerY" id="TSR-47-coa"/>
-                <constraint firstAttribute="bottom" secondItem="Bjn-zM-LJW" secondAttribute="bottom" constant="30" id="YAP-rE-Kfk"/>
+                <constraint firstItem="ppE-Yx-0QI" firstAttribute="top" secondItem="Bjn-zM-LJW" secondAttribute="bottom" constant="15" id="VVr-Rx-bmf"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Z4M-rM-8kS"/>
                 <constraint firstItem="ZV3-qJ-uxE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="beT-6f-OTP"/>
                 <constraint firstAttribute="bottom" secondItem="ZV3-qJ-uxE" secondAttribute="bottom" id="hv4-uE-orY"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="22" id="ioX-pe-BBS"/>
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="jNQ-KE-15G"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="17" id="lw2-0g-sel"/>
+                <constraint firstAttribute="bottom" secondItem="ppE-Yx-0QI" secondAttribute="bottom" constant="20" id="pZZ-RI-WNY"/>
                 <constraint firstItem="Bjn-zM-LJW" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="qjV-MX-C2L"/>
+                <constraint firstItem="ppE-Yx-0QI" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="zAA-jE-2jV"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="loadContainer" destination="Gn9-HQ-HPj" id="Rdq-mO-hMY"/>
+                <outlet property="loadWidth" destination="ikU-UU-nkd" id="2eb-Ni-qnj"/>
             </connections>
             <point key="canvasLocation" x="338.40579710144931" y="-19.419642857142858"/>
         </view>

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSAccompanyWebViewController.m

@@ -100,6 +100,11 @@
     [self handerAudioInterruption];
 }
 
+- (void)ignorRecordVideo {
+    if (_videoRecordManager) {
+        self.videoRecordManager.skipSaveRecord = YES;
+    }
+}
 - (void)stopSession {
     if (_videoRecordManager) {
         [self.videoRecordManager stopSession];
@@ -286,6 +291,8 @@
         [self.socketManager SRWebSocketClose];
         _socketManager = nil;
     }
+    // 返回不保存视频
+    [self ignorRecordVideo];
     [self stopSession];
     
     // 如果退出评测页面 清除 playerEngine
@@ -396,6 +403,8 @@
                 [self postMessage:parm];
             }
             else if ([[parm stringValueForKey:@"api"] isEqualToString:@"startCapture"]) { // 开始录制
+                // 需要合成音频
+                [self.videoRecordManager setIgnoreAudio:YES];
                 [RecordCheckManager checkPhotoLibraryPremissionAvaiable:YES showInView:self.view];
                 self.videoRecordManager.audioUrl = self.AQManager.audioUrl;
                 [self.videoRecordManager startRecord];
@@ -668,6 +677,28 @@
                     [self stopTuner];
                 }
             }
+            else if ([[parm stringValueForKey:@"api"] isEqualToString:@"cloudAccompanyMessage"]) { // 获取伴奏
+                NSDictionary *content = [parm dictionaryValueForKey:@"content"];
+                NSString *accompanyUrl = [content stringValueForKey:@"accompanyUrl"];
+                if (![NSString isEmptyString:accompanyUrl]) {
+                    NSString *fileName = [[accompanyUrl componentsSeparatedByString:@"/"] lastObject];
+                    NSString *filePath = [self getAccompanyFilePathWithName:fileName];
+                    NSURL *fileUrl = [[NSURL alloc] initFileURLWithPath:filePath];
+                    if ([self checkSongHasSaveAccompanyWithSongUrl:accompanyUrl]) {
+                        [self configVideoRecord:fileUrl];
+                    }
+                    else {
+                        MJWeakSelf;
+                        [self downloadUrl:accompanyUrl success:^{
+                            [weakSelf configVideoRecord:fileUrl];
+                        } faliure:nil];
+                    }
+                }
+                else {
+                    [self MBShowInWindow:@"当前曲目无mp3伴奏"];
+                    [self configVideoRecord:nil];
+                }
+            }
             else {
                 [super handleScriptMessageSource:parm];
             }
@@ -675,7 +706,26 @@
         });
     }
 }
-    
+
+- (void)downloadUrl:(NSString *)url success:(void(^)(void))success faliure:(void(^)(void))faliure {
+//    [self showhud];
+    [KSNetworkingManager downloadFileRequestWithFileUrl:url progress:^(int64_t bytesRead, int64_t totalBytes) {
+        
+    } success:^(NSURL * _Nonnull fileUrl) {
+//        [self removehub];
+        if ([self saveAccompanyFileWithUrl:fileUrl accompanyUrl:url]) {
+            success();
+        }
+        
+    } faliure:^(NSError * _Nonnull error) {
+        faliure();
+    }];
+}
+
+- (void)configVideoRecord:(NSURL *)path {
+    self.videoRecordManager.bgAudioUrl = path;
+}
+
 
 - (void)showBeatViewRepeatCount:(NSInteger)repeatCount supplement:(NSInteger)supplement {
     KSCloudBeatView *beatView = [KSCloudBeatView shareInstanceWithBeatType:self.beatType speed:self.currentSpeed repeatCount:repeatCount supplement:supplement];
@@ -1171,8 +1221,43 @@
         [self postMessage:parm];
     }
     NSLog(@"-------- %@%zd --- distance :%f frequence : %f" , output.pitch, output.octave, output.distance, output.frequency);
+}
+
+#pragma mark ---- 保存伴奏
+- (BOOL)saveAccompanyFileWithUrl:(NSURL *)fileUrl accompanyUrl:(NSString *)accompanyUrl {
+    NSData *sourceData = [NSData dataWithContentsOfURL:fileUrl];
+    NSString *cachePath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
+    NSString *filePath= [cachePath stringByAppendingPathComponent:@"AccompanySong"];
+    // 先创建子目录
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if (![fileManager fileExistsAtPath:filePath]) {
+        [fileManager createDirectoryAtPath:filePath withIntermediateDirectories:YES attributes:nil error:nil];
+    }else{
+        NSLog(@"已创建文件夹");
+    }
+    NSString *fileName = [[accompanyUrl componentsSeparatedByString:@"/"] lastObject];
+    NSString *tempPath = [filePath stringByAppendingPathComponent:fileName];
+    BOOL success = [sourceData writeToFile:tempPath atomically:NO];
+    return success;
+}
+- (NSString *)getAccompanyFilePathWithName:(NSString *)fileName {
+    NSString *cachePath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
+    NSString *filePath= [cachePath stringByAppendingPathComponent:@"AccompanySong"];
+    return [filePath stringByAppendingPathComponent:fileName];;
+}
+
+- (BOOL)checkSongHasSaveAccompanyWithSongUrl:(NSString *)songUrl {
+    BOOL hasSaveFile = NO;
+    NSString *fileName = [[songUrl componentsSeparatedByString:@"/"] lastObject];
+    NSString *filePath = [self getAccompanyFilePathWithName:fileName];
     
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if ([fileManager fileExistsAtPath:filePath]) {
+        hasSaveFile = YES;
+    }
+    return hasSaveFile;
 }
+
 /*
 #pragma mark - Navigation
 

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h

@@ -1313,7 +1313,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)courseCoursewareRequest:(NSString *)post status:(NSString *)status searchKey:(NSString *)searchKey page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)courseCoursewareRequest:(NSString *)post status:(NSInteger)status searchKey:(NSString *)searchKey page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 // /api-teacher/courseCourseware/remove
 

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -2421,11 +2421,11 @@
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)courseCoursewareRequest:(NSString *)post status:(NSString *)status searchKey:(NSString *)searchKey page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)courseCoursewareRequest:(NSString *)post status:(NSInteger)status searchKey:(NSString *)searchKey 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/courseCourseware/page"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
-    [parm setValue:status forKey:@"status"];
+    [parm setValue:@(status) forKey:@"status"];
     [parm setValue:searchKey forKey:@"idAndName"];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
@@ -2440,8 +2440,8 @@
 /// @param success 成功
 /// @param faliure 失败
 + (void)courseCoursewareRemoveRequest:(NSString *)post ids:(NSString *)ids success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
-    [self configRequestMethodJSON];
-    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/courseCourseware/page"];
+    [self configRequestMethodForm];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-teacher/courseCourseware/remove"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:ids forKey:@"ids"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSVideoRecordManager.h

@@ -14,11 +14,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface KSVideoRecordManager : NSObject
 
+@property (nonatomic, strong) NSURL *bgAudioUrl;
 
 @property (nonatomic, strong) NSURL *audioUrl;
 
 @property (nonatomic, assign) BOOL ignoreAudio;
 
+@property (nonatomic, assign) BOOL skipSaveRecord;
+
 - (instancetype)initSessionRecordCallback:(KSVideoRecordCallback)callback;
 
 - (void)configSessiondisplayInView:(UIView *)containerView;

KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSVideoRecordManager.m

@@ -269,13 +269,16 @@
     [self.captureSession stopRunning];
     // 暂时存储文件地址
     self.videoFileURL = outputFileURL;
-   // 保存文件
-    if (_ignoreAudio == NO) {
-        [self saveVideoToAsset:self.videoFileURL];
-    }
-    else {
-        [self addBackgroundMuisc:self.audioUrl];
+    // 保存文件
+    if (self.skipSaveRecord == NO) {
+        if (_ignoreAudio == NO) {
+            [self saveVideoToAsset:self.videoFileURL];
+        }
+        else {
+            [self addBackgroundMuisc:self.audioUrl];
+        }
     }
+    self.skipSaveRecord = NO;
 }
 
 // 生成文件 合并音轨
@@ -287,7 +290,7 @@
     float audioDurationSeconds = CMTimeGetSeconds(audioDuration);
     
     NSLog(@"%f",audioDurationSeconds);
-    [KSVideoEditor addBackgroundMiusicWithVideoUrlStr:self.videoFileURL audioUrl:audioUrl start:0 end:audioDurationSeconds isOriginalSound:NO oriVolume:0 newVolume:100 completion:^(NSString * _Nonnull outPath, BOOL isSuccess) {
+    [KSVideoEditor addBackgroundMiusicWithVideoUrlStr:self.videoFileURL audioUrl:audioUrl bgAudioUrl:self.bgAudioUrl start:0 end:audioDurationSeconds isOriginalSound:NO oriVolume:0 newVolume:100 completion:^(NSString * _Nonnull outPath, BOOL isSuccess) {
         if (isSuccess) {
             [self saveVideoToAsset:[NSURL fileURLWithPath:outPath]];
         }

KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch

@@ -136,13 +136,13 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/teacher")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (YES)
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/teacher")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (YES)
 
 // 预生产环境
 //#define hostURL (@"https://ponline.colexiu.com")
@@ -155,13 +155,13 @@ shouldPrevent = NO; \
 
 //#else
 
-//#define hostURL (@"https://online.colexiu.com")
-//#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://online.colexiu.com/teacher")
-//#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"e5t4ouvpe42pa")
-//#define SUBMIT_UUID (YES)
+#define hostURL (@"https://online.colexiu.com")
+#define SEALCLASSHOST (@"https://online.colexiu.com/api-classroom")
+#define WEBHOST (@"https://online.colexiu.com/teacher")
+#define SOCKET_URL (@"wss://online.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"e5t4ouvpe42pa")
+#define SUBMIT_UUID (YES)
 
 
 //#endif

KulexiuForTeacher/KulexiuForTeacher/Common/Tools/Extension/NSDate+Extension.h

@@ -235,4 +235,8 @@
 
 // get current timestamp sice 1970
 + (NSString *)getCurrentTimestamp;
+
+// get current timestamp sice 1970 base64
++ (NSString *)getCurrentTimestampFor64;
+
 @end

KulexiuForTeacher/KulexiuForTeacher/Common/Tools/Extension/NSDate+Extension.m

@@ -704,4 +704,13 @@
     NSString *timestamp = time;
     return timestamp;
 }
+
+// get current timestamp sice 1970 base64
++ (NSString *)getCurrentTimestampFor64 {
+    // 以下这个结果是10位数，interval得出的数会有6位小数，应该是精确到微秒
+    NSTimeInterval interval = [[NSDate date] timeIntervalSince1970] *1000000;
+    NSString *time = [[NSString stringWithFormat:@"%f",interval] replaceAll:@"." WithString:@""];
+    NSString *timestamp = time;
+    return [timestamp ks_base64EncodedString];
+}
 @end

KulexiuForTeacher/KulexiuForTeacher/Common/Tools/KSUploadManager.m

@@ -61,7 +61,16 @@
     [[KS3Client initialize] setBucketDomain:self.uploadBucket];
 }
 
-
+// 上传改造 添加目录 /yyyyMM/dd/文件名
+- (NSString *)getDayFolder {
+    NSDateFormatter *formatter = [NSObject getDateformatter];
+    [formatter setDateFormat:@"yyyyMM"];
+    NSDate *date = [NSDate date];
+    NSString *month = [formatter stringFromDate:date];
+    [formatter setDateFormat:@"dd"];
+    NSString *dayString = [formatter stringFromDate:date];
+    return [NSString stringWithFormat:@"%@/%@/",month, dayString];
+}
 
 - (void)uploadImage:(NSData *)imageData fileName:(NSString *)fileName successCallback:(KSUploadSuccess)success faliure:(KSUploadFailer)faliure {
     if (success) {
@@ -70,7 +79,8 @@
     if (faliure) {
         self.faliureCallback = faliure;
     }
-    NSString *uploadFileName = [NSString stringWithFormat:@"%@-%@%@%@",UserDefault(UIDKey),[NSDate getCurrentTimestamp], fileName,[UIImage typeForImageData:imageData]];
+    NSString *folderString = [self getDayFolder];
+    NSString *uploadFileName = [NSString stringWithFormat:@"%@%@_%@%@%@",folderString,[NSDate getCurrentTimestampFor64], UserDefault(UIDKey), fileName,[UIImage typeForImageData:imageData]];
     NSString *keyValue = uploadFileName;
     [KSNetworkingManager getUploadSignRequest:KS_POST fileName:uploadFileName keyName:keyValue bucketName:self.bucketName success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
@@ -125,10 +135,20 @@
     if (faliure) {
         self.faliureCallback = faliure;
     }
+    
+    NSString *folderString = [self getDayFolder];
+    
     NSMutableArray *fileNameArray = [NSMutableArray array];
-    for (NSInteger i = 0 ; i < fileDataArray.count; i++) {
-        NSData *fileData = fileDataArray[i];
-        NSString *uploadFileName = [NSString stringWithFormat:@"%zd-%@-%@%@%@",i,UserDefault(UIDKey),[NSDate getCurrentTimestamp],fileName,[UIImage typeForImageData:fileData]];
+    if (fileDataArray.count > 1) {
+        for (NSInteger i = 0 ; i < fileDataArray.count; i++) {
+            NSData *fileData = fileDataArray[i];
+            NSString *uploadFileName = [NSString stringWithFormat:@"%@%@_%@%@%zd%@",folderString,[NSDate getCurrentTimestampFor64], UserDefault(UIDKey), fileName,i,[UIImage typeForImageData:fileData]];
+            [fileNameArray addObject:uploadFileName];
+        }
+    }
+    else {
+        NSData *fileData = fileDataArray[0];
+        NSString *uploadFileName = [NSString stringWithFormat:@"%@%@_%@%@%@",folderString,[NSDate getCurrentTimestampFor64], UserDefault(UIDKey), fileName,[UIImage typeForImageData:fileData]];
         [fileNameArray addObject:uploadFileName];
     }
     
@@ -213,7 +233,9 @@
     if (uploadProgress) {
         self.uploadProgress = uploadProgress;
     }
-    NSString *uploadFileName = [NSString stringWithFormat:@"%@-%@%@%@",UserDefault(UIDKey),[NSDate getCurrentTimestamp], fileName,fileSuffix];
+    NSString *folderString = [self getDayFolder];
+    
+    NSString *uploadFileName = [NSString stringWithFormat:@"%@%@_%@%@%@",folderString,[NSDate getCurrentTimestampFor64], UserDefault(UIDKey),fileName,fileSuffix];
     NSString *keyValue = uploadFileName;
     self.videoLinkUrl = [NSString stringWithFormat:@"https://%@/%@",self.receiveBucket,uploadFileName];
     [KSNetworkingManager getUploadSignRequest:KS_POST fileName:uploadFileName keyName:keyValue bucketName:self.bucketName success:^(NSDictionary * _Nonnull dic) {
@@ -260,7 +282,9 @@
     if (faliure) {
         self.faliureCallback = faliure;
     }
-    NSString *uploadFileName = [NSString stringWithFormat:@"%@-%@%@%@",UserDefault(UIDKey),[NSDate getCurrentTimestamp], fileName,fileSuffix];
+    NSString *folderString = [self getDayFolder];
+    
+    NSString *uploadFileName = [NSString stringWithFormat:@"%@%@_%@%@%@",folderString,[NSDate getCurrentTimestampFor64],UserDefault(UIDKey), fileName,fileSuffix];
     NSString *keyValue = uploadFileName;
     [KSNetworkingManager getUploadSignRequest:KS_POST fileName:uploadFileName keyName:keyValue bucketName:self.bucketName success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {

KulexiuForTeacher/KulexiuForTeacher/Common/Tools/VideoEditor/KSVideoEditor.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
  
  @param videoUrl 视频URL
  @param audioUrl 音频URL
+ @param bgAudioUrl 背景Url
  @param startTime 音频插入开始时间
  @param endTime 音频插入结束时间
  @param isOriginal 是否保留原声
@@ -26,6 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)addBackgroundMiusicWithVideoUrlStr:(NSURL *)videoUrl
                                   audioUrl:(NSURL *)audioUrl
+                                bgAudioUrl:(NSURL *)bgAudioUrl
                                      start:(CGFloat)startTime
                                        end:(CGFloat)endTime
                            isOriginalSound:(BOOL)isOriginal

KulexiuForTeacher/KulexiuForTeacher/Common/Tools/VideoEditor/KSVideoEditor.m

@@ -13,6 +13,7 @@
 
 + (void)addBackgroundMiusicWithVideoUrlStr:(NSURL *)videoUrl
                                   audioUrl:(NSURL *)audioUrl
+                                bgAudioUrl:(NSURL *)bgAudioUrl
                                      start:(CGFloat)startTime
                                        end:(CGFloat)endTime
                            isOriginalSound:(BOOL)isOriginal
@@ -20,6 +21,11 @@
                                  newVolume:(float)newVolume
                                 completion:(void (^)(NSString *outPath,BOOL isSuccess))completionHandle
 {
+    // 背景音url
+    NSURL *bgAudio_url = nil;
+    if (bgAudioUrl) {
+        bgAudio_url = bgAudioUrl;
+    }
     //音频来源路径
     NSURL   *audio_inputFileUrl = audioUrl;
     
@@ -55,7 +61,7 @@
     AVMutableAudioMix *audioMix = [AVMutableAudioMix audioMix];
     
     //新添加的音频
-    AVURLAsset* audioAsset =[[AVURLAsset alloc]initWithURL:audio_inputFileUrl options:nil];
+    AVURLAsset* audioAsset = [[AVURLAsset alloc]initWithURL:audio_inputFileUrl options:nil];
     AVMutableCompositionTrack *newAudioTrack = [mixComposition addMutableTrackWithMediaType:AVMediaTypeAudio
                                                                            preferredTrackID:kCMPersistentTrackID_Invalid];
     [newAudioTrack insertTimeRange:audio_timeRange
@@ -67,6 +73,23 @@
 //    [newAudioInputParams setVolumeRampFromStartVolume:newVolume toEndVolume:.0f timeRange:CMTimeRangeMake(kCMTimeZero, videoAsset.duration)];
     [newAudioInputParams setTrackID:newAudioTrack.trackID];
     
+    // 添加背景音URL
+    AVMutableAudioMixInputParameters *bgAudioInputParams = nil;
+    if (bgAudio_url) {
+        
+        AVURLAsset *bgAudioAsset = [[AVURLAsset alloc]initWithURL:bgAudio_url options:nil];
+        AVMutableCompositionTrack *newBgAudioTrack = [mixComposition addMutableTrackWithMediaType:AVMediaTypeAudio
+                                                                               preferredTrackID:kCMPersistentTrackID_Invalid];
+        [newBgAudioTrack insertTimeRange:audio_timeRange
+                               ofTrack:[[bgAudioAsset tracksWithMediaType:AVMediaTypeAudio]objectAtIndex:0]
+                                atTime:start
+                                 error:nil];
+        
+        AVMutableAudioMixInputParameters *bgAudioInputParams = [AVMutableAudioMixInputParameters audioMixInputParametersWithTrack:newBgAudioTrack];
+        [bgAudioInputParams setTrackID:newBgAudioTrack.trackID];
+    }
+    
+    
     //视频文件原始音频通道
     if (isOriginal) {
         //视频声音采集(也可不执行这段代码不采集视频音轨，合并后的视频文件将没有视频原来的声音)
@@ -77,9 +100,16 @@
         AVMutableAudioMixInputParameters *originAudioInputParams = [AVMutableAudioMixInputParameters audioMixInputParametersWithTrack:originVoiceTrack] ;
         [originAudioInputParams setVolumeRampFromStartVolume:oriVolume toEndVolume:.0f timeRange:CMTimeRangeMake(kCMTimeZero, videoAsset.duration)];
         [originAudioInputParams setTrackID:originVoiceTrack.trackID];
-        audioMix.inputParameters = [NSArray arrayWithObjects:newAudioInputParams,originAudioInputParams,nil];
+        if (bgAudioInputParams) {
+            audioMix.inputParameters = [NSArray arrayWithObjects:newAudioInputParams,bgAudioInputParams,originAudioInputParams,nil];
+
+        }
+        else {
+            audioMix.inputParameters = [NSArray arrayWithObjects:newAudioInputParams,originAudioInputParams,nil];
+
+        }
     }else{
-        audioMix.inputParameters = [NSArray arrayWithObject:newAudioInputParams];
+        audioMix.inputParameters = [NSArray arrayWithObjects:newAudioInputParams,bgAudioInputParams,nil];
     }
     
     //创建一个输出

KulexiuForTeacher/KulexiuForTeacher/Module/Classroom/View/CoursewareView/CoursewareAlertView.m

@@ -78,11 +78,11 @@
         make.left.right.top.bottom.mas_equalTo(self.tableContainer);
     }];
     MJWeakSelf;
-    self.tableView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
+    self.tableView.mj_header = [MJRefreshHeader headerWithRefreshingBlock:^{
         [weakSelf.tableView.mj_footer resetNoMoreData];
         [weakSelf searchMusic];
     }];
-    self.tableView.mj_footer = [KSGifRefreshFooter footerWithRefreshingBlock:^{
+    self.tableView.mj_footer = [MJRefreshAutoFooter footerWithRefreshingBlock:^{
         if (weakSelf.isLoadMore) {
             weakSelf.pages += 1;
             [weakSelf requestData];
@@ -91,10 +91,20 @@
             [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
         }
     }];
+//    [KSGifRefreshFooter footerWithRefreshingBlock:^{
+//        if (weakSelf.isLoadMore) {
+//            weakSelf.pages += 1;
+//            [weakSelf requestData];
+//        }
+//        else {
+//            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+//        }
+//    }];
     [self loadFirstData];
 }
 
 - (void)loadFirstData {
+    [self resetParamenter];
     [self requestData];
     self.lastChooseIndex = 0;
 }
@@ -112,7 +122,7 @@
 
 - (void)requestData {
     [LOADING_MANAGER showHUD];
-    [KSNetworkingManager courseCoursewareRequest:KS_POST status:@"1" searchKey:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager courseCoursewareRequest:KS_POST status:1 searchKey:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [LOADING_MANAGER removeHUD];
         [self endRefresh];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {

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

@@ -6,7 +6,6 @@
 //
 
 #import "FreezeListViewController.h"
-#import "MyIncomeListCell.h"
 #import "KSFullDatePicker.h"
 #import "IncomeListModel.h"
 #import "MyIncomeListCell.h"

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Courseware/ViewModel/CoursewareViewModel.m

@@ -33,7 +33,7 @@
 
 - (void)requestData {
     [LOADING_MANAGER showHUD];
-    [KSNetworkingManager courseCoursewareRequest:KS_POST status:@"" searchKey:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager courseCoursewareRequest:KS_POST status:0 searchKey:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [LOADING_MANAGER removeHUD];
         [self endRefresh];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
@@ -86,7 +86,7 @@
     
     for (CoursewareListModel *model in self.sourceArray) {
         if (model.isChoose) {
-            [arrayList addObject:[NSString stringWithFormat:@"%.0f",model.musicSheetId]];
+            [arrayList addObject:[NSString stringWithFormat:@"%@",model.internalBaseClassIdentifier]];
         }
     }
     if (arrayList.count == 0) {

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

@@ -76,8 +76,8 @@
             MJWeakSelf;
             [self KSShowMsg:@"认证成功" promptCompletion:^{
                 [weakSelf backAction];
-                if (self.callback) {
-                    self.callback();
+                if (weakSelf.callback) {
+                    weakSelf.callback();
                 }
             }];
         }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/View/ModifyNameBodyView.h

@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UITextField *nameField;
 
 + (instancetype)shareInstance;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/SealClass/Services/RTC/RTCService.m

@@ -45,7 +45,7 @@
 #pragma mark - 发布/订阅音视频流
 - (void)joinRongRTCRoom:(NSString *)roomId success:(void (^)( RCRTCRoom  * _Nullable room))success error:(void (^)(RCRTCCode code))error {
     [[RCRTCEngine sharedInstance] joinRoom:roomId completion:^(RCRTCRoom * _Nullable room, RCRTCCode code) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
             if(RCRTCCodeSuccess == code) {
                 self.rtcRoom = room;
                 if(success) {
@@ -57,6 +57,18 @@
                 }
             }
         });
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            if(RCRTCCodeSuccess == code) {
+//                self.rtcRoom = room;
+//                if(success) {
+//                    success(room);
+//                }
+//            }else {
+//                if(error) {
+//                    error(code);
+//                }
+//            }
+//        });
     }];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Widget/Controller/ToneTuningViewController.m

@@ -399,7 +399,7 @@ static float correctTime = 0.5;
 
 - (NSArray *)picthDescArray {
     if (!_picthDescArray) {
-        _picthDescArray = @[@"C ins.",@"B♭ ins.",@"E♭ ins.",@"B♭ ins.",@"C ins.",@"C调大调 ins.",@"B♭ ins.",@"C ins.",@"F ins.",@"C ins.",@"B♭ ins."];
+        _picthDescArray = @[@"C ins.",@"B♭ ins.",@"E♭ ins.",@"B♭ ins.",@"C ins.",@"C ins.",@"B♭ ins.",@"C ins.",@"F ins.",@"C ins.",@"B♭ ins."];
     }
     return _picthDescArray;
 }

KulexiuForTeacher/KulexiuForTeacher/Module/Widget/View/toneTuning/TunerSettingView.xib

@@ -20,8 +20,8 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qda-Ej-mIn">
                             <rect key="frame" x="18" y="64.000000000000028" width="235" height="45"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛：C大调" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EOf-Po-cpZ">
-                                    <rect key="frame" x="17" y="12.666666666666627" width="93" height="19.333333333333329"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛：C调" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EOf-Po-cpZ">
+                                    <rect key="frame" x="17" y="12.666666666666627" width="76.666666666666671" height="19.333333333333329"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>