备份

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -43,8 +43,6 @@
 		18C78C5624E24421001208F2 /* ZKControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C78C4C24E24421001208F2 /* ZKControl.m */; };
 		18C78C5724E24421001208F2 /* ZKPrivacyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C78C4D24E24421001208F2 /* ZKPrivacyView.m */; };
 		18C9D8E7219A5F9F001AC829 /* UITabBar+badge.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C9D8E6219A5F9F001AC829 /* UITabBar+badge.m */; };
-		18E05CF922F11CDE001E5B44 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 18E05CF322F11CDD001E5B44 /* README.txt */; };
-		18E05CFA22F11CDE001E5B44 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18E05CF522F11CDD001E5B44 /* libWeChatSDK.a */; };
 		18E05CFB22F11CDE001E5B44 /* AlipaySDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 18E05CF722F11CDD001E5B44 /* AlipaySDK.bundle */; };
 		18E05CFC22F11CDE001E5B44 /* AlipaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18E05CF822F11CDD001E5B44 /* AlipaySDK.framework */; };
 		18E05CFE22F11D4E001E5B44 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18E05CFD22F11D4E001E5B44 /* CoreMotion.framework */; };
@@ -58,6 +56,8 @@
 		18E05D1022F11D97001E5B44 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18E05D0F22F11D97001E5B44 /* Foundation.framework */; };
 		18EF1114232F683C006D4579 /* UIDevice+Hardware.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EF1113232F683B006D4579 /* UIDevice+Hardware.m */; };
 		761BCA63272A816900259676 /* JYNewMessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 761BCA62272A816900259676 /* JYNewMessViewController.m */; };
+		761BCA72272AA0CE00259676 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 761BCA6F272AA0CE00259676 /* README.txt */; };
+		761BCA73272AA0CE00259676 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 761BCA71272AA0CE00259676 /* libWeChatSDK.a */; };
 		9ADF6A094C6E01A55F2E47CC /* libPods-JianYuIOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CA962A24EED00910F83394E /* libPods-JianYuIOS.a */; };
 		C519972C2020238D007946E8 /* LXUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = C51997232020238D007946E8 /* LXUserDefaults.m */; };
 		C519972D2020238D007946E8 /* LXMD5.m in Sources */ = {isa = PBXBuildFile; fileRef = C51997242020238D007946E8 /* LXMD5.m */; };
@@ -160,11 +160,6 @@
 		18C78C5224E24421001208F2 /* ZKPrivacyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZKPrivacyView.h; sourceTree = "<group>"; };
 		18C9D8E5219A5F9F001AC829 /* UITabBar+badge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UITabBar+badge.h"; sourceTree = "<group>"; };
 		18C9D8E6219A5F9F001AC829 /* UITabBar+badge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITabBar+badge.m"; sourceTree = "<group>"; };
-		18E05CF122F11CDD001E5B44 /* WXApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApi.h; sourceTree = "<group>"; };
-		18E05CF222F11CDD001E5B44 /* WXApiObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiObject.h; sourceTree = "<group>"; };
-		18E05CF322F11CDD001E5B44 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
-		18E05CF422F11CDD001E5B44 /* WechatAuthSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WechatAuthSDK.h; sourceTree = "<group>"; };
-		18E05CF522F11CDD001E5B44 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeChatSDK.a; sourceTree = "<group>"; };
 		18E05CF722F11CDD001E5B44 /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = "<group>"; };
 		18E05CF822F11CDD001E5B44 /* AlipaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlipaySDK.framework; sourceTree = "<group>"; };
 		18E05CFD22F11D4E001E5B44 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
@@ -181,6 +176,11 @@
 		18EF1113232F683B006D4579 /* UIDevice+Hardware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIDevice+Hardware.m"; sourceTree = "<group>"; };
 		761BCA61272A816900259676 /* JYNewMessViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYNewMessViewController.h; sourceTree = "<group>"; };
 		761BCA62272A816900259676 /* JYNewMessViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JYNewMessViewController.m; sourceTree = "<group>"; };
+		761BCA6D272AA0CE00259676 /* WXApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApi.h; sourceTree = "<group>"; };
+		761BCA6E272AA0CE00259676 /* WXApiObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiObject.h; sourceTree = "<group>"; };
+		761BCA6F272AA0CE00259676 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
+		761BCA70272AA0CE00259676 /* WechatAuthSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WechatAuthSDK.h; sourceTree = "<group>"; };
+		761BCA71272AA0CE00259676 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeChatSDK.a; sourceTree = "<group>"; };
 		775098970477D1E68FB48E59 /* Pods-JianYuIOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JianYuIOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JianYuIOS/Pods-JianYuIOS.debug.xcconfig"; sourceTree = "<group>"; };
 		C51997222020238D007946E8 /* LXViewControllerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXViewControllerManager.h; sourceTree = "<group>"; };
 		C51997232020238D007946E8 /* LXUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXUserDefaults.m; sourceTree = "<group>"; };
@@ -233,11 +233,11 @@
 				18E05D0222F11D62001E5B44 /* libc++.tbd in Frameworks */,
 				18E05CFE22F11D4E001E5B44 /* CoreMotion.framework in Frameworks */,
 				C550BF362018591400F0BC2A /* CoreGraphics.framework in Frameworks */,
