# 6.3.6

CHANGELOG.md

@@ -1,12 +1,16 @@
-# 6.3.5
-优化请求失败重试逻辑
+# 6.3.6    
 
+
+# 6.3.5    
 
-# 6.3.4
-1、新增日志上报sdk（QCloudTrack）,包括灯塔模块（Beacon）和Cls模块。
-2、QCloudQuic 新增v83模块，支持老版本quic sdk。
-3、修复一些issue
+优化请求失败重试逻辑
+
+# 6.3.4    
 
+1、新增日志上报sdk（QCloudTrack）,包括灯塔模块（Beacon）和Cls模块。 
+2、QCloudQuic 新增v83模块，支持老版本quic sdk。 
+3、修复一些issue
+
 # 6.3.3    
 
 修复pic-operations 漏洞

QCloudCOSXML.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
 
-s.version              = "6.3.5"
+s.version              = "6.3.6"
 
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -20,15 +20,15 @@ s.version              = "6.3.5"
   s.default_subspec = 'Default'
   s.subspec 'Default' do |default|
     default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-    default.dependency "QCloudCore/Default",'6.3.5'
+  default.dependency "QCloudCore",'6.3.6'
   end
   s.subspec 'Slim' do |slim|
     slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-    slim.dependency "QCloudCore/WithoutMTA",'6.3.5'
+  slim.dependency "QCloudCore/WithoutMTA",'6.3.6'
   end
   s.subspec 'Transfer' do |transfer|
     transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
-    transfer.dependency "QCloudCore/WithoutMTA",'6.3.5'
+  transfer.dependency "QCloudCore/WithoutMTA",'6.3.6'
 
   end
 

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

@@ -5,12 +5,12 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 603005
+#define QCloudCOSXMLModuleVersionNumber 603006
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleName;
 
-#endif
+#endif

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"6.3.5";
+NSString * const QCloudCOSXMLModuleVersion = @"6.3.6";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end

QCloudCore.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
 
-s.version              = "6.3.5"
+s.version              = "6.3.6"
 
 
 

QCloudCore/Classes/Base/QCloudCoreVersion.h

@@ -5,12 +5,12 @@
 
 #ifndef QCloudCoreModuleVersion_h
 #define QCloudCoreModuleVersion_h
-#define QCloudCoreModuleVersionNumber 603005
+#define QCloudCoreModuleVersionNumber 603006
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCoreModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCoreModuleName;
 
-#endif
+#endif

QCloudCore/Classes/Base/QCloudCoreVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCoreVersion.h"
-NSString * const QCloudCoreModuleVersion = @"6.3.5";
+NSString * const QCloudCoreModuleVersion = @"6.3.6";
 NSString * const QCloudCoreModuleName = @"QCloudCore";
 @interface QCloudQCloudCoreLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end

QCloudCore/Classes/Base/QualityAssurance/QualityDataUploader.m

@@ -36,7 +36,6 @@
 //NSString *const kQCloudUploadAppReleaseKey = @"0AND0VEVB24UBGDU"; // 废弃
 
 
-NSString *const KQCloudServiceKey = @"qcloud_track_cos_sdk";
 NSString *const KQCloudServiceBaseInfoKey = @"qcloud_track_sd_sdk_start";
 #pragma mark -commen key
 NSString *const kQCloudQualityBundleIDKey = @"boundle_id";
@@ -180,7 +179,7 @@ + (void)startWithAppkey:(NSString *)appkey {
                                            id report = [cls performSelector:NSSelectorFromString(@"singleService")];
                                            id beaconService = [beaconCls performSelector:NSSelectorFromString(@"new")];
                                            [beaconService performSelector:NSSelectorFromString(@"updateBeaconKey:") withObject:appkey];
-                                           [report performSelector:NSSelectorFromString(@"addTrackService:serviceKey:") withObject:beaconService withObject:KQCloudServiceKey];
+                                           [report performSelector:NSSelectorFromString(@"addTrackService:serviceKey:") withObject:beaconService withObject:[self qcloud_trackServiceKey]];
 
         );
 
@@ -239,7 +238,7 @@ + (void)trackSDKRequestSuccessWithRequest:(QCloudAbstractRequest *)request param
     NSMutableDictionary *paramas = commonParams?:[NSMutableDictionary dictionary];
     paramas[kQCloudQualityResultKey] = kQCloudRequestSuccessKey;
     paramas[kQCloudQualityErrorRequestNameKey] = [self getServiceNameFromClass:request.class];
-    [self internalUploadRequest:request event:[self qcloud_traceEventTypeFromClass:request.class] withParamter:paramas];
+    [self internalUploadRequest:request event:[self qcloud_trackServiceKey] withParamter:paramas];
 }
 
 +(void)initCommonParams:(NSMutableDictionary * )commonParams{
@@ -328,7 +327,7 @@ + (void)trackSDKRequestFailWithRequest:(QCloudAbstractRequest *)request error:(N
     }
     mutableDicParams[kQCloudQualityErrorRequestNameKey] = [self getServiceNameFromClass:request.class];
     mutableDicParams[kQCloudQualityResultKey] = kQCloudRequestFailureKey;
-    [self internalUploadRequest:request event:[self qcloud_traceEventTypeFromClass:cls] withParamter:mutableDicParams];
+    [self internalUploadRequest:request event:[self qcloud_trackServiceKey] withParamter:mutableDicParams];
 }
 
 
