调音器问题同步修改

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -5366,20 +5366,20 @@
 		BC31BEDE2B21925700F7D538 /* toneTuning */ = {
 			isa = PBXGroup;
 			children = (
-				BC31BEDF2B21925700F7D538 /* TuningNavView.xib */,
-				BC31BEE02B21925700F7D538 /* TunerSettingView.h */,
-				BC31BEE12B21925700F7D538 /* TuningNavView.m */,
-				BC31BEE22B21925700F7D538 /* TuningForkSettingView.xib */,
 				BC31BEE32B21925700F7D538 /* DialPlateView.h */,
-				BC31BEE42B21925700F7D538 /* TuningForkSettingView.h */,
+				BC31BEE92B21925700F7D538 /* DialPlateView.m */,
 				BC31BEE52B21925700F7D538 /* ToneTuningBodyView.h */,
-				BC31BEE62B21925700F7D538 /* TunerSettingView.xib */,
+				BC31BEEB2B21925700F7D538 /* ToneTuningBodyView.m */,
+				BC31BEEC2B21925700F7D538 /* ToneTuningBodyView.xib */,
+				BC31BEE02B21925700F7D538 /* TunerSettingView.h */,
 				BC31BEE72B21925700F7D538 /* TunerSettingView.m */,
+				BC31BEE62B21925700F7D538 /* TunerSettingView.xib */,
+				BC31BEE42B21925700F7D538 /* TuningForkSettingView.h */,
 				BC31BEE82B21925700F7D538 /* TuningForkSettingView.m */,
-				BC31BEE92B21925700F7D538 /* DialPlateView.m */,
+				BC31BEE22B21925700F7D538 /* TuningForkSettingView.xib */,
 				BC31BEEA2B21925700F7D538 /* TuningNavView.h */,
-				BC31BEEB2B21925700F7D538 /* ToneTuningBodyView.m */,
-				BC31BEEC2B21925700F7D538 /* ToneTuningBodyView.xib */,
+				BC31BEE12B21925700F7D538 /* TuningNavView.m */,
+				BC31BEDF2B21925700F7D538 /* TuningNavView.xib */,
 			);
 			path = toneTuning;
 			sourceTree = "<group>";

KulexiuForStudent/KulexiuForStudent/Common/Define/KSDomain.h

@@ -18,31 +18,31 @@
 
 // 开发环境
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/student")
-#define TENANT_WEBHOST (@"https://dev.colexiu.com/tenant")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
-#define JSPUSH_ENVIRONMENT (NO)
-#define RCIM_KEY (@"0vnjpoad0jbdz")
-#define SUBMIT_UUID (NO)
-#define CONFIG_TXSDKAPPID (1400805079)
-#define TXOfflinePushCertificateIDForAPNS (39557)
-
-
-// 测试环境
-
-//#define hostURL (@"https://test.colexiu.com")
-//#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://test.colexiu.com/student")
-//#define TENANT_WEBHOST (@"https://test.colexiu.com/tenant")
-//#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/student")
+//#define TENANT_WEBHOST (@"https://dev.colexiu.com/tenant")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
 //#define JSPUSH_ENVIRONMENT (NO)
 //#define RCIM_KEY (@"0vnjpoad0jbdz")
 //#define SUBMIT_UUID (NO)
 //#define CONFIG_TXSDKAPPID (1400805079)
 //#define TXOfflinePushCertificateIDForAPNS (39557)
 
+
+// 测试环境
+
+#define hostURL (@"https://test.colexiu.com")
+#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
+#define WEBHOST (@"https://test.colexiu.com/student")
+#define TENANT_WEBHOST (@"https://test.colexiu.com/tenant")
+#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
+#define JSPUSH_ENVIRONMENT (NO)
+#define RCIM_KEY (@"0vnjpoad0jbdz")
+#define SUBMIT_UUID (NO)
+#define CONFIG_TXSDKAPPID (1400805079)
+#define TXOfflinePushCertificateIDForAPNS (39557)
+
 // 预生产
 //#define hostURL (@"https://ponline.colexiu.com")
 //#define SEALCLASSHOST (@"https://ponline.colexiu.com/api-classroom")

KulexiuForStudent/KulexiuForStudent/Common/Define/UserKeyHeader.h

@@ -103,6 +103,8 @@
 
 #define TENANT_ID (@"tenantId")
 
+#define DEFALUT_A4FREQUENCE (440)
 
+#define A4_FREQUENCE_INTABLE (440.0)
 
 #endif /* UserKeyHeader_h */

KulexiuForStudent/KulexiuForStudent/Module/Widget/Controller/ToneTuningViewController.m

@@ -19,9 +19,6 @@
 #import "MetronomeManager.h"
 
 
-//  正确后暂停的时间
-static float correctTime = 0.5;
-
 @interface ToneTuningViewController ()<TunerDelegate>
 
 @property (nonatomic, strong) TuningNavView *navView;
@@ -60,12 +57,6 @@ static float correctTime = 0.5;
 // A4 频率
 @property (nonatomic, assign) NSInteger A4Frequence;
 
-/**
- 上次显示正确的时间
- */
-@property(nonatomic, assign) NSTimeInterval lastCorrectTime;
-
-
 
 @end
 
@@ -81,8 +72,8 @@ static float correctTime = 0.5;
 }
 
 - (void)configDefault {
-    self.chooseFrequence = 440;
-    self.A4Frequence = 440;
+    self.chooseFrequence = A4_FREQUENCE_INTABLE;
+    self.A4Frequence = DEFALUT_A4FREQUENCE;
     self.isTransfer = NO;
 }
 