+				761BCA73272AA0CE00259676 /* libWeChatSDK.a in Frameworks */,
 				182493C1255B8A3100BF4AB2 /* libc.tbd in Frameworks */,
 				18E05CFC22F11CDE001E5B44 /* AlipaySDK.framework in Frameworks */,
 				C550BF342018590A00F0BC2A /* libsqlite3.tbd in Frameworks */,
 				1849F8FA248B6E94008F9023 /* JavaScriptCore.framework in Frameworks */,
-				18E05CFA22F11CDE001E5B44 /* libWeChatSDK.a in Frameworks */,
 				9ADF6A094C6E01A55F2E47CC /* libPods-JianYuIOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -345,24 +345,12 @@
 		18E05CEF22F11CDD001E5B44 /* Libs(第三方) */ = {
 			isa = PBXGroup;
 			children = (
-				18E05CF022F11CDD001E5B44 /* WeChatSDK1.8.4 */,
+				761BCA6C272AA0CE00259676 /* WeChatSDK1.9.2 */,
 				18E05CF622F11CDD001E5B44 /* AlipaySDK */,
 			);
 			path = "Libs(第三方)";
 			sourceTree = "<group>";
 		};
-		18E05CF022F11CDD001E5B44 /* WeChatSDK1.8.4 */ = {
-			isa = PBXGroup;
-			children = (
-				18E05CF122F11CDD001E5B44 /* WXApi.h */,
-				18E05CF222F11CDD001E5B44 /* WXApiObject.h */,
-				18E05CF322F11CDD001E5B44 /* README.txt */,
-				18E05CF422F11CDD001E5B44 /* WechatAuthSDK.h */,
-				18E05CF522F11CDD001E5B44 /* libWeChatSDK.a */,
-			);
-			path = WeChatSDK1.8.4;
-			sourceTree = "<group>";
-		};
 		18E05CF622F11CDD001E5B44 /* AlipaySDK */ = {
 			isa = PBXGroup;
 			children = (
@@ -381,6 +369,18 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		761BCA6C272AA0CE00259676 /* WeChatSDK1.9.2 */ = {
+			isa = PBXGroup;
+			children = (
+				761BCA6D272AA0CE00259676 /* WXApi.h */,
+				761BCA6E272AA0CE00259676 /* WXApiObject.h */,
+				761BCA6F272AA0CE00259676 /* README.txt */,
+				761BCA70272AA0CE00259676 /* WechatAuthSDK.h */,
+				761BCA71272AA0CE00259676 /* libWeChatSDK.a */,
+			);
+			path = WeChatSDK1.9.2;
+			sourceTree = "<group>";
+		};
 		954256EB2ECEF2507E4350ED /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -639,6 +639,7 @@
 			files = (
 				182ECCFD22FD223A00FFC79E /* logo.png in Resources */,
 				18C78C4624E24407001208F2 /* NoNetView.xib in Resources */,
+				761BCA72272AA0CE00259676 /* README.txt in Resources */,
 				C5D01D7E20282543007F207E /* back_normal@2x.png in Resources */,
 				18E05CFB22F11CDE001E5B44 /* AlipaySDK.bundle in Resources */,
 				C5FE4B5220468AED00CC8A2F /* noNet@2x.png in Resources */,
@@ -646,7 +647,6 @@
 				C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */,
 				C5BE6E472011D99100F28B36 /* LaunchScreen.storyboard in Resources */,
 				C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */,
-				18E05CF922F11CDE001E5B44 /* README.txt in Resources */,
 				C5BE6E422011D99100F28B36 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -927,7 +927,7 @@
 				CODE_SIGN_ENTITLEMENTS = "JianYuIOS/剑鱼标讯Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 69;
+				CURRENT_PROJECT_VERSION = 70;
 				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -947,8 +947,9 @@
 					"$(PROJECT_DIR)/JianYuIOS/ThirdSDK/UMSocial/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/JianYuIOS/ThirdSDK/UMSocial/UMSocialSDKPlugin",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4",
+					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.9.2",
 				);
-				MARKETING_VERSION = 3.0.3;
+				MARKETING_VERSION = 3.0.4;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1010,7 +1011,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 69;
+				CURRENT_PROJECT_VERSION = 70;
 				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1030,8 +1031,9 @@
 					"$(PROJECT_DIR)/JianYuIOS/ThirdSDK/UMSocial/SocialLibraries/QQ",
 					"$(PROJECT_DIR)/JianYuIOS/ThirdSDK/UMSocial/UMSocialSDKPlugin",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4",
+					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.9.2",
 				);
-				MARKETING_VERSION = 3.0.3;
+				MARKETING_VERSION = 3.0.4;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -23,8 +23,9 @@
 #import "ZKGuideView.h"
 #import "JYKeyCustom.h"
 #import <WebKit/WebKit.h>
+#import "WXApi.h"
 //JPUSHRegisterDelegate
-@interface AppDelegate ()<WXApiDelegate,UNUserNotificationCenterDelegate>
+@interface AppDelegate ()<UIApplicationDelegate, WXApiDelegate,UNUserNotificationCenterDelegate>
 
 @property(nonatomic, strong)UIImageView *imgView;
 @property (nonatomic,weak)NSTimer *timerClick;
@@ -106,7 +107,7 @@
     [[UMSocialManager defaultManager] setUmSocialAppkey:@"5a685423f43e4833e500003e"];
     [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:@"wx0e6a5b18f4cfd10d" appSecret:@"bf12200554cb6edeb2be69d49dc11a3e" redirectURL:nil];
     [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_QQ appKey:@"1106703118"appSecret:@"MYFVJZhtygWy5hzh" redirectURL:@"http://mobile.umeng.com/social"];
-    [WXApi registerApp:@"wx0e6a5b18f4cfd10d"];
+    [WXApi registerApp:@"wx0e6a5b18f4cfd10d" universalLink:@"https:web-wky.jydev.jianyu360.com/"];
 }
 
 #pragma mark   ****处理接收通知情况****

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewExpViewController.m

