Browse Source

退出重制选择节拍器记录

Steven 10 months ago
parent
commit
6107d4b172

+ 4 - 4
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -374,7 +374,6 @@
 		BC3300182BBAB623003D4921 /* CoursewareDownloadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3300122BBAB623003D4921 /* CoursewareDownloadManager.m */; };
 		BC3300192BBAB623003D4921 /* KnowledgePointListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3300142BBAB623003D4921 /* KnowledgePointListModel.m */; };
 		BC33001A2BBAB623003D4921 /* MaterialList.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3300162BBAB623003D4921 /* MaterialList.m */; };
-		BC3332172BCFDFFC004093C4 /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3332162BCFDFFB004093C4 /* KSToolLibrary.framework */; };
 		BC36A5082AB406A5002FEFB1 /* GroupOwnerTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC36A5072AB406A5002FEFB1 /* GroupOwnerTagView.m */; };
 		BC36A50A2AB406AB002FEFB1 /* GroupOwnerTagView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC36A5092AB406AB002FEFB1 /* GroupOwnerTagView.xib */; };
 		BC38C3E82AF893B400ABFCC2 /* KSPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC38C3D52AF893B300ABFCC2 /* KSPlayerView.m */; };
@@ -429,6 +428,7 @@
 		BC42CAA52BEC8272001F076E /* RhythmChooseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC42CAA02BEC8271001F076E /* RhythmChooseView.xib */; };
 		BC42CAA62BEC8272001F076E /* RhythmChooseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC42CAA12BEC8272001F076E /* RhythmChooseView.m */; };
 		BC42CAA72BEC8272001F076E /* RhythmView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC42CAA22BEC8272001F076E /* RhythmView.m */; };
+		BC42CACF2BEF622F001F076E /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC42CACE2BEF622F001F076E /* KSToolLibrary.framework */; };
 		BC43CAC92A88C9570011EB5D /* KSTXGroupChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC43CAC52A88C9570011EB5D /* KSTXGroupChatViewController.m */; };
 		BC43CACA2A88C9570011EB5D /* KSTXC2CChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC43CAC62A88C9570011EB5D /* KSTXC2CChatViewController.m */; };
 		BC43CACB2A88C9570011EB5D /* KSTXBaseChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC43CAC72A88C9570011EB5D /* KSTXBaseChatViewController.m */; };
@@ -1654,7 +1654,6 @@
 		BC3300142BBAB623003D4921 /* KnowledgePointListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KnowledgePointListModel.m; sourceTree = "<group>"; };
 		BC3300152BBAB623003D4921 /* MaterialList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaterialList.h; sourceTree = "<group>"; };
 		BC3300162BBAB623003D4921 /* MaterialList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MaterialList.m; sourceTree = "<group>"; };
-		BC3332162BCFDFFB004093C4 /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BC36A5062AB406A5002FEFB1 /* GroupOwnerTagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupOwnerTagView.h; sourceTree = "<group>"; };
 		BC36A5072AB406A5002FEFB1 /* GroupOwnerTagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroupOwnerTagView.m; sourceTree = "<group>"; };
 		BC36A5092AB406AB002FEFB1 /* GroupOwnerTagView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupOwnerTagView.xib; sourceTree = "<group>"; };
@@ -1742,6 +1741,7 @@
 		BC42CAA12BEC8272001F076E /* RhythmChooseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhythmChooseView.m; sourceTree = "<group>"; };
 		BC42CAA22BEC8272001F076E /* RhythmView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhythmView.m; sourceTree = "<group>"; };
 		BC42CAA32BEC8272001F076E /* RhythmView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhythmView.h; sourceTree = "<group>"; };
+		BC42CACE2BEF622F001F076E /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BC43CAC32A88C9570011EB5D /* KSTXBaseChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSTXBaseChatViewController.h; sourceTree = "<group>"; };
 		BC43CAC42A88C9570011EB5D /* KSTXC2CChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSTXC2CChatViewController.h; sourceTree = "<group>"; };
 		BC43CAC52A88C9570011EB5D /* KSTXGroupChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSTXGroupChatViewController.m; sourceTree = "<group>"; };
@@ -2555,7 +2555,7 @@
 				BCFEE1932AD15C0E000E888F /* SoundpipeAudioKit in Frameworks */,
 				BC3A556D2BAA7B1A002E1616 /* CloudAccompanyLibrary.framework in Frameworks */,
 				BCFEE18D2AD15BD4000E888F /* AudioKitEX in Frameworks */,
-				BC3332172BCFDFFC004093C4 /* KSToolLibrary.framework in Frameworks */,
+				BC42CACF2BEF622F001F076E /* KSToolLibrary.framework in Frameworks */,
 				BC8B6E152856E20800866917 /* WebKit.framework in Frameworks */,
 				BC8A45CB283DDEA100094BBB /* AVFoundation.framework in Frameworks */,
 				BCD9294F28F8FCA4006793E4 /* AudioKit in Frameworks */,
@@ -4635,7 +4635,7 @@
 				BC00A65F2BB58FDB00231B74 /* LLPhotoBrowse.bundle */,
 				BC00A6602BB58FDC00231B74 /* WMPlayer.bundle */,
 				BC3A556A2BAA7B1A002E1616 /* CloudAccompanyLibrary.framework */,
-				BC3332162BCFDFFB004093C4 /* KSToolLibrary.framework */,
+				BC42CACE2BEF622F001F076E /* KSToolLibrary.framework */,
 				BC3A55682BAA7B19002E1616 /* KSTunerLibrary.framework */,
 				BC3BF62F2B9EAFC800831494 /* client.p12 */,
 			);

+ 0 - 1
KulexiuForStudent/KulexiuForStudent/AppDelegate.m

@@ -103,7 +103,6 @@
     // 配置极光推送
     [self configJPUSHWithLaunchOptions:launchOptions];
 
-    
     // 腾讯群相关
    [self configTXIM];
     

+ 1 - 0
KulexiuForStudent/KulexiuForStudent/Module/Widget/Controller/ToneTuningViewController.m

@@ -149,6 +149,7 @@
     BOOL isBack = [self isViewPopDismiss];
     if (isBack) {
         [METRONOME_MANAGER stopPlay];
+        [METRONOME_MANAGER resetDefaultConfig];
         [self removeTuner];
     }
 }

+ 2 - 0
KulexiuForStudent/KulexiuForStudent/Module/Widget/Model/MetronomeManager.h

@@ -63,6 +63,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSString *)imageWithType:(RHYTHM_TYPE)type;
 
+- (void)resetDefaultConfig;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 4 - 0
KulexiuForStudent/KulexiuForStudent/Module/Widget/Model/MetronomeManager.m

@@ -219,4 +219,8 @@
     NSArray *array = @[@"rhythm_quarterNote",@"rhythm_two_eighthNote",@"rhythm_quarter_riplet",@"rhythm_four_sixteenthNote",@"rhythm_quarter_and_eighth_riplet",@"rhythm_dottedEighth_and_sixteenthNote",@"rhythm_eighth_and_two_sixteenthNote"];
     return array[index];
 }
+
+- (void)resetDefaultConfig {
+    [self configDefault];
+}
 @end

+ 5 - 0
KulexiuForStudent/KulexiuForStudent/ToolKit/KSToolLibrary.framework/Headers/NSString+Extension.h

@@ -62,6 +62,11 @@ typedef NS_ENUM(NSInteger,CHECKTYPE){
 
 + (NSString *)stringReplaceFromString:(NSString *)string;
 
+
++ (NSString *)getDeviceVersion; // 获取手机硬件版本
+
++ (NSString *)getSystemVersion; // 获取系统版本
+
 @end
 
 

BIN
KulexiuForStudent/KulexiuForStudent/ToolKit/KSToolLibrary.framework/KSToolLibrary