Steven hai 1 ano
pai
achega
de43e12eb0

+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/gadget_bg.imageset/Contents.json

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

BIN=BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/gadget_bg.imageset/gadget_bg@2x.png


BIN=BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/SmallTool/gadget_bg.imageset/gadget_bg@3x.png


+ 9 - 7
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSVideoRecordManager.m

@@ -306,13 +306,15 @@
     }
     NSLog(@"录制结束");
     _isRecording = NO;
-    @weakObj(self);
-    dispatch_async(self.videoRecordQueue, ^{
-        @strongObj(self);
-        if (self.captureSession.running) {
-            [self.captureSession stopRunning];
-        }
-    });
+    if (_isChangeSession == NO) {
+        @weakObj(self);
+        dispatch_async(self.videoRecordQueue, ^{
+            @strongObj(self);
+            if (self.captureSession.running) {
+                [self.captureSession stopRunning];
+            }
+        });
+    }
 
     // 暂时存储文件地址
     self.videoFileURL = outputFileURL;

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -56,7 +56,7 @@
 #import "HomeMusicModel.h"
 
 #import "HomeDragButton.h"
-#import "SmallToolViewController.h"
+#import "ToneTuningViewController.h"
 #import "InstrumentChooseViewController.h"
 
 #import "HomeTenantView.h"
@@ -530,7 +530,7 @@
         HomeMessageModel *model = self.buttonArray[index];
         if (![NSString isEmptyString:model.linkUrl]) {
             if ([model.linkUrl isEqualToString:@"native-metronome"]) {
-                SmallToolViewController *ctrl = [[SmallToolViewController alloc] init];
+                ToneTuningViewController *ctrl = [[ToneTuningViewController alloc] init];
                 [self.navigationController pushViewController:ctrl animated:YES];
             }
             else {