Steven 4 tahun lalu
induk
melakukan
aee21d8b0b

+ 10 - 10
MusicGradeExam/MusicGradeExam/Define/PrefixHeader.pch

@@ -85,11 +85,11 @@
 
 //#ifdef DEBUG
 
-#define hostURL (@"https://test.kj.colexiu.com")
-#define SEALCLASSHOST (@"https://test.kj.colexiu.com/api-im")
-#define WEBHOST (@"https://test.m.kj.colexiu.com")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"mgb7ka1nme0yg")
+//#define hostURL (@"https://test.kj.colexiu.com")
+//#define SEALCLASSHOST (@"https://test.kj.colexiu.com/api-im")
+//#define WEBHOST (@"https://test.m.kj.colexiu.com")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"mgb7ka1nme0yg")
 
 //#define hostURL (@"http://192.168.3.28:8000")
 //#define SEALCLASSHOST (@"http://192.168.3.28:8000/api-im")
@@ -105,11 +105,11 @@
 
 //#else    // 线上
 
-//#define hostURL (@"https://kj.colexiu.com")
-//#define SEALCLASSHOST (@"https://kj.colexiu.com/api-im")
-//#define WEBHOST (@"https://m.kj.colexiu.com")
-//#define JSPUSH_ENVIRONMENT (YES)
-//#define RCIM_KEY (@"8w7jv4qb8zuyy")
+#define hostURL (@"https://kj.colexiu.com")
+#define SEALCLASSHOST (@"https://kj.colexiu.com/api-im")
+#define WEBHOST (@"https://m.kj.colexiu.com")
+#define JSPUSH_ENVIRONMENT (YES)
+#define RCIM_KEY (@"8w7jv4qb8zuyy")
 
 //#endif
 

+ 15 - 0
MusicGradeExam/MusicGradeExam/UI/RecordAction/KSVideoRecordViewController.m

@@ -346,6 +346,21 @@
 }
 
 - (void)nextSongAction {
+    if (self.currentRecordIndex + 1 == self.songMessageArray.count) { // 录制结束
+        // 退出录播 返回数据
+        if (self.isRecording) {
+            if ([self.captureMovieFileOutput isRecording]) {
+                [self.captureMovieFileOutput stopRecording];
+            }
+            self.isQuiting = YES;
+            [MBProgressHUD ksShowHUDWithText:@"录制结束,视频保存中..."];
+        }
+        else {
+            self.callback(VIDEORECORDACTION_BACK, self.videoAssetArray);
+            [self quitRecordExam];
+        }
+        return;
+    }
     self.currentRecordIndex++;
     self.topTipsLabel.text = @"请考生在10秒内就位演奏";
     self.prepareTime = 10;