@@ -257,7 +248,7 @@ static float correctTime = 0.5;
         if (self.isTransfer == NO) {
             
             self.bodyView.nomalPitch.text = [NSString stringWithFormat:@"%@%zd",output.pitch, output.octave];
-            self.bodyView.pitchFrequenceLabel.text = [NSString stringWithFormat:@"%@%zd:%.0fHz", output.pitch, output.octave, output.midFrequence / 440 *self.A4Frequence];
+            self.bodyView.pitchFrequenceLabel.text = [NSString stringWithFormat:@"%@%zd:%.0fHz", output.pitch, output.octave, output.midFrequence / A4_FREQUENCE_INTABLE *self.A4Frequence];
             self.bodyView.preFrequence.text = [NSString stringWithFormat:@"%@%zd",output.prePitch, output.preOctave];
             self.bodyView.nextFrequence.text = [NSString stringWithFormat:@"%@%zd",output.nextPitch, output.nextOctave];
         }
@@ -302,7 +293,7 @@ static float correctTime = 0.5;
             self.tuner.A4Frequence = frequence;
             self.forkView.A4Frequence = frequence;
             if (self.bodyView.isPlaying) {
-                CGFloat changefrequence = frequence / 440.0 * self.chooseFrequence;
+                CGFloat changefrequence = frequence / A4_FREQUENCE_INTABLE * self.chooseFrequence;
                 [self.forkManager changeFrequenceWithFrequence:changefrequence];
             }
         }
@@ -347,7 +338,7 @@ static float correctTime = 0.5;
 
 - (void)startForkPlay {
     
-    CGFloat changefrequence = self.A4Frequence / 440.0 * self.chooseFrequence;
+    CGFloat changefrequence = self.A4Frequence / A4_FREQUENCE_INTABLE * self.chooseFrequence;
     [self.forkManager setupWithFrequence:changefrequence];
 }
 
