Steven 1 year ago
parent
commit
10f20f2927

+ 3 - 3
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSAccompanyWebViewController.m

@@ -181,11 +181,11 @@
 - (void)prepareMusic {
 
      self.dingPlayer.isMute = YES;
-     [self.dingPlayer startPlay];
+     [self.dingPlayer startPlayNoSeek];
      self.dongPlayer.isMute = YES;
-     [self.dongPlayer startPlay];
+     [self.dongPlayer startPlayNoSeek];
      self.musicPlayer.isMute = YES;
-     [self.musicPlayer startPlay];
+     [self.musicPlayer startPlayNoSeek];
      dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
           [self.musicPlayer puasePlay];
           self.musicPlayer.isMute = NO;

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/MediaMerge/MusicPlayer/kSNewPlayer.m

@@ -127,8 +127,8 @@
             self.player.rate = rate;
         }
     }
-    
 }
+
 - (void)startPlay {
     if (_isPlaying) {
         [_player pause];

+ 6 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Widget/Controller/ToneTuningViewController.m

@@ -475,11 +475,11 @@ static float correctTime = 0.5;
 - (NSArray *)instrumentArray {
     if (!_instrumentArray) {
         _instrumentArray = @[@"没有移调",
-                             /*@"葫芦丝:C调",@"葫芦丝:D调",@"葫芦丝:降B调",@"葫芦丝:F调",@"葫芦丝:G调",
+                             @"葫芦丝:C调",@"葫芦丝:D调",@"葫芦丝:降B调",@"葫芦丝:F调",@"葫芦丝:G调",
                              @"排箫:C调",@"排箫:D调",@"排箫:E调",@"排箫:F调",@"排箫:G调",
                              @"竖笛:C调",@"竖笛:中音F调",
                              @"口风琴:C调",
-                             @"陶笛:SC调",@"陶笛:AC调",@"陶笛:AG调",@"陶笛:AF调",@"陶笛:BC调",*/
+                             @"陶笛:SC调",@"陶笛:AC调",@"陶笛:AG调",@"陶笛:AF调",@"陶笛:BC调",
                              @"长笛:C调",@"高音萨克斯:降B调",@"中音萨克斯:降E调",@"单簧管:降B调",@"双簧管:C调",@"小号:降B调",@"长号:C调",@"圆号:F调",@"大号:降B调",@"上低音号:C调",@"上低音号:降B调"];
     }
     return _instrumentArray;
@@ -489,11 +489,11 @@ static float correctTime = 0.5;
 - (NSArray *)picthRateArray {
     if (!_picthRateArray) {
         _picthRateArray = @[@0,
-                            /*@-12,@-2,@-11,@-5,@-7,
+                            @-12,@-2,@-11,@-5,@-7,
                             @-12,@-14,@-16,@-17,@-19,
                             @-12,@-5,
                             @0,
-                            @-24,@-12,@-7,@-12,@0,*/
+                            @-24,@-12,@-7,@-12,@0,
                             @0,@-10,@-3,@-10,@0,@-10,@0,@-5,@-10,@0,@-10];
     }
     return _picthRateArray;
@@ -502,11 +502,11 @@ static float correctTime = 0.5;
 - (NSArray *)picthDescArray {
     if (!_picthDescArray) {
         _picthDescArray = @[@"C ins.",
-                            /*@"C ins.",@"D ins.",@"B♭ ins.",@"F ins.",@"G ins.",
+                            @"C ins.",@"D ins.",@"B♭ ins.",@"F ins.",@"G ins.",
                             @"C ins.",@"D ins.",@"E ins.",@"F ins.",@"G ins.",
                             @"C ins.",@"F ins.",
                             @"C ins.",
-                            @"C ins.",@"C ins.",@"G ins.",@"F ins.",@"C ins.",*/
+                            @"C ins.",@"C ins.",@"G ins.",@"F ins.",@"C ins.",
                             @"C ins.",@"B♭ ins.",@"E♭ ins.",@"B♭ ins.",@"C ins.",@"B♭ ins.",@"C ins.",@"F ins.",@"B♭ ins.",@"C ins.",@"B♭ ins."];
     }
     return _picthDescArray;