浏览代码

picker 问题处理

Steven 1 年之前
父节点
当前提交
cbb2d6ee15

+ 8 - 8
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -449,7 +449,6 @@
 		BC32E109286AB142001434DD /* BaseAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC32E108286AB142001434DD /* BaseAlertView.m */; };
 		BC32E10C286AB31C001434DD /* KSPublicAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC32E10B286AB31C001434DD /* KSPublicAlertView.m */; };
 		BC32E10E286AB326001434DD /* KSPublicAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC32E10D286AB326001434DD /* KSPublicAlertView.xib */; };
-		BC3300042BBA67D8003D4921 /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3300032BBA67D8003D4921 /* KSToolLibrary.framework */; };
 		BC33000E2BBAB5ED003D4921 /* CoursewareDownloadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3300082BBAB5ED003D4921 /* CoursewareDownloadManager.m */; };
 		BC33000F2BBAB5ED003D4921 /* KnowledgePointListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC33000A2BBAB5ED003D4921 /* KnowledgePointListModel.m */; };
 		BC3300102BBAB5ED003D4921 /* MaterialList.m in Sources */ = {isa = PBXBuildFile; fileRef = BC33000C2BBAB5ED003D4921 /* MaterialList.m */; };
@@ -529,6 +528,7 @@
 		BC42CAAF2BEC9CDA001F076E /* RhythmChooseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC42CAAA2BEC9CDA001F076E /* RhythmChooseView.xib */; };
 		BC42CAB02BEC9CDA001F076E /* RhythmView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC42CAAC2BEC9CDA001F076E /* RhythmView.m */; };
 		BC42CAB12BEC9CDA001F076E /* RhythmView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC42CAAD2BEC9CDA001F076E /* RhythmView.xib */; };
+		BC42CAC72BEF5714001F076E /* KSToolLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC42CAC62BEF5714001F076E /* KSToolLibrary.framework */; };
 		BC483231282A646A005F534C /* HomeRecentCourseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC483230282A646A005F534C /* HomeRecentCourseView.m */; };
 		BC483233282A6473005F534C /* HomeRecentCourseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC483232282A6473005F534C /* HomeRecentCourseView.xib */; };
 		BC48C3AE28292FB600EE65C5 /* ReceiveHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC48C3AD28292FB600EE65C5 /* ReceiveHeaderView.m */; };
@@ -1873,7 +1873,6 @@
 		BC32E10A286AB31C001434DD /* KSPublicAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSPublicAlertView.h; sourceTree = "<group>"; };
 		BC32E10B286AB31C001434DD /* KSPublicAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSPublicAlertView.m; sourceTree = "<group>"; };
 		BC32E10D286AB326001434DD /* KSPublicAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KSPublicAlertView.xib; sourceTree = "<group>"; };
-		BC3300032BBA67D8003D4921 /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BC3300072BBAB5ED003D4921 /* CoursewareDownloadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoursewareDownloadManager.h; sourceTree = "<group>"; };
 		BC3300082BBAB5ED003D4921 /* CoursewareDownloadManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoursewareDownloadManager.m; sourceTree = "<group>"; };
 		BC3300092BBAB5ED003D4921 /* KnowledgePointListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KnowledgePointListModel.h; sourceTree = "<group>"; };
@@ -1999,6 +1998,7 @@
 		BC42CAAB2BEC9CDA001F076E /* RhythmChooseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhythmChooseView.h; sourceTree = "<group>"; };
 		BC42CAAC2BEC9CDA001F076E /* RhythmView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhythmView.m; sourceTree = "<group>"; };
 		BC42CAAD2BEC9CDA001F076E /* RhythmView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RhythmView.xib; sourceTree = "<group>"; };
+		BC42CAC62BEF5714001F076E /* KSToolLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = KSToolLibrary.framework; sourceTree = "<group>"; };
 		BC48322F282A646A005F534C /* HomeRecentCourseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeRecentCourseView.h; sourceTree = "<group>"; };
 		BC483230282A646A005F534C /* HomeRecentCourseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeRecentCourseView.m; sourceTree = "<group>"; };
 		BC483232282A6473005F534C /* HomeRecentCourseView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeRecentCourseView.xib; sourceTree = "<group>"; };
@@ -2874,7 +2874,7 @@
 				BC8B6E612856ED0600866917 /* libWeiboSDK.a in Frameworks */,
 				BC8B6E532856ED0600866917 /* UMAPM.framework in Frameworks */,
 				2779333F27E314640010E277 /* CoreVideo.framework in Frameworks */,
-				BC3300042BBA67D8003D4921 /* KSToolLibrary.framework in Frameworks */,
+				BC42CAC72BEF5714001F076E /* KSToolLibrary.framework in Frameworks */,
 				BC3A55652BAA798A002E1616 /* CloudAccompanyLibrary.framework in Frameworks */,
 				BC8B6E572856ED0600866917 /* UMDevice.framework in Frameworks */,
 				BC3A55662BAA799B002E1616 /* KSTunerLibrary.framework in Frameworks */,
@@ -5144,7 +5144,7 @@
 				BC00A65B2BB58F1700231B74 /* LLPhotoBrowse.bundle */,
 				BC00A6592BB58F0000231B74 /* WMPlayer.bundle */,
 				BC3A55622BAA798A002E1616 /* CloudAccompanyLibrary.framework */,
-				BC3300032BBA67D8003D4921 /* KSToolLibrary.framework */,
+				BC42CAC62BEF5714001F076E /* KSToolLibrary.framework */,
 				BC3A55612BAA798A002E1616 /* KSTunerLibrary.framework */,
 				BC24570E286C437D00D1F7C0 /* SoundFontFile */,
 				BC3BF6242B9EAF1700831494 /* client.p12 */,
@@ -8438,7 +8438,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.5.2;
+				CURRENT_PROJECT_VERSION = 1.6.5.3;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8618,7 +8618,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.5.2;
+				CURRENT_PROJECT_VERSION = 1.6.5.3;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -8926,7 +8926,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.5.2;
+				CURRENT_PROJECT_VERSION = 1.6.5.3;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9201,7 +9201,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.6.5.2;
+				CURRENT_PROJECT_VERSION = 1.6.5.3;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -52,7 +52,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

+ 5 - 0
KulexiuForTeacher/KulexiuForTeacher/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
 
 

+ 58 - 26
KulexiuForTeacher/KulexiuForTeacher/ToolKit/KSToolLibrary.framework/Headers/VoNetWorking.h

@@ -100,12 +100,13 @@ typedef VoResponseFailBlock VoDownloadFailBlock;
 
 @property (nonatomic, strong) AFHTTPSessionManager *_Nonnull httpSessionManager;
 
+@property (nonatomic, strong) AFHTTPSessionManager *_Nonnull noAuthManager;
+
+
 #pragma mark --- 证书相关
 // 配置
 + (void)configCertificatePath:(NSString *_Nonnull)path baseHost:(NSString *_Nonnull)baseHost needAuth:(BOOL)needAuth;
 
-- (void)configHttpsVerifyAndRequest;
-
 /**
  * 创建一个HttpsManager单例对象
  */
@@ -200,29 +201,6 @@ typedef VoResponseFailBlock VoDownloadFailBlock;
                      successBlock:(VoResponseSuccessBlock _Nullable)successBlock
                         failBlock:(VoResponseFailBlock _Nullable)failBlock;
 
-///**
-// *  POST请求
-// *
-// *  @param url              请求路径
-// *  @param cache            是否缓存
-// *  @param refresh          解释同上
-// *  @param params           拼接参数
-// *  @param progressBlock    进度回调
-// *  @param successBlock     成功回调
-// *  @param failBlock        失败回调
-// *
-// *  @return 返回的对象中可取消请求
-// */
-//
-//- (VoURLSessionTask *)formPostWithUrl:(NSString *)url
-//                   refreshRequest:(BOOL)refresh
-//                            cache:(BOOL)cache
-//                           params:(id)params
-//                    progressBlock:(VoPostProgress)progressBlock
-//                     successBlock:(VoResponseSuccessBlock)successBlock
-//                        failBlock:(VoResponseFailBlock)failBlock;
-
-
 /**
  *  文件上传
  *
@@ -297,6 +275,61 @@ typedef VoResponseFailBlock VoDownloadFailBlock;
                                 progressBlock:(VoDownloadProgress _Nullable)progressBlock
                                  successBlock:(VoMultUploadSuccessBlock _Nullable)successBlock
                                     failBlock:(VoMultUploadFailBlock _Nullable)failBlock;
+
+#pragma mark ----- 无auth 接口
+
+/**
+ *  配置请求头
+ *
+ *  @param httpHeader 请求头
+ */
+- (void)configNoAuthHttpHeader:(NSDictionary *_Nonnull)httpHeader;
+
+/**
+ *  GET请求
+ *
+ *  @param url              请求路径
+ *  @param cache            是否缓存
+ *  @param refresh          是否刷新请求(遇到重复请求,若为YES,则会取消旧的请求,用新的请求,若为NO,则忽略新请求,用旧请求)
+ *  @param params           拼接参数
+ *  @param progressBlock    进度回调
+ *  @param successBlock     成功回调
+ *  @param failBlock        失败回调
+ *
+ *  @return 返回的对象中可取消请求
+ */
+- (VoURLSessionTask *_Nullable)noAuthGetWithUrl:(NSString *_Nonnull)url
+                  refreshRequest:(BOOL)refresh
+                           cache:(BOOL)cache
+                          params:(NSDictionary *_Nullable)params
+                   progressBlock:(VoGetProgress _Nullable)progressBlock
+                    successBlock:(VoResponseSuccessBlock _Nullable)successBlock
+                       failBlock:(VoResponseFailBlock _Nullable)failBlock;
+
+
+
+
+/**
+ *  POST请求
+ *
+ *  @param url              请求路径
+ *  @param cache            是否缓存
+ *  @param refresh          解释同上
+ *  @param params           拼接参数
+ *  @param progressBlock    进度回调
+ *  @param successBlock     成功回调
+ *  @param failBlock        失败回调
+ *
+ *  @return 返回的对象中可取消请求
+ */
+- (VoURLSessionTask *_Nullable)noAuthPostWithUrl:(NSString *_Nonnull)url
+                   refreshRequest:(BOOL)refresh
+                            cache:(BOOL)cache
+                           params:(id _Nullable)params
+                    progressBlock:(VoPostProgress _Nullable)progressBlock
+                     successBlock:(VoResponseSuccessBlock _Nullable)successBlock
+                        failBlock:(VoResponseFailBlock _Nullable)failBlock;
+
 @end
 
 
@@ -341,5 +374,4 @@ typedef VoResponseFailBlock VoDownloadFailBlock;
  */
 + (void)clearDownloadData;
 
-
 @end

二进制
KulexiuForTeacher/KulexiuForTeacher/ToolKit/KSToolLibrary.framework/KSToolLibrary