@@ -408,12 +407,13 @@ + (void)startReportWithEventKey:(NSString *)eventKey paramters:(NSDictionary *)p
         SEL selector = NSSelectorFromString(@"reportWithEventCode:params:serviceKey:");
 
         if ([instance respondsToSelector:selector]) {
+            NSString * serviceKey = [self qcloud_trackServiceKey];
             NSMethodSignature *methodSignature = [instance methodSignatureForSelector:selector];
             NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:methodSignature];
             [invocation setSelector:selector];
             [invocation setArgument:&eventKey atIndex:2];
             [invocation setArgument:&paramter atIndex:3];
-            [invocation setArgument:&KQCloudServiceKey atIndex:4];
+            [invocation setArgument:&serviceKey atIndex:4];
             [invocation invokeWithTarget:instance];
         }
     }
@@ -462,7 +462,7 @@ + (id)invokeClassMethod:(id)obj sel:(SEL)selector withObjects:(NSArray *)objects
 
 
 //获取上报的EventKey
-+ (NSString *)qcloud_traceEventTypeFromClass:(Class)cls {
++ (NSString *)qcloud_trackServiceKey{
     return [NSString stringWithFormat:@"qcloud_track_%@_sdk",productName.lowercaseString];
 //    NSString *classString = NSStringFromClass(cls);
 //    if ([kUploadEvents containsObject:classString] || [classString isEqualToString:[NSString stringWithFormat:@"QCloudCOS%@UploadObjectRequest",[productName uppercaseString]]]) {

QCloudQuic/Classes/QCloudQuicVersion.h

@@ -5,12 +5,12 @@
 
 #ifndef QCloudQuicModuleVersion_h
 #define QCloudQuicModuleVersion_h
-#define QCloudQuicModuleVersionNumber 603005
+#define QCloudQuicModuleVersionNumber 603006
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudQuicModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudQuicModuleName;
 
-#endif
+#endif

QCloudQuic/Classes/QCloudQuicVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudQuicVersion.h"
-NSString * const QCloudQuicModuleVersion = @"6.3.5";
+NSString * const QCloudQuicModuleVersion = @"6.3.6";
 NSString * const QCloudQuicModuleName = @"QCloudQuic";
 @interface QCloudQCloudQuicLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end

QCloudTrack/Classes/Cls/QCloudCLSTrackService.h

@@ -10,6 +10,7 @@
 #import "QCloudClsSessionCredentials.h"
 #import "QCloudClsLifecycleCredentialProvider.h"
 
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QCloudCLSTrackService : QCloudBaseTrackService

QCloudTrack/Classes/Cls/QCloudCLSTrackService.m

@@ -56,9 +56,11 @@ -(void)reportWithEventCode:(NSString *)eventCode params:(NSDictionary *)params{
     if (self.isCloseReport) {
         return;
     }
-    if([self.credentialProvider needRefresh] || self.clsClient == nil){
+
+    if([self.credentialProvider needRefresh] || !self.clsClient){
         [self setupCLSSDK];
     }
+
     [self _reportWithEventCode:eventCode params:params];
 }
 

QCloudTrack/Classes/Cls/QCloudClsLifecycleCredentialProvider.h

@@ -29,6 +29,7 @@ typedef QCloudClsSessionCredentials* _Nonnull (^QCloudCredentialRefreshBlock)(vo
 -(void)forceInvalidationCredential;
 
 -(BOOL)needRefresh;
+
 @end
 
 NS_ASSUME_NONNULL_END

QCloudTrack/Classes/Default/QCloudTrackService.m

@@ -78,15 +78,13 @@ -(NSDictionary *)getCommonParams{
     NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
     [commonParams setObject:appVersion?:@"" forKey:@"app_version_code"];
     [commonParams setObject:appVersion?:@"" forKey:@"app_version_name"];
-
 #if TARGET_OS_IOS
     [commonParams setObject:[UIDevice currentDevice].systemName forKey:@"os_name"];
     [commonParams setObject:[UIDevice currentDevice].systemVersion forKey:@"os_version"];
 #else
     [commonParams setObject:@"macos" forKey:@"os_name"];
     [commonParams setObject:@"" forKey:@"os_version"];
 #endif
-
     [commonParams setObject:[QCloudTrackNetworkUtils single].getCurrentLocalIP ?:@"" forKey:@"client_local_ip"];
     [commonParams setObject:[QCloudTrackNetworkUtils single].isProxy?@"true":@"false" forKey:@"client_proxy"];
     [commonParams setObject:[QCloudTrackNetworkUtils single].getNetWorkType ?:@"" forKey:@"network_type"];

QCloudTrack/Classes/QCloudTrackVersion.h

@@ -5,7 +5,7 @@
 
 #ifndef QCloudTrackModuleVersion_h
 #define QCloudTrackModuleVersion_h
-#define QCloudTrackModuleVersionNumber 603005
+#define QCloudTrackModuleVersionNumber 603006
 
 //dependency
 

QCloudTrack/Classes/QCloudTrackVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudTrackVersion.h"
-NSString * const QCloudTrackModuleVersion = @"6.3.5";
+NSString * const QCloudTrackModuleVersion = @"6.3.6";
 NSString * const QCloudTrackModuleName = @"QCloudTrack";
 @interface QCloudQCloudTrackLoad : NSObject
 @end