@@ -853,7 +853,9 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     request.sign= dic[@"Sign"];
     
     kMainQueue(^{
-        [WXApi sendReq:request];
+        [WXApi sendReq:request completion:^(BOOL success) {
+            
+        }];
     });
 }
 -(void)jsAliPay:(NSDictionary *)dict {

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewMineViewController.m

@@ -864,7 +864,9 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     request.sign= dic[@"Sign"];
     
     kMainQueue(^{
-        [WXApi sendReq:request];
+        [WXApi sendReq:request completion:^(BOOL success) {
+            
+        }];
     });
 }
 -(void)jsAliPay:(NSDictionary *)dict {

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSearchViewController.m

@@ -1101,7 +1101,9 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     request.sign= dic[@"Sign"];
     
     kMainQueue(^{
-        [WXApi sendReq:request];
+        [WXApi sendReq:request completion:^(BOOL success) {
+            
+        }];
     });
 }
 -(void)jsAliPay:(NSDictionary *)dict {

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSubViewController.m

@@ -855,7 +855,9 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     request.sign= dic[@"Sign"];
     
     kMainQueue(^{
-        [WXApi sendReq:request];
+        [WXApi sendReq:request completion:^(BOOL success) {
+            
+        }];
     });
 }
 -(void)jsAliPay:(NSDictionary *)dict {

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -77,6 +77,7 @@
 		<string>mqqwpa</string>
 		<string>wechat</string>
 		<string>weixin</string>
+		<string>weixinULAPI</string>
 		<string>mqqapi</string>
 		<string>mqq</string>
 		<string>snssdk1128</string>

ios/JianYuIOS/JianYuIOS/JianYuIOS.entitlements

@@ -2,11 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:www.jianyu360.com</string>
+		<string>applinks:web-wky.jydev.jianyu360.com</string>
 	</array>
-	<key>aps-environment</key>
-	<string>development</string>
 </dict>
 </plist>

ios/JianYuIOS/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4/README.txt → ios/JianYuIOS/JianYuIOS/Libs(第三方)/WeChatSDK1.9.2/README.txt

@@ -1,4 +1,41 @@
 重要!
+
+SDK1.9.2
+1. 新增发起企微客服会话能力
+
+SDK1.9.1
+1. 音乐视频分享类型增加运营H5字段
+
+SDK1.8.9
+1. 增加音乐视频分享类型
+
+SDK1.8.8
+1. 增加游戏直播消息类型
+
+SDK1.8.7.1
+1. 修复Xcode11以下编译不通过
+
+SDK1.8.7
+1. 修复iPadOS，未安装微信的情况下，因为UA问题无法授权登录
+2. 修复未安装微信的情况下, 适配了UIScene的App因为UIAlertView Crash
+3. 增加Universal Link检测函数
+
+SDK1.8.6.2
+1. 修改包含"UIWebView"字符的类名
+
+SDK1.8.6.1
+1.短信授权登录使用的UIWebview切换成WKWebview
+
+SDK1.8.6
+1. 支持Universal Link拉起微信以及返回App
+2. SDK移除MTA库
+
+SDK1.8.5
+1. 更换MTA库:取消对剪切板的访问, 防止和其他SDK竞争导致crash
+2. NSMutableArray的MTA分类方法改名，减少命名冲突
+3. 不含支付功能版本移除非税支付和医保支付接口
+4. 分享音乐支持填写歌词和高清封面图
+
 SDK1.8.4
 1. 调整分享图片大小限制
 2. 新增openBusinessView接口

ios/JianYuIOS/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4/WXApi.h → ios/JianYuIOS/JianYuIOS/Libs(第三方)/WeChatSDK1.9.2/WXApi.h

@@ -48,6 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
 #pragma mark - WXApi
 
 /*! @brief 微信Api接口函数类
@@ -58,38 +59,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 /*! @brief WXApi的成员函数，向微信终端程序注册第三方应用。
  *
- * 需要在每次启动第三方应用程序时调用。第一次调用后，会在微信的可用应用列表中出现，默认开启MTA数据上报。
- * iOS7及以上系统需要调起一次微信才会出现在微信的可用应用列表中。
- * @attention 请保证在主线程中调用此函数
- * @param appid 微信开发者ID
- * @param typeFlag 应用支持打开的文件类型
- * @return 成功返回YES，失败返回NO。
- */
-+ (BOOL)registerApp:(NSString *)appid;
-
-/*! @brief WXApi的成员函数，向微信终端程序注册第三方应用。
- *
- * 需要在每次启动第三方应用程序时调用。第一次调用后，会在微信的可用应用列表中出现。
- * iOS7及以上系统需要调起一次微信才会出现在微信的可用应用列表中。
+ * 需要在每次启动第三方应用程序时调用。
  * @attention 请保证在主线程中调用此函数
  * @param appid 微信开发者ID
- * @param isEnableMTA 是否支持MTA数据上报
+ * @param universalLink 微信开发者Universal Link
  * @return 成功返回YES，失败返回NO。
  */
-+ (BOOL)registerApp:(NSString *)appid enableMTA:(BOOL)isEnableMTA;
++ (BOOL)registerApp:(NSString *)appid universalLink:(NSString *)universalLink;
 
 
-/*! @brief WXApi的成员函数，向微信终端程序注册应用支持打开的文件类型。
- *
- * 需要在每次启动第三方应用程序时调用。调用后并第一次成功分享数据到微信后，会在微信的可用应用列表中出现。
- * @see registerApp
- * @param typeFlag 应用支持打开的数据类型, enAppSupportContentFlag枚举类型 “|” 操作后结果
- */
-+ (void)registerAppSupportContentFlag:(UInt64)typeFlag;
-
-
-
-/*! @brief 处理微信通过URL启动App时传递的数据
+/*! @brief 处理旧版微信通过URL启动App时传递的数据
  *
  * 需要在 application:openURL:sourceApplication:annotation:或者application:handleOpenURL中调用。
  * @param url 微信启动第三方应用时传递过来的URL
@@ -99,6 +78,15 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL)handleOpenURL:(NSURL *)url delegate:(nullable id<WXApiDelegate>)delegate;
 
 
+/*! @brief 处理微信通过Universal Link启动App时传递的数据
+ *
+ * 需要在 application:continueUserActivity:restorationHandler:中调用。
+ * @param userActivity 微信启动第三方应用时系统API传递过来的userActivity
+ * @param delegate  WXApiDelegate对象，用来接收微信触发的消息。
+ * @return 成功返回YES，失败返回NO。
+ */
++ (BOOL)handleOpenUniversalLink:(NSUserActivity *)userActivity delegate:(nullable id<WXApiDelegate>)delegate;
+
 
 /*! @brief 检查微信是否已被用户安装
  *
@@ -115,6 +103,13 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL)isWXAppSupportApi;
 
 
+/*! @brief 判断当前微信的版本是否支持分享微信状态功能
+ *
+ * @attention 需在工程LSApplicationQueriesSchemes配置中添加weixinStateAPI
+ * @return 支持返回YES，不支持返回NO。
+ */
++ (BOOL)isWXAppSupportStateAPI;
+
 
 /*! @brief 获取微信的itunes安装地址
  *
@@ -144,30 +139,42 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * 函数调用后，会切换到微信的界面。第三方应用程序等待微信返回onResp。微信在异步处理完成后一定会调用onResp。支持以下类型
  * SendAuthReq、SendMessageToWXReq、PayReq等。
- * @param req 具体的发送请求，在调用函数后，请自己释放。
- * @return 成功返回YES，失败返回NO。
+ * @param req 具体的发送请求。
+ * @param completion 调用结果回调block
+ */
++ (void)sendReq:(BaseReq *)req completion:(void (^ __nullable)(BOOL success))completion;
+
+/*! @brief 收到微信onReq的请求，发送对应的应答给微信，并切换到微信界面
+ *
+ * 函数调用后，会切换到微信的界面。第三方应用程序收到微信onReq的请求，异步处理该请求，完成后必须调用该函数。可能发送的相应有
+ * GetMessageFromWXResp、ShowMessageFromWXResp等。
+ * @param resp 具体的应答内容
+ * @param completion 调用结果回调block
  */
-+ (BOOL)sendReq:(BaseReq*)req;
++ (void)sendResp:(BaseResp*)resp completion:(void (^ __nullable)(BOOL success))completion;
+
 
 /*! @brief 发送Auth请求到微信，支持用户没安装微信，等待微信返回onResp
  *
  * 函数调用后，会切换到微信的界面。第三方应用程序等待微信返回onResp。微信在异步处理完成后一定会调用onResp。支持SendAuthReq类型。
- * @param req 具体的发送请求，在调用函数后，请自己释放。
+ * @param req 具体的发送请求。
  * @param viewController 当前界面对象。
  * @param delegate  WXApiDelegate对象，用来接收微信触发的消息。
- * @return 成功返回YES，失败返回NO。
+ * @param completion 调用结果回调block
  */
-+ (BOOL)sendAuthReq:(SendAuthReq*)req viewController:(UIViewController*)viewController delegate:(nullable id<WXApiDelegate>)delegate;
++ (void)sendAuthReq:(SendAuthReq *)req viewController:(UIViewController*)viewController delegate:(nullable id<WXApiDelegate>)delegate completion:(void (^ __nullable)(BOOL success))completion;
 
 
-/*! @brief 收到微信onReq的请求，发送对应的应答给微信，并切换到微信界面
+/*! @brief 测试函数，用于排查当前App通过Universal Link方式分享到微信的流程
+    注意1:  调用自检函数之前必须要先调用registerApp:universalLink接口, 并确认调用成功
+    注意2:  自检过程中会有Log产生，可以先调用startLogByLevel函数，根据Log排查问题
+    注意3:  会多次回调block
+    注意4:  仅用于新接入SDK时调试使用，请勿在正式环境的调用
  *
- * 函数调用后，会切换到微信的界面。第三方应用程序收到微信onReq的请求，异步处理该请求，完成后必须调用该函数。可能发送的相应有
- * GetMessageFromWXResp、ShowMessageFromWXResp等。
- * @param resp 具体的应答内容，调用函数后，请自己释放
- * @return 成功返回YES，失败返回NO。
+ *  当completion回调的step为WXULCheckStepFinal时，表示检测通过，Universal Link接入成功
+ *  @param completion 回调Block
  */
-+ (BOOL)sendResp:(BaseResp*)resp;
++ (void)checkUniversalLinkReady:(nonnull WXCheckULCompletion)completion;
 
 
 /*! @brief WXApi的成员函数，接受微信的log信息。byBlock
@@ -177,6 +184,7 @@ NS_ASSUME_NONNULL_BEGIN
  *  @param level 打印log的级别
  *  @param logBlock 打印log的回调block
  */
+
 + (void)startLogByLevel:(WXLogLevel)level logBlock:(WXLogBolock)logBlock;
 
 /*! @brief WXApi的成员函数，接受微信的log信息。byDelegate 
@@ -191,6 +199,7 @@ NS_ASSUME_NONNULL_BEGIN
  *  @param 
  */
 + (void)stopLog;
+
 @end
 
 NS_ASSUME_NONNULL_END

ios/JianYuIOS/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4/WXApiObject.h → ios/JianYuIOS/JianYuIOS/Libs(第三方)/WeChatSDK1.9.2/WXApiObject.h

@@ -33,6 +33,7 @@ enum WXScene {
     WXSceneTimeline         = 1,   /**< 朋友圈     */
     WXSceneFavorite         = 2,   /**< 收藏       */
     WXSceneSpecifiedSession = 3,   /**< 指定联系人  */
+    WXSceneState            = 4,   /**< 状态  */
 };
 
 
@@ -66,30 +67,6 @@ enum WXMPWebviewType {
     WXMPWebviewType_Ad = 0,        /**< 广告网页 **/
 };
 
-
-
-/*! @brief 应用支持接收微信的文件类型
- *
- */
-typedef NS_ENUM(UInt64, enAppSupportContentFlag) {
-    MMAPP_SUPPORT_NOCONTENT = 0x0,
-    MMAPP_SUPPORT_TEXT      = 0x1,
-    MMAPP_SUPPORT_PICTURE   = 0x2,
-    MMAPP_SUPPORT_LOCATION  = 0x4,
-    MMAPP_SUPPORT_VIDEO     = 0x8,
-    MMAPP_SUPPORT_AUDIO     = 0x10,
-    MMAPP_SUPPORT_WEBPAGE   = 0x20,
-    
-    // Suport File Type
-    MMAPP_SUPPORT_DOC  = 0x40,               // doc
-    MMAPP_SUPPORT_DOCX = 0x80,               // docx
-    MMAPP_SUPPORT_PPT  = 0x100,              // ppt
-    MMAPP_SUPPORT_PPTX = 0x200,              // pptx
-    MMAPP_SUPPORT_XLS  = 0x400,              // xls
-    MMAPP_SUPPORT_XLSX = 0x800,              // xlsx
-    MMAPP_SUPPORT_PDF  = 0x1000,             // pdf
-};
-
 /*! @brief log的级别
  *
  */
@@ -104,6 +81,55 @@ typedef NS_ENUM(NSInteger,WXLogLevel) {
  */
 typedef void(^WXLogBolock)(NSString *log);
 
+/*! @brief 微信Universal Link检查函数 (WXApi#checkUniversalLinkReady:)，检查步骤枚举值
+ *
+ * WXULCheckStepParams 参数检测
+ * WXULCheckStepSystemVersion 当前系统版本检测
+ * WXULCheckStepWechatVersion 微信客户端版本检测
+ * WXULCheckStepSDKInnerOperation 微信SDK内部操作检测
+ * WXULCheckStepLaunchWechat  App拉起微信检测
+ * WXULCheckStepBackToCurrentApp 由微信返回当前App检测
+ * WXULCheckStepFinal 最终结果
+ */
+typedef NS_ENUM(NSInteger, WXULCheckStep)
+{
+    WXULCheckStepParams,
+    WXULCheckStepSystemVersion,
+    WXULCheckStepWechatVersion,
+    WXULCheckStepSDKInnerOperation,
+    WXULCheckStepLaunchWechat,
+    WXULCheckStepBackToCurrentApp,
+    WXULCheckStepFinal,
+};
+
+
+#pragma mark - WXCheckULStepResult
+
+/*! @brief 该类为微信Universal Link检测函数结果类
+*
+*/
+@interface WXCheckULStepResult : NSObject
+
+/** 是否成功 */
+@property(nonatomic, assign) BOOL success;
+/** 当前错误信息 */
+@property(nonatomic, strong) NSString* errorInfo;
+/** 修正建议 */
+@property(nonatomic, strong) NSString* suggestion;
+
+- (instancetype)initWithCheckResult:(BOOL)success errorInfo:(nullable NSString*)errorInfo suggestion:(nullable NSString*)suggestion;
+
+@end
+
+
+/*! @brief 微信Universal Link检查函数 (WXApi#checkUniversalLinkReady:)，回调Block
+ *
+ * @param step 当前检测步骤
+ * @param result 检测结果
+ */
+typedef void(^WXCheckULCompletion)(WXULCheckStep step, WXCheckULStepResult* result);
+
+
 #pragma mark - BaseReq
 /*! @brief 该类为微信终端SDK所有请求类的基类
  *
@@ -112,7 +138,7 @@ typedef void(^WXLogBolock)(NSString *log);
 
 /** 请求类型 */
 @property (nonatomic, assign) int type;
-/** 由用户微信号和AppID组成的唯一标识，发送请求时第三方程序必须填写，用于校验微信用户是否换号登录*/
+/** 由用户微信号和AppID组成的唯一标识，需要校验微信用户是否换号登录时填写*/
 @property (nonatomic, copy) NSString *openID;
 
 @end
@@ -140,6 +166,7 @@ typedef void(^WXLogBolock)(NSString *log);
 
 #ifndef BUILD_WITHOUT_PAY
 
+#pragma mark - PayReq
 /*! @brief 第三方向微信终端发起支付的消息结构体
  *
  *  第三方向微信终端发起支付的消息结构体，微信终端处理后会向第三方返回处理结果
@@ -175,7 +202,6 @@ typedef void(^WXLogBolock)(NSString *log);
 
 @end
 
-
 #pragma mark - WXOfflinePay
 /*! @brief 第三方向微信终端发起离线支付
  *
@@ -193,8 +219,36 @@ typedef void(^WXLogBolock)(NSString *log);
 
 @end
 
-#endif
 
+#pragma mark - WXNontaxPayReq
+@interface WXNontaxPayReq:BaseReq
+
+@property (nonatomic, copy) NSString *urlString;
+
+@end
+
+#pragma mark - WXNontaxPayResp
+@interface WXNontaxPayResp : BaseResp
+
+@property (nonatomic, copy) NSString *wxOrderId;
+
+@end
+
+#pragma mark - WXPayInsuranceReq
+@interface WXPayInsuranceReq : BaseReq
+
+@property (nonatomic, copy) NSString *urlString;
+
+@end
+
+#pragma mark - WXPayInsuranceResp
+@interface WXPayInsuranceResp : BaseResp
+
+@property (nonatomic, copy) NSString *wxOrderId;
+
+@end
+
+#endif
 
 
 #pragma mark - SendAuthReq
@@ -214,6 +268,7 @@ typedef void(^WXLogBolock)(NSString *log);
  * @note state字符串长度不能超过1K
  */
 @property (nonatomic, copy) NSString *state;
+
 @end
 
 #pragma mark - SendAuthResp
@@ -233,7 +288,55 @@ typedef void(^WXLogBolock)(NSString *log);
 @property (nonatomic, copy, nullable) NSString *country;
 @end
 
+#pragma mark - WXStateJumpInfo
+/*! @brief 状态发表时的小尾巴跳转信息
+ */
+@interface WXStateJumpInfo : NSObject
 
+@end
+
+#pragma mark - WXStateJumpUrlInfo
+/*! @brief 状态小尾巴跳转指定url的信息
+ */
+@interface WXStateJumpUrlInfo : WXStateJumpInfo
+/** 跳转到指定的url
+ * @note 必填，url长度必须大于0且小于10K
+ */
+@property (nonatomic, copy) NSString *url;
+
+@end
+
+#pragma mark - WXStateSceneDataObject
+/*! @brief 场景类型额外参数基类
+ */
+@interface WXSceneDataObject : NSObject
+
+@end
+
+#pragma mark - WXStateSceneDataObject
+/*! @brief 状态场景类型
+ * 用户填写WXStateSceneDataObject参数后，可以跳转到微信状态发表页
+ */
+@interface WXStateSceneDataObject : WXSceneDataObject
+
+/** 状态标志的ID
+ * @note 选填，文本长度必须小于10K
+ */
+@property (nonatomic, copy) NSString *stateId;
+/** 状态发表时附带的文本描述
+ * @note 选填，文本长度必须小于10K
+ */
+@property (nonatomic, copy) NSString *stateTitle;
+/** 后台校验token
+ * @note 选填，文本长度必须小于10K
+ */
+@property (nonatomic, copy) NSString *token;
+/** 小尾巴跳转所需的信息
+ * @note 必填，目前仅支持url跳转
+ */
+@property (nonatomic, strong) WXStateJumpInfo *stateJumpDataInfo;
+
+@end
 
 #pragma mark - SendMessageToWXReq
 /*! @brief 第三方程序发送消息至微信终端程序的消息结构体
@@ -261,6 +364,11 @@ typedef void(^WXLogBolock)(NSString *log);
  * @note WXSceneSpecifiedSession时有效
  */
 @property (nonatomic, copy, nullable) NSString *toUserOpenId;
+/** 目标场景附带信息
+ * @note 目前只针对状态场景
+ */
+@property (nonatomic, strong) WXSceneDataObject *sceneDataObject;
+
 @end
 
 #pragma mark - SendMessageToWXResp
@@ -273,8 +381,6 @@ typedef void(^WXLogBolock)(NSString *log);
 @property(nonatomic, copy) NSString *country;
 @end
 
-
-
 #pragma mark - GetMessageFromWXReq
 /*! @brief 微信终端向第三方程序请求提供内容的消息结构体。
  *
@@ -347,34 +453,6 @@ typedef void(^WXLogBolock)(NSString *log);
 @end
 
 
-
-#pragma mark - OpenTempSessionReq
-/* ! @brief 第三方通知微信，打开临时会话
- *
- * 第三方通知微信，打开临时会话
- */
-@interface OpenTempSessionReq : BaseReq
-/** 需要打开的用户名
- * @attention 长度不能超过512字节
- */
-@property (nonatomic, copy) NSString *username;
-/** 开发者自定义参数，拉起临时会话后会发给开发者后台，可以用于识别场景
- * @attention 长度不能超过32位
- */
-@property (nonatomic, copy) NSString *sessionFrom;
-@end
-
-#pragma mark - OpenTempSessionResp
-/*! @brief 微信终端向第三方程序返回的OpenTempSessionReq处理结果。
- *
- * 第三方程序向微信终端发送OpenTempSessionReq后，微信发送回来的处理结果，该结果用OpenTempSessionResp表示。
- */
-@interface OpenTempSessionResp : BaseResp
-
-@end
-
-
-
 #pragma mark - OpenWebviewReq
 /* ! @brief 第三方通知微信启动内部浏览器，打开指定网页
  *
@@ -456,50 +534,6 @@ typedef void(^WXLogBolock)(NSString *log);
 @end
 
 
-
-#pragma mark - JumpToBizProfileReq
-/* ! @brief 第三方通知微信，打开指定微信号profile页面
- *
- * 第三方通知微信，打开指定微信号profile页面
- */
-@interface JumpToBizProfileReq : BaseReq
-/** 跳转到该公众号的profile
- * @attention 长度不能超过512字节
- */
-@property (nonatomic, copy) NSString *username;
-/** 如果用户加了该公众号为好友，extMsg会上传到服务器
- * @attention 长度不能超过1024字节
- */
-@property (nonatomic, copy, nullable) NSString *extMsg;
-/**
- * 跳转的公众号类型
- * @see WXBizProfileType
- */
-@property (nonatomic, assign) int profileType;
-@end
-
-
-
-#pragma mark - JumpToBizWebviewReq
-/* ! @brief 第三方通知微信，打开指定usrname的profile网页版
- *
- */
-@interface JumpToBizWebviewReq : BaseReq
-/** 跳转的网页类型，目前只支持广告页
- * @see WXMPWebviewType
- */
-@property(nonatomic, assign) int webType;
-/** 跳转到该公众号的profile网页版
- * @attention 长度不能超过512字节
- */
-@property(nonatomic, copy) NSString *tousrname;
-/** 如果用户加了该公众号为好友，extMsg会上传到服务器
- * @attention 长度不能超过1024字节
- */
-@property(nonatomic, copy, nullable) NSString *extMsg;
-
-@end
-
 #pragma mark - WXCardItem
 
 @interface WXCardItem : NSObject
@@ -645,7 +679,7 @@ typedef void(^WXLogBolock)(NSString *log);
 @end
 
 #pragma mark - WXSubscribeMiniProgramMsg
-/** ! @brief 微信返回第三方请求选择发票结果
+/** ! @brief 第三方请求订阅小程序消息
  *
  */
 @interface WXSubscribeMiniProgramMsgReq : BaseReq
@@ -676,34 +710,6 @@ typedef void(^WXLogBolock)(NSString *log);
 
 @end
 
-#pragma mark - WXNontaxPayReq
-@interface WXNontaxPayReq:BaseReq
-
-@property (nonatomic, copy) NSString *urlString;
-
-@end
-
-#pragma mark - WXNontaxPayResp
-@interface WXNontaxPayResp : BaseResp
-
-@property (nonatomic, copy) NSString *wxOrderId;
-
-@end
-
-#pragma mark - WXPayInsuranceReq
-@interface WXPayInsuranceReq : BaseReq
-
-@property (nonatomic, copy) NSString *urlString;
-
-@end
-
-#pragma mark - WXPayInsuranceResp
-@interface WXPayInsuranceResp : BaseResp
-
-@property (nonatomic, copy) NSString *wxOrderId;
-
-@end
-
 #pragma mark - WXMediaMessage
 
 /*! @brief 多媒体消息结构体
@@ -723,7 +729,7 @@ typedef void(^WXLogBolock)(NSString *log);
  */
 @property (nonatomic, copy) NSString *description;
 /** 缩略图数据
- * @note 大小不能超过32K
+ * @note 大小不能超过64K
  */
 @property (nonatomic, strong, nullable) NSData *thumbData;
 /**
@@ -805,6 +811,85 @@ typedef void(^WXLogBolock)(NSString *log);
  */
 @property (nonatomic, copy) NSString *musicLowBandDataUrl;
 
+/**音乐封面图Url
+ * @note 长度不能超过10K
+ */
+@property (nonatomic, copy) NSString *songAlbumUrl;
+
+/**歌词信息 LRC格式
+ * @note 长度不能超过32K
+ */
+@property (nonatomic, copy, nullable) NSString *songLyric;
+@end
+
+
+
+#pragma mark - WXMusicVideoObject
+
+
+@interface WXMusicVideoObject : NSObject
+
+/*! @brief 返回一个WXMusicVideoObject对象
+ *
+ * @note 返回的WXMusicVideoObject对象是自动释放的
+ */
++ (WXMusicVideoObject *)object;
+
+/** 音乐网页的url地址
+ * @note 长度不能超过10K，不能为空
+ */
+@property (nonatomic, copy) NSString *musicUrl;
+
+/** 音乐数据url地址
+ * @note 长度不能超过10K，不能为空
+ */
+@property (nonatomic, copy) NSString *musicDataUrl;
+
+/**歌手名
+ * @note 长度不能超过1k，不能为空
+ */
+@property (nonatomic, copy) NSString *singerName;
+
+/**
+ * @note 音乐时长, 单位毫秒
+ */
+@property (nonatomic, assign) UInt32 duration;
+
+/**歌词信息 LRC格式
+ * @note 长度不能超过32K
+ */
+@property (nonatomic, copy) NSString *songLyric;
+
+/**高清封面图
+ * @note 大小不能超过1M
+ */
+@property (nonatomic, strong) NSData *hdAlbumThumbData;
+
+/**音乐专辑名称
+ * @note 长度不能超过1k
+ */
+@property (nonatomic, copy, nullable) NSString *albumName;
+
+/**音乐流派
+ * @note 长度不能超过1k
+ */
+@property (nonatomic, copy, nullable) NSString *musicGenre;
+
+/**发行时间
+ * @note Unix时间戳，单位为秒
+ */
+@property (nonatomic, assign) UInt64 issueDate;
+
+/**音乐标识符
+ * @note 长度不能超过1K，从微信跳回应用时会带上
+ */
+@property (nonatomic, copy, nullable) NSString *identification;
+
+/**运营H5地址
+ * @note 选填，建议填写，用户进入歌曲详情页将展示内嵌的运营H5，可展示该歌曲的相关评论、歌曲推荐等内容，不可诱导下载、分享等。
+ */
+@property (nonatomic, copy, nullable) NSString *musicOperationUrl;
+
 @end
 
 
@@ -1018,6 +1103,33 @@ typedef void(^WXLogBolock)(NSString *log);
  */
 @property (nonatomic, assign) WXMiniProgramType miniProgramType;
 
+/** 是否禁用转发 */
+@property (nonatomic, assign) BOOL disableForward;
+
+@property (nonatomic, assign) BOOL isUpdatableMessage;
+
+@property (nonatomic, assign) BOOL isSecretMessage;
+
+
+/** 业务所需的额外信息 */
+@property (nonatomic, strong, nullable) NSDictionary *extraInfoDic;
+
+@end
+
+#pragma mark - WXGameLiveObject
+
+/*! @brief WXGameLiveObject对象
+ *
+ * @note 游戏直播消息类型
+ */
+
+@interface WXGameLiveObject : NSObject
+
++ (WXGameLiveObject *)object;
+
+/** 业务所需的额外信息 */
+@property (nonatomic, strong, nullable) NSDictionary *extraInfoDic;
+
 @end
 
 #pragma mark - WXLaunchMiniProgramReq
@@ -1047,6 +1159,12 @@ typedef void(^WXLogBolock)(NSString *log);
  * @attention json格式
  */
 @property (nonatomic, copy, nullable) NSString *extMsg;
+
+/** extDic
+ * @attention 字典，可存放图片等比较大的数据
+ */
+@property (nonatomic, copy, nullable) NSDictionary *extDic;
+
 @end
 
 #pragma mark - WXLaunchMiniProgramResp
@@ -1084,6 +1202,10 @@ typedef void(^WXLogBolock)(NSString *log);
  */
 @property (nonatomic, copy, nullable) NSString *extInfo;
 
+/** extData数据
+ * @note
+ */
+@property (nonatomic, strong, nullable) NSData *extData;
 @end
 
 
@@ -1098,4 +1220,28 @@ typedef void(^WXLogBolock)(NSString *log);
 @property (nonatomic, copy, nullable) NSString *extMsg;
 
 @end
+
+#pragma mark - WXOpenCustomerServiceReq
+@interface WXOpenCustomerServiceReq : BaseReq
+
++ (WXOpenCustomerServiceReq *)object;
+
+/**企微客服发起流程 url
+ */
+@property (nonatomic, copy, nullable) NSString *url;
+
+/**企业 id
+ */
+@property (nonatomic, copy, nullable) NSString *corpid;
+
+@end
+
+@interface WXOpenCustomerServiceResp : BaseResp
+
+/** 业务返回数据
+ */
+@property (nonatomic, copy, nullable) NSString *extMsg;
+
+@end
+
 NS_ASSUME_NONNULL_END

ios/JianYuIOS/JianYuIOS/剑鱼标讯Debug.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:www.jianyu360.com</string>
+		<string>applinks:web-wky.jydev.jianyu360.com</string>
 	</array>
 </dict>
 </plist>

ios/JianYuIOS/Podfile

@@ -8,6 +8,7 @@ pod 'UMengUShare/Social/ReducedWeChat'
 pod 'UMengUShare/Social/ReducedQQ'
 pod 'FMDB'
 pod 'SDWebImage'
+pod 'WechatOpenSDK'
 pod 'iCloudDocumentSync'
 pod 'WBCloudReflectionFaceVerify_framework', :path => './WBCloudReflectionFaceVerify_framework'
 pod 'WBOCRService',:path => './OCR_private_pod' # 引入 OCR SDK