Browse Source

change name function

Marino Faggiana 7 years ago
parent
commit
f66caee167

+ 2 - 2
iOSClient/Networking/CCNetworking.m

@@ -771,7 +771,7 @@
             
             
             [[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
             [[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
                 
                 
-                if ([dataUTI isEqualToString:@"public.heic"] && [CCUtility getHeicToJpeg]) {
+                if ([dataUTI isEqualToString:@"public.heic"] && [CCUtility getFormatSaveAutoUploadCompatibility]) {
                     
                     
                     UIImage *image = [UIImage imageWithData:imageData];
                     UIImage *image = [UIImage imageWithData:imageData];
                     NSData *imageDataJPEG = UIImageJPEGRepresentation(image, 1.0);
                     NSData *imageDataJPEG = UIImageJPEGRepresentation(image, 1.0);
@@ -820,7 +820,7 @@
                 if (exportSession) {
                 if (exportSession) {
                     
                     
                     exportSession.outputURL = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadataNet.fileName]];
                     exportSession.outputURL = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadataNet.fileName]];
-                    exportSession.outputFileType = AVFileTypeQuickTimeMovie;
+                    //exportSession.outputFileType = AVFileTypeQuickTimeMovie;
                     
                     
                     [exportSession exportAsynchronouslyWithCompletionHandler:^{
                     [exportSession exportAsynchronouslyWithCompletionHandler:^{
                         
                         

+ 2 - 2
iOSClient/Utility/CCUtility.h

@@ -91,7 +91,7 @@
 
 
 + (void)setShowHiddenFiles:(BOOL)show;
 + (void)setShowHiddenFiles:(BOOL)show;
 
 
-+ (void)setHeicToJpeg:(BOOL)show;
++ (void)setFormatSaveAutoUploadCompatibility:(BOOL)show;
 
 
 // GET
 // GET
 
 
@@ -137,7 +137,7 @@
 
 
 + (BOOL)getShowHiddenFiles;
 + (BOOL)getShowHiddenFiles;
 
 
-+ (BOOL)getHeicToJpeg;
++ (BOOL)getFormatSaveAutoUploadCompatibility;
 
 
 // ===== Varius =====
 // ===== Varius =====
 
 

+ 4 - 4
iOSClient/Utility/CCUtility.m

@@ -221,10 +221,10 @@
     [UICKeyChainStore setString:sShow forKey:@"showHiddenFiles" service:k_serviceShareKeyChain];
     [UICKeyChainStore setString:sShow forKey:@"showHiddenFiles" service:k_serviceShareKeyChain];
 }
 }
 
 
-+ (void)setHeicToJpeg:(BOOL)show
++ (void)setFormatSaveAutoUploadCompatibility:(BOOL)show
 {
 {
     NSString *sSet = (show) ? @"true" : @"false";
     NSString *sSet = (show) ? @"true" : @"false";
-    [UICKeyChainStore setString:sSet forKey:@"heicToJpeg" service:k_serviceShareKeyChain];
+    [UICKeyChainStore setString:sSet forKey:@"formatSaveAutoUploadCompatibility" service:k_serviceShareKeyChain];
 }
 }
 
 
 #pragma ------------------------------ GET
 #pragma ------------------------------ GET
@@ -421,9 +421,9 @@
     return [[UICKeyChainStore stringForKey:@"showHiddenFiles" service:k_serviceShareKeyChain] boolValue];
     return [[UICKeyChainStore stringForKey:@"showHiddenFiles" service:k_serviceShareKeyChain] boolValue];
 }
 }
 
 
-+ (BOOL)getHeicToJpeg
++ (BOOL)getFormatSaveAutoUploadCompatibility
 {
 {
-    return [[UICKeyChainStore stringForKey:@"heicToJpeg" service:k_serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"formatSaveAutoUploadCompatibility" service:k_serviceShareKeyChain] boolValue];
 }
 }
 
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma --------------------------------------------------------------------------------------------