From b80c10222a4be80d825c3367b4b92c34d6776942 Mon Sep 17 00:00:00 2001 From: hank <hank.zhang@proficientcity.com> Date: Wed, 18 Apr 2018 15:34:39 +0800 Subject: [PATCH] 添加V3.6.7\ --- frameworks/WAVkImpl.framework/WAVkImpl | 0 frameworks/VKSdkFramework.framework/Info.plist | 0 frameworks/VKSdkFramework.framework/Headers/VKApi.h | 2 frameworks/VKSdkFramework.framework/Headers/VKAuthorizationResult.h | 2 frameworks/VKSdkFramework.framework/Headers/VKSharedTransitioningObject.h | 2 frameworks/WAVkImpl.framework/Headers/WAVkImpl.h | 2 frameworks/VKSdkFramework.framework/en.lproj/Localizable.strings | 0 frameworks/VKSdkFramework.framework/Headers/VKUploadPhotoBase.h | 2 frameworks/VKSdkFramework.framework/Headers/VKSdkVersion.h | 2 frameworks/VKSdkFramework.framework/Headers/VKSdkFramework.h | 52 +++++++++++++++++++++++-- frameworks/VKSdkFramework.framework/Headers/VKUploadImage.h | 2 frameworks/VKSdkFramework.framework/Headers/VKAccessToken.h | 2 config/wa_sdk_impl_config_vk.xml | 2 frameworks/VKSdkFramework.framework/Headers/VKAuthorizeController.h | 4 ++ frameworks/VKSdkFramework.framework/ru.lproj/Localizable.strings | 0 frameworks/VKSdkFramework.framework/Assets.car | 0 frameworks/VKSdkFramework.framework/Headers/VKSdk.h | 4 +- WAVkImpl.podspec | 7 ++- frameworks/VKSdkFramework.framework/VKSdkFramework | 0 frameworks/WAVkImpl.framework/Info.plist | 0 frameworks/VKSdkFramework.framework/Headers/VKApiModels.h | 2 21 files changed, 67 insertions(+), 20 deletions(-) diff --git a/WAVkImpl.podspec b/WAVkImpl.podspec index 4b5a1b7..93ded43 100644 --- a/WAVkImpl.podspec +++ b/WAVkImpl.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'WAVkImpl' -s.version = '3.6.4' +s.version = '3.6.7' s.summary = 'WAVkImpl framework is production environment.' s.license = 'MIT' s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" } @@ -19,7 +19,8 @@ s.ios.deployment_target = "7.0" s.vendored_frameworks = 'frameworks/*.framework' s.resources = ['config/*.xml'] +s.frameworks = 'SafariServices' s.requires_arc = true -s.dependency 'WASdkIntf', '~> 3.6.4' #此处添加私有库依赖 -s.dependency 'WASdkImpl', '~> 3.6.4' +s.dependency 'WASdkIntf', '~> 3.6.7' #此处添加私有库依赖 +s.dependency 'WASdkImpl', '~> 3.6.7' end diff --git a/config/wa_sdk_impl_config_vk.xml b/config/wa_sdk_impl_config_vk.xml index 147e4b7..5bca02c 100644 --- a/config/wa_sdk_impl_config_vk.xml +++ b/config/wa_sdk_impl_config_vk.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <config> - <version val="VK3.6.4"/> + <version val="VK3.6.7"/> <comps> <!-- 用户模块 --> <comp module="USR" plaf="VK" mandatory="YES" value="WAVKUser" desc="VK用户账户"/> diff --git a/frameworks/VKSdkFramework.framework/Assets.car b/frameworks/VKSdkFramework.framework/Assets.car new file mode 100644 index 0000000..267f67e --- /dev/null +++ b/frameworks/VKSdkFramework.framework/Assets.car Binary files differ diff --git a/frameworks/VKSdkFramework.framework/Headers/VKAccessToken.h b/frameworks/VKSdkFramework.framework/Headers/VKAccessToken.h index d239a09..826f019 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKAccessToken.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKAccessToken.h @@ -111,4 +111,4 @@ @property(nonatomic, readwrite, assign) BOOL httpsRequired; @property(nonatomic, readwrite, assign) NSInteger expiresIn; @property(nonatomic, readwrite, strong) VKUser *localUser; -@end \ No newline at end of file +@end diff --git a/frameworks/VKSdkFramework.framework/Headers/VKApi.h b/frameworks/VKSdkFramework.framework/Headers/VKApi.h index 5634d8f..b02ac78 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKApi.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKApi.h @@ -1,6 +1,6 @@ // // VKApi.h -// +// // Copyright (c) 2014 VK.com // // Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/frameworks/VKSdkFramework.framework/Headers/VKApiModels.h b/frameworks/VKSdkFramework.framework/Headers/VKApiModels.h index 2ab057d..7051087 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKApiModels.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKApiModels.h @@ -31,4 +31,4 @@ #import "VKSchool.h" #import "VKUniversity.h" #import "VKGroup.h" -#import "VKDocs.h" \ No newline at end of file +#import "VKDocs.h" diff --git a/frameworks/VKSdkFramework.framework/Headers/VKAuthorizationResult.h b/frameworks/VKSdkFramework.framework/Headers/VKAuthorizationResult.h index dcfb657..34d6dca 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKAuthorizationResult.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKAuthorizationResult.h @@ -74,4 +74,4 @@ @property(nonatomic, readwrite, assign) VKAuthorizationState state; -@end \ No newline at end of file +@end diff --git a/frameworks/VKSdkFramework.framework/Headers/VKAuthorizeController.h b/frameworks/VKSdkFramework.framework/Headers/VKAuthorizeController.h index 2c48a37..dba9885 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKAuthorizeController.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKAuthorizeController.h @@ -30,6 +30,10 @@ VKAuthorizationTypeApp }; +@interface VKNavigationController : UINavigationController + +@end + @interface VKAuthorizationContext : VKObject @property (nonatomic, readonly, strong) NSString *clientId; @property (nonatomic, readonly, strong) NSString *displayType; diff --git a/frameworks/VKSdkFramework.framework/Headers/VKSdk.h b/frameworks/VKSdkFramework.framework/Headers/VKSdk.h index c3d2f7c..ed4f454 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKSdk.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKSdk.h @@ -1,6 +1,6 @@ // // VKSdk.h -// +// 1.4.9 // Copyright (c) 2014 VK.com // // Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -345,4 +345,4 @@ - (void)notifyTokenExpired; -@end \ No newline at end of file +@end diff --git a/frameworks/VKSdkFramework.framework/Headers/VKSdkFramework.h b/frameworks/VKSdkFramework.framework/Headers/VKSdkFramework.h old mode 100644 new mode 100755 index 1e926cd..5778d52 --- a/frameworks/VKSdkFramework.framework/Headers/VKSdkFramework.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKSdkFramework.h @@ -1,10 +1,25 @@ // // VKSdkFramework.h -// VKSdkFramework // -// Created by wuyx on 2017/1/3. -// Copyright © 2017年 GHW. All rights reserved. +// Copyright (c) 2015 VK.com // +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #import <UIKit/UIKit.h> @@ -15,5 +30,32 @@ FOUNDATION_EXPORT const unsigned char VKSdkFrameworkVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import <VKSdkFramework/PublicHeader.h> -//time:2017/1/3 11:28 - +#import <VKSdkFramework/VKSdk.h> +#import <VKSdkFramework/VKAccessToken.h> +#import <VKSdkFramework/VKPermissions.h> +#import <VKSdkFramework/VKUtil.h> +#import <VKSdkFramework/VKApi.h> +#import <VKSdkFramework/VKApiConst.h> +#import <VKSdkFramework/VKSdkVersion.h> +#import <VKSdkFramework/VKCaptchaViewController.h> +#import <VKSdkFramework/VKRequest.h> +#import <VKSdkFramework/VKBatchRequest.h> +#import <VKSdkFramework/NSError+VKError.h> +#import <VKSdkFramework/VKApiModels.h> +#import <VKSdkFramework/VKUploadImage.h> +#import <VKSdkFramework/VKShareDialogController.h> +#import <VKSdkFramework/VKActivity.h> +#import <VKSdkFramework/OrderedDictionary.h> +#import <VKSdkFramework/VKAuthorizeController.h> +#import <VKSdkFramework/VKBundle.h> +#import <VKSdkFramework/VKCaptchaView.h> +#import <VKSdkFramework/VKUploadMessagesPhotoRequest.h> +#import <VKSdkFramework/VKUploadPhotoBase.h> +#import <VKSdkFramework/VKUploadPhotoRequest.h> +#import <VKSdkFramework/VKUploadWallPhotoRequest.h> +#import <VKSdkFramework/VKHTTPClient.h> +#import <VKSdkFramework/VKHTTPOperation.h> +#import <VKSdkFramework/VKJSONOperation.h> +#import <VKSdkFramework/VKRequestsScheduler.h> +#import <VKSdkFramework/VKSharedTransitioningObject.h> +#import <VKSdkFramework/NSString+MD5.h> \ No newline at end of file diff --git a/frameworks/VKSdkFramework.framework/Headers/VKSdkVersion.h b/frameworks/VKSdkFramework.framework/Headers/VKSdkVersion.h index cf3d31a..5cba874 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKSdkVersion.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKSdkVersion.h @@ -21,4 +21,4 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define VK_SDK_VERSION @"1.4.6" -#define VK_SDK_API_VERSION @"5.60" +#define VK_SDK_API_VERSION @"5.40" diff --git a/frameworks/VKSdkFramework.framework/Headers/VKSharedTransitioningObject.h b/frameworks/VKSdkFramework.framework/Headers/VKSharedTransitioningObject.h index 5584ef0..ee6a922 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKSharedTransitioningObject.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKSharedTransitioningObject.h @@ -8,4 +8,4 @@ @interface VKSharedTransitioningObject : NSObject <UIViewControllerTransitioningDelegate> -@end \ No newline at end of file +@end diff --git a/frameworks/VKSdkFramework.framework/Headers/VKUploadImage.h b/frameworks/VKSdkFramework.framework/Headers/VKUploadImage.h index 7c16557..35db943 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKUploadImage.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKUploadImage.h @@ -49,4 +49,4 @@ @return Prepared object for using in upload */ + (instancetype)uploadImageWithImage:(UIImage *)image andParams:(VKImageParameters *)params; -@end \ No newline at end of file +@end diff --git a/frameworks/VKSdkFramework.framework/Headers/VKUploadPhotoBase.h b/frameworks/VKSdkFramework.framework/Headers/VKUploadPhotoBase.h index c0c6d67..27b6385 100755 --- a/frameworks/VKSdkFramework.framework/Headers/VKUploadPhotoBase.h +++ b/frameworks/VKSdkFramework.framework/Headers/VKUploadPhotoBase.h @@ -49,4 +49,4 @@ @interface VKUploadImageOperation : VKOperation + (instancetype)operationWithUploadRequest:(VKUploadPhotoBase *)request; -@end \ No newline at end of file +@end diff --git a/frameworks/VKSdkFramework.framework/Info.plist b/frameworks/VKSdkFramework.framework/Info.plist index faf2f99..2d9fed6 100644 --- a/frameworks/VKSdkFramework.framework/Info.plist +++ b/frameworks/VKSdkFramework.framework/Info.plist Binary files differ diff --git a/frameworks/VKSdkFramework.framework/VKSdkFramework b/frameworks/VKSdkFramework.framework/VKSdkFramework index 3ec6799..1951771 100644 --- a/frameworks/VKSdkFramework.framework/VKSdkFramework +++ b/frameworks/VKSdkFramework.framework/VKSdkFramework Binary files differ diff --git a/frameworks/VKSdkFramework.framework/en.lproj/Localizable.strings b/frameworks/VKSdkFramework.framework/en.lproj/Localizable.strings new file mode 100644 index 0000000..594c8e4 --- /dev/null +++ b/frameworks/VKSdkFramework.framework/en.lproj/Localizable.strings Binary files differ diff --git a/frameworks/VKSdkFramework.framework/ru.lproj/Localizable.strings b/frameworks/VKSdkFramework.framework/ru.lproj/Localizable.strings new file mode 100644 index 0000000..5c5b87b --- /dev/null +++ b/frameworks/VKSdkFramework.framework/ru.lproj/Localizable.strings Binary files differ diff --git a/frameworks/WAVkImpl.framework/Headers/WAVkImpl.h b/frameworks/WAVkImpl.framework/Headers/WAVkImpl.h index 2a05293..6e4c9d0 100644 --- a/frameworks/WAVkImpl.framework/Headers/WAVkImpl.h +++ b/frameworks/WAVkImpl.framework/Headers/WAVkImpl.h @@ -16,4 +16,4 @@ // In this header, you should import all the public headers of your framework using statements like #import <WAVkImpl/PublicHeader.h> -//time:2017/6/12 14:38 ver:3.6.4 +//time:2018/4/11 14:25 ver:3.6.7 diff --git a/frameworks/WAVkImpl.framework/Info.plist b/frameworks/WAVkImpl.framework/Info.plist index 89764c0..50b2791 100644 --- a/frameworks/WAVkImpl.framework/Info.plist +++ b/frameworks/WAVkImpl.framework/Info.plist Binary files differ diff --git a/frameworks/WAVkImpl.framework/WAVkImpl b/frameworks/WAVkImpl.framework/WAVkImpl index 6acf625..ac3e5f1 100644 --- a/frameworks/WAVkImpl.framework/WAVkImpl +++ b/frameworks/WAVkImpl.framework/WAVkImpl Binary files differ -- Gitblit v1.8.0