升级 SDK

2025-05-20 08:47:23 +08:00 · 2021-06-09 20:14:47 +08:00
parent e0ca03d33f
commit f59bc103ac
18 changed files with 65 additions and 92 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,7 @@
+## 2.1.1
+
+* 升级SDK
+
 ## 2.1.0

 * nullsafety
--- a/README.md
+++ b/README.md
@ -58,7 +58,19 @@ android {
 ## ios

 ```
-腾讯有毒吗？module.modulemap 的内容都没提供完整，特么搞得我差了半天
+出于插件的基本需求，将 SDK 的 module.modulemap 内容修改
+
+改前
+module TencentOpenApi{
+    umbrella header "TencentOpenApiUmbrellaHeader.h"
+    export *
+}
+
+改后
+framework module TencentOpenApi{
+    umbrella header "TencentOpenApiUmbrellaHeader.h"
+    export *
+}
 ```

 ```
@ -99,60 +111,8 @@ iOS 9系统策略更新，限制了http协议的访问，此外应用需要在
 		<string>mqqopensdklaunchminiapp</string>
 		<string>mqqopensdkproxylogin</string>
 		<string>mqqopensdknopasteboard</string>
+        <string>mqqopensdkcheckauth</string>
 	</array>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>gtimg.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSExceptionRequiresForwardSecrecy</key>
-				<false/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>idqqimg.com</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSExceptionRequiresForwardSecrecy</key>
-				<string>NO</string>
-				<key>NSIncludesSubdomains</key>
-				<string>YES</string>
-			</dict>
-			<key>qlogo.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSExceptionRequiresForwardSecrecy</key>
-				<false/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>qplus.com</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSExceptionRequiresForwardSecrecy</key>
-				<false/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>qq.com</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSExceptionRequiresForwardSecrecy</key>
-				<false/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
 ```

 ```
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,5 +1,5 @@
 group 'io.github.v7lin.tencent_kit'
-version '2.1.0'
+version '2.1.1'

 buildscript {
    repositories {
@ -51,5 +51,6 @@ android {

 dependencies {
    //
-    vendorImplementation 'com.tencent.tauth:qqopensdk:3.52.0'
+    vendorImplementation fileTree(include: ['*.jar'], dir: 'libs')
+//    vendorImplementation 'com.tencent.tauth:qqopensdk:3.53.0'
 }
--- a/android/libs/open_sdk_3.5.4.11_r3f56456_lite.jar
+++ b/android/libs/open_sdk_3.5.4.11_r3f56456_lite.jar
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@ -8,10 +8,10 @@ PODS:
  - sqflite (0.0.2):
    - Flutter
    - FMDB (>= 2.7.5)
-  - tencent_kit (2.1.0):
+  - tencent_kit (2.1.1):
    - Flutter
-    - tencent_kit/vendor (= 2.1.0)
-  - tencent_kit/vendor (2.1.0):
+    - tencent_kit/vendor (= 2.1.1)
+  - tencent_kit/vendor (2.1.1):
    - Flutter

 DEPENDENCIES:
@ -39,8 +39,8 @@ SPEC CHECKSUMS:
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  tencent_kit: fa0dc47c22cf97d0c00e7b739e812ec1e5297ebd
+  tencent_kit: 72c1dbfff5c84fd6e68363dfe6208a36235ef3be

 PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d

-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@ -3,18 +3,18 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 50;
 	objects = {

 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		7415339138A66C77613265AD /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BDF4AE1A2D05B7B59D56AA5 /* libPods-Runner.a */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		A47B4E2D2788685E8EC83B05 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E550C709F5BE86F04F5B1E81 /* libPods-Runner.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXCopyFilesBuildPhase section */
@ -46,8 +46,8 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		9BDF4AE1A2D05B7B59D56AA5 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9DFC57B207F1D38FE813698A /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		E550C709F5BE86F04F5B1E81 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E87D3240E5D4E8343B925839 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

@ -56,7 +56,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7415339138A66C77613265AD /* libPods-Runner.a in Frameworks */,
+				A47B4E2D2788685E8EC83B05 /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -130,7 +130,7 @@
 		D66298A71A1FFA013550393B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				9BDF4AE1A2D05B7B59D56AA5 /* libPods-Runner.a */,
+				E550C709F5BE86F04F5B1E81 /* libPods-Runner.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
--- a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@ -2,6 +2,6 @@
 <Workspace
   version = "1.0">
   <FileRef
-      location = "group:Runner.xcodeproj">
+      location = "self:">
   </FileRef>
 </Workspace>
--- a/example/ios/Runner/Info.plist
+++ b/example/ios/Runner/Info.plist
@ -61,6 +61,7 @@
 		<string>mqqopensdklaunchminiapp</string>
 		<string>mqqopensdkproxylogin</string>
 		<string>mqqopensdknopasteboard</string>
+		<string>mqqopensdkcheckauth</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@ -14,7 +14,7 @@ packages:
      name: async
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
  boolean_selector:
    dependency: transitive
    description:
@ -239,7 +239,7 @@ packages:
      name: source_span
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
  sqflite:
    dependency: transitive
    description:
@ -288,7 +288,7 @@ packages:
      path: ".."
      relative: true
    source: path
-    version: "2.1.0"
+    version: "2.1.1"
  term_glyph:
    dependency: transitive
    description:
@ -302,7 +302,7 @@ packages:
      name: test_api
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
  typed_data:
    dependency: transitive
    description:
--- a/ios/Libraries/TencentOpenAPI.framework/Headers/QQApiInterface.h
+++ b/ios/Libraries/TencentOpenAPI.framework/Headers/QQApiInterface.h
@ -77,6 +77,8 @@ typedef void (^sendResultBlock)(NSDictionary *result);
 */
 + (QQApiSendResultCode)sendMessageToQQAvatarWithReq:(QQBaseReq*)req;

+
+ (QQApiSendResultCode)sendMessageToQQAuthWithReq:(QQBaseReq*)req;
 /**
 向手Q发起组图分享到表情收藏
 \param req 分享内容的请求
--- a/ios/Libraries/TencentOpenAPI.framework/Headers/QQApiInterfaceObject.h
+++ b/ios/Libraries/TencentOpenAPI.framework/Headers/QQApiInterfaceObject.h
@ -78,6 +78,9 @@ __attribute__((visibility("default"))) @interface QQApiObject : NSObject
@property(nonatomic, retain) NSString* description; ///<简要描述，最长512个字符
@property(nonatomic, retain) NSString* universalLink; ///(>=3.3.7)支持第三方传入在互联开放平台注册的universallink
@property(nonatomic, assign) uint64_t cflag;
+//353新增两个字断给游戏侧使用，对齐微信sdk
+@property(nonatomic, retain) NSString* tagName;
+@property(nonatomic, retain) NSString* messageExt;
 /*
 * 分享到QQ/TIM
 * SDK根据是否安装对应客户端进行判断，判断顺序：QQ > TIM
@ -147,6 +150,7 @@ __attribute__((visibility("default"))) @interface QQApiResultObject : QQApiObjec

 -(id)initWithText:(NSString*)text; ///<初始化方法
 +(id)objectWithText:(NSString*)text;///<工厂方法，获取一个QQApiTextObject对象.
+
@end

 // QQApiURLObject
@ -182,6 +186,7 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
 */
 +(id)objectWithURL:(NSURL*)url title:(NSString*)title description:(NSString*)description previewImageData:(NSData*)data targetContentType:(QQApiURLTargetType)targetContentType;
 +(id)objectWithURL:(NSURL*)url title:(NSString*)title description:(NSString*)description previewImageURL:(NSURL*)previewURL targetContentType:(QQApiURLTargetType)targetContentType;
+
@end

 // QQApiExtendObject
@ -210,6 +215,7 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
 */
 - (id)initWithData:(NSData *)data previewImageData:(NSData*)previewImageData title:(NSString *)title description:(NSString *)description imageDataArray:(NSArray *)imageDataArray;

+
 /**
 helper方法获取一个autorelease的<code>QQApiExtendObject</code>对象
 @param data 数据内容
@ -220,7 +226,6 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
 一个自动释放的<code>QQApiExtendObject</code>实例
 */
 + (id)objectWithData:(NSData*)data previewImageData:(NSData*)previewImageData title:(NSString*)title description:(NSString*)description;
-
 /**
 helper方法获取一个autorelease的<code>QQApiExtendObject</code>对象
 @param data 数据内容
@ -233,6 +238,7 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
 */
 + (id)objectWithData:(NSData*)data previewImageData:(NSData*)previewImageData title:(NSString*)title description:(NSString*)description imageDataArray:(NSArray*)imageDataArray;

+
@end

 // QQApiImageObject
@ -268,6 +274,10 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
@property(nonatomic, retain) NSString *assetURL;
@end

+//QQApiAuthObject 用于拉起手Q的授权详情页
+@interface QQApiAuthObject : QQApiObject
+@end
+
 // QQApiImageArrayForFaceCollectionObject
 /** @brief 图片数组对象
   用于分享图片组到表情收藏，是一个指定为图片类型的<code>QQApiObject</code>
@ -432,7 +442,6 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
 @note 如果url为空，调用<code>QQApi#sendMessage:</code>时将返回FALSE
 */
 +(id)objectWithURL:(NSURL*)url title:(NSString*)title description:(NSString*)description previewImageData:(NSData*)data;
-
 /**
 获取一个autorelease的<code>QQApiVideoObject</code>
 @param url 视频内容的目标URL
@ -459,7 +468,6 @@ __attribute__((visibility("default"))) @interface QQApiURLObject : QQApiObject
 @note 如果url为空，调用<code>QQApi#sendMessage:</code>时将返回FALSE
 */
 +(id)objectWithURL:(NSURL*)url title:(NSString*)title description:(NSString*)description previewImageData:(NSData*)data;
-
 /**
 获取一个autorelease的<code>QQApiNewsObject</code>
 @param url 视频内容的目标URL
--- a/ios/Libraries/TencentOpenAPI.framework/Headers/TencentOpenApiUmbrellaHeader.h
+++ b/ios/Libraries/TencentOpenAPI.framework/Headers/TencentOpenApiUmbrellaHeader.h
@ -9,10 +9,12 @@
 #ifndef TencentOpenApiUmbrellaHeader_h
 #define TencentOpenApiUmbrellaHeader_h

+#import <Foundation/Foundation.h>
+
 FOUNDATION_EXPORT double StaticLibraryModuleVersionNumber;
 FOUNDATION_EXPORT const unsigned char StaticLibraryModuleVersionString[];

-#imoort "QQApiInterface.h"
+#import "QQApiInterface.h"
 #import "QQApiInterfaceObject.h"
 #import "sdkdef.h"
 #import "TencentOAuth.h"
--- a/ios/Libraries/TencentOpenAPI.framework/Headers/module.modulemap
+++ b/ios/Libraries/TencentOpenAPI.framework/Headers/module.modulemap
@ -1,9 +1,4 @@
-framework module TencentOpenAPI {
-  header "QQApiInterface.h"
-  header "QQApiInterfaceObject.h"
-  header "TencentOAuth.h"
-  header "TencentOpenApiUmbrellaHeader.h"
-  header "sdkdef.h"
-
-  export *
+framework module TencentOpenApi{
+    umbrella header "TencentOpenApiUmbrellaHeader.h"
+    export *
 }
--- a/ios/Libraries/TencentOpenAPI.framework/Headers/sdkdef.h
+++ b/ios/Libraries/TencentOpenAPI.framework/Headers/sdkdef.h
@ -57,7 +57,7 @@ typedef enum
 *
 * APIResponse用于封装所有请求的返回结果，包括错误码、错误信息、原始返回数据以及返回数据的json格式字典
 */
-@interface APIResponse : NSObject<NSCoding> {
+@interface APIResponse : NSObject<NSSecureCoding> {
    int      _detailRetCode;
 	int		 _retCode;
 	int		 _seq;
--- a/ios/Libraries/TencentOpenAPI.framework/TencentOpenAPI
+++ b/ios/Libraries/TencentOpenAPI.framework/TencentOpenAPI
--- a/ios/tencent_kit.podspec
+++ b/ios/tencent_kit.podspec
@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
  s.name             = 'tencent_kit'
-  s.version          = '2.1.0'
+  s.version          = '2.1.1'
  s.summary          = 'A powerful Flutter plugin allowing developers to auth/share with natvie Android & iOS Tencent SDKs.'
  s.description      = <<-DESC
 A powerful Flutter plugin allowing developers to auth/share with natvie Android & iOS Tencent SDKs.
@ -18,7 +18,7 @@ A powerful Flutter plugin allowing developers to auth/share with natvie Android
  s.dependency 'Flutter'
  s.platform = :ios, '8.0'

-  # v3.5.1
+  # v3.5.3
  s.subspec 'vendor' do |sp|
    sp.vendored_frameworks = 'Libraries/*.framework'
    sp.frameworks = 'Security', 'SystemConfiguration', 'CoreGraphics', 'CoreTelephony', 'WebKit'
@ -26,6 +26,6 @@ A powerful Flutter plugin allowing developers to auth/share with natvie Android
    sp.requires_arc = true
  end
  
-  # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
-  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
 end
--- a/pubspec.lock
+++ b/pubspec.lock
@ -28,7 +28,7 @@ packages:
      name: async
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
  boolean_selector:
    dependency: transitive
    description:
@ -351,7 +351,7 @@ packages:
      name: source_span
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
  stack_trace:
    dependency: transitive
    description:
@ -393,7 +393,7 @@ packages:
      name: test_api
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
  timing:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,6 +1,6 @@
 name: tencent_kit
 description: A powerful Flutter plugin allowing developers to auth/share with natvie Android & iOS Tencent SDKs.
-version: 2.1.0
+version: 2.1.1
 # author: v7lin <v7lin@qq.com>
 homepage: https://github.com/v7lin/fake_tencent