@@ -398,7 +389,7 @@ static float correctTime = 0.5;
             
             weakSelf.chooseFrequence = frequence;
             if (weakSelf.bodyView.isPlaying) {
-                CGFloat changefrequence = frequence / 440.0 * self.A4Frequence;
+                CGFloat changefrequence = frequence / A4_FREQUENCE_INTABLE * self.A4Frequence;
                 [weakSelf.forkManager changeFrequenceWithFrequence:changefrequence];
             }
             else {
@@ -407,7 +398,7 @@ static float correctTime = 0.5;
                 }
                 else {
                     if (weakSelf.forkManager.isPlay) {
-                        CGFloat changefrequence = frequence / 440.0 * self.A4Frequence;
+                        CGFloat changefrequence = frequence / A4_FREQUENCE_INTABLE * self.A4Frequence;
                         [weakSelf.forkManager changeFrequenceWithFrequence:changefrequence];
                     }
                     else {
@@ -466,7 +457,7 @@ static float correctTime = 0.5;
         self.tuner.A4Frequence = frequence;
         self.forkView.A4Frequence = frequence;
         if (self.bodyView.isPlaying) {
-            CGFloat changefrequence = frequence / 440.0 * self.chooseFrequence;
+            CGFloat changefrequence = frequence / A4_FREQUENCE_INTABLE * self.chooseFrequence;
             [self.forkManager changeFrequenceWithFrequence:changefrequence];
         }
     }
@@ -475,11 +466,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 +480,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 +493,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;

KulexiuForStudent/KulexiuForStudent/Module/Widget/Model/TuningFunction/Tuner.swift

@@ -309,7 +309,7 @@ private let frequencies: [Float] = [
         newOutput.nextOctave = (index+2) / 12
         newOutput.nextPitch = String(format: "%@", flats[(index+2) % flats.count],sharps[(index+2) % sharps.count])
         
-        newOutput.midFrequence = frequencies[index+1] / 440 * A4Frequency
+        newOutput.midFrequence = frequencies[index+1-toneChangeRate] / 440 * A4Frequency
         // 移调之后的显示
         newOutput.transferOctave = (index+1) / 12
         newOutput.transferPitch = String(format: "%@", flats[(index+1) % flats.count],sharps[(index+1) % sharps.count])

KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/ToneTuningBodyView.m

@@ -93,7 +93,7 @@
 - (void)setA4Frequence:(NSInteger)A4Frequence {
     _A4Frequence = A4Frequence;
     self.A4FrequenceLabel.text = [NSString stringWithFormat:@"A4=%zdHz",A4Frequence];
-    if (A4Frequence > 440) {
+    if (A4Frequence != DEFALUT_A4FREQUENCE) {
         self.warningImage.hidden = NO;
     }
     else {

KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TunerSettingView.m

@@ -13,6 +13,7 @@
 
 @interface TunerSettingView ()<UIGestureRecognizerDelegate>
 @property (weak, nonatomic) IBOutlet UIView *containerView;
+@property (weak, nonatomic) IBOutlet UIButton *resetButton;
 
 @property (nonatomic, copy) TunerSettingCallback callback;
 
@@ -28,6 +29,7 @@
     UITapGestureRecognizer *tapGes = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGesture:)];
     [self addGestureRecognizer:tapGes];
     tapGes.delegate = self;
+    [self.resetButton setTitle:[NSString stringWithFormat:@"Reset:%dHz",DEFALUT_A4FREQUENCE] forState:UIControlStateNormal];
 }
 
 - (void)tapGesture: (UITapGestureRecognizer *)tapGesture {
@@ -77,7 +79,7 @@
     self.A4Frequence = frequence + 1;
 }
 - (IBAction)resetFrequence:(id)sender {
-    self.A4Frequence = 440;
+    self.A4Frequence = DEFALUT_A4FREQUENCE;
 }
 
 - (IBAction)chooseInstrunemt:(id)sender {

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -236,6 +236,7 @@
                 <outlet property="containerView" destination="zvx-Af-NkA" id="mjX-0T-qrj"/>
                 <outlet property="frequenceLabel" destination="kAP-y9-pDd" id="N3x-Ni-VBp"/>
                 <outlet property="instrumentLabel" destination="EOf-Po-cpZ" id="5ou-au-uyX"/>
+                <outlet property="resetButton" destination="aNk-pq-Ual" id="5by-Ik-d99"/>
             </connections>
             <point key="canvasLocation" x="61.538461538461533" y="-11.374407582938389"/>
         </view>

KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TuningForkSettingView.m

@@ -111,7 +111,7 @@
 }
 
 - (void)configDefaultSource {
-    self.A4Frequence = 440;
+    self.A4Frequence = DEFALUT_A4FREQUENCE;
     self.musicalScale = 4;
     self.isFallingTone = YES;
     self.imageArray = [NSMutableArray arrayWithArray:@[self.pitchCImage,self.pitchDhalfImage,self.pitchDImage,self.pitchEhalfImage,self.pitchEImage,self.pitchFImage,self.pitchGhalfImage,self.pitchGImage,self.pitchAhalfImage,self.pitchAImage,self.pitchBhalfImage,self.pitchBImage]];