Steven 4 months ago
parent
commit
b808cd1df5

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

@@ -7434,7 +7434,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -7496,7 +7496,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -8007,7 +8007,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -8296,7 +8296,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;

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

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

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Common/Tools/Custom/KSMediaManager.m

@@ -192,7 +192,7 @@
             
             [[TZImageManager manager] getVideoOutputPathWithAsset:asset presetName:self.presentName success:^(NSString *outputPath) {
                 dispatch_main_sync_safe(^{
-                    [LOADING_MANAGER removeHUD];
+                    [LOADING_MANAGER removeHUDNoDelay];
                 });
                 NSLog(@"视频导出到本地完成,沙盒路径为:%@",outputPath);
                 NSData *outputData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:outputPath]]; //压缩后的视频
@@ -207,7 +207,7 @@
                 
             } failure:^(NSString *errorMessage, NSError *error) {
                 dispatch_main_sync_safe(^{
-                    [LOADING_MANAGER removeHUD];
+                    [LOADING_MANAGER removeHUDNoDelay];
                     [LOADING_MANAGER MBShowAUTOHidingInWindow:@"视频导出失败"];
                 });
                 NSLog(@"视频导出失败:%@,error:%@",errorMessage, error);

+ 24 - 22
KulexiuForStudent/Podfile

@@ -1,16 +1,16 @@
 # Uncomment the next line to define a global platform for your project
- platform :ios, '12.0'
+platform :ios, '12.0'
 
 # 防止 TUIKit 组件里的 *.xcassets 与您项目里面冲突。
 install! 'cocoapods', :disable_input_output_paths => true
 
 target 'KulexiuForStudent' do
   # Comment the next line if you don't want to use dynamic frameworks
- # use_frameworks!
-
-# 忽略引入库的所有警告(强迫症者的福音啊)
- inhibit_all_warnings!
-
+  # use_frameworks!
+  
+  # 忽略引入库的所有警告(强迫症者的福音啊)
+  inhibit_all_warnings!
+  
   
   pod 'JCore', '2.7.1-noidfa'
   pod 'JPush', '4.3.0'
@@ -20,41 +20,43 @@ target 'KulexiuForStudent' do
   pod 'RSKImageCropper'
   pod 'CHIPageControl'
   pod 'TYCyclePagerView'
-
+  
   
   pod 'SSZipArchive'
-
-#  pod "WechatOpenSDK"
+  
+  #  pod "WechatOpenSDK"
   pod 'AlipaySDK-iOS'
-
+  
   
   # 集成聊天功能
-    pod 'TUIChat/UI_Classic'
-    # 集成会话功能
-    pod 'TUIConversation/UI_Classic'
-    # 集成群组功能
-    pod 'TUIGroup/UI_Classic'
-    # 集成搜索功能(需要购买旗舰版套餐)
-    pod 'TUISearch/UI_Classic'
-
+  pod 'TUIChat/UI_Classic'
+  # 集成会话功能
+  pod 'TUIConversation/UI_Classic'
+  # 集成群组功能
+  pod 'TUIGroup/UI_Classic'
+  # 集成搜索功能(需要购买旗舰版套餐)
+  pod 'TUISearch/UI_Classic'
+  
   # 接入腾讯直播
-    pod 'TXLiteAVSDK_Professional'
+  pod 'TXLiteAVSDK_Professional'
   # Pods for KulexiuForStudent
   
   pod 'CocoaHTTPServer'
-
+  
   # 本地
   pod 'KSToolsLibrary', :path => '/Users/wangzhi/WorkSpace/TargetModule/my-local-repo/KSToolsLibrary'
   pod 'KSCloudAccompanyLibrary', :path => '/Users/wangzhi/WorkSpace/TargetModule/my-local-repo/KSCloudAccompanyLibrary'
+  
+  
   target 'KulexiuForStudentTests' do
     inherit! :search_paths
     # Pods for testing
   end
-
+  
   target 'KulexiuForStudentUITests' do
     # Pods for testing
   end
-
+  
 end
 
 #Pods config

+ 1 - 1
KulexiuForStudent/Podfile.lock

@@ -402,6 +402,6 @@ SPEC CHECKSUMS:
   Whiteboard: 9d5a68d3738bd0ba8cd98820c506d13108976696
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
-PODFILE CHECKSUM: d78f7f51b5e28ae03c39c9323752a0086e7ecadf
+PODFILE CHECKSUM: 6b06b824fe8ea34f6833c9d7ae7b610afba2786c
 
 COCOAPODS: 1.15.2

+ 1 - 1
KulexiuForStudent/Pods/Manifest.lock

@@ -402,6 +402,6 @@ SPEC CHECKSUMS:
   Whiteboard: 9d5a68d3738bd0ba8cd98820c506d13108976696
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
-PODFILE CHECKSUM: d78f7f51b5e28ae03c39c9323752a0086e7ecadf
+PODFILE CHECKSUM: 6b06b824fe8ea34f6833c9d7ae7b610afba2786c
 
 COCOAPODS: 1.15.2

File diff suppressed because it is too large
+ 118 - 100
KulexiuForStudent/Pods/Pods.xcodeproj/project.pbxproj


Some files were not shown because too many files changed in this diff