diff --git a/CHANGELOG.md b/CHANGELOG.md index b789429..84bc299 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # ChangeLog +## 2.1.7 + +### Optimization + +- 更新 iOS 拦截 openUrl 方式 + +### Dependencies + +- TapTap.Common v2.1.7 + ### 2.1.6 ### Optimization and fixed bugs diff --git a/Editor.meta b/Editor.meta deleted file mode 100644 index 6b5494f..0000000 --- a/Editor.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 66c985194a5444c2a336b60bdb132f74 -timeCreated: 1617120951 \ No newline at end of file diff --git a/Editor/TapLoginIOSProcessor.cs b/Editor/TapLoginIOSProcessor.cs deleted file mode 100644 index a09143a..0000000 --- a/Editor/TapLoginIOSProcessor.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.IO; -using TapTap.Common.Editor; -using UnityEditor; -using UnityEditor.Callbacks; -using UnityEngine; - -namespace TapTap.Login.Editor -{ - public static class TapLoginIOSProcessor - { - [PostProcessBuild(102)] - public static void OnPostprocessBuild(BuildTarget buildTarget, string path) - { - if (buildTarget != BuildTarget.iOS) return; - - var parentFolder = Directory.GetParent(Application.dataPath).FullName; - - var plistFile = TapFileHelper.RecursionFilterFile(parentFolder + "/Assets/Plugins/", "TDS-Info.plist"); - - if (!plistFile.Exists) - { - Debug.LogError("TapLogin Can't find TDS-Info.plist in Project/Assets/Plugins/!"); - } - - TapCommonCompile.HandlerPlist(path, plistFile.FullName); - - // UnityAppController.mm 中对于 URLScheme 的处理 - var unityAppControllerPath = path + "/Classes/UnityAppController.mm"; - var unityAppController = new TapFileHelper(unityAppControllerPath); - unityAppController.WriteBelow(@"#import ""UnityAppController.h""", - @"#import "); - unityAppController.WriteBelow( - @"id sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey], annotation = options[UIApplicationOpenURLOptionsAnnotationKey];", - @"if(url){[TapLoginHelper handleTapTapOpenURL:url];}"); - - Debug.Log("TapLogin Change AppController File!"); - } - } -} \ No newline at end of file diff --git a/Editor/TapLoginIOSProcessor.cs.meta b/Editor/TapLoginIOSProcessor.cs.meta deleted file mode 100644 index 5b770de..0000000 --- a/Editor/TapLoginIOSProcessor.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 50ded018333a4dc8ba19e7806c5bc693 -timeCreated: 1617120951 \ No newline at end of file diff --git a/Editor/TapTap.Login.Editor.asmdef b/Editor/TapTap.Login.Editor.asmdef deleted file mode 100644 index 8d5ef25..0000000 --- a/Editor/TapTap.Login.Editor.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "TapTap.Login.Editor", - "references": [ - "TapTap.Common.Editor" - ], - "optionalUnityReferences": [], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [] -} \ No newline at end of file diff --git a/Editor/TapTap.Login.Editor.asmdef.meta b/Editor/TapTap.Login.Editor.asmdef.meta deleted file mode 100644 index b4da319..0000000 --- a/Editor/TapTap.Login.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a9157d20880b14db485aa407a4532958 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Plugins/Android/libs/TapLogin_2.1.6.aar b/Plugins/Android/libs/TapLogin_2.1.6.aar deleted file mode 100644 index 564c6b8..0000000 Binary files a/Plugins/Android/libs/TapLogin_2.1.6.aar and /dev/null differ diff --git a/Plugins/Android/libs/TapLogin_2.1.7.aar b/Plugins/Android/libs/TapLogin_2.1.7.aar new file mode 100644 index 0000000..e759a12 Binary files /dev/null and b/Plugins/Android/libs/TapLogin_2.1.7.aar differ diff --git a/Plugins/Android/libs/TapLogin_2.1.6.aar.meta b/Plugins/Android/libs/TapLogin_2.1.7.aar.meta similarity index 93% rename from Plugins/Android/libs/TapLogin_2.1.6.aar.meta rename to Plugins/Android/libs/TapLogin_2.1.7.aar.meta index 4955cba..d816137 100644 --- a/Plugins/Android/libs/TapLogin_2.1.6.aar.meta +++ b/Plugins/Android/libs/TapLogin_2.1.7.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e62cc398bc3a4ac0bc623eb5be3ecfd +guid: 4f760d0eb799d4f9284e36590280d5a6 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Plugins/iOS/TapLoginDelegate.h b/Plugins/iOS/TapLoginDelegate.h new file mode 100644 index 0000000..78d854e --- /dev/null +++ b/Plugins/iOS/TapLoginDelegate.h @@ -0,0 +1,16 @@ +// +// TapDelegate.h +// Unity-iPhone +// +// Created by xe on 2021/7/14. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface TapLoginDelegate : NSObject + +@end + +NS_ASSUME_NONNULL_END diff --git a/Plugins/iOS/TapLoginDelegate.h.meta b/Plugins/iOS/TapLoginDelegate.h.meta new file mode 100644 index 0000000..cedd818 --- /dev/null +++ b/Plugins/iOS/TapLoginDelegate.h.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: 1ba65c0b770334300b580504da745029 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/iOS/TapLoginDelegate.mm b/Plugins/iOS/TapLoginDelegate.mm new file mode 100644 index 0000000..dff776a --- /dev/null +++ b/Plugins/iOS/TapLoginDelegate.mm @@ -0,0 +1,33 @@ +// +// TapDelegate.m +// Unity-iPhone +// +// Created by xe on 2021/7/14. +// + +#import +#import +#import +#include "AppDelegateListener.h" +#include "LifeCycleListener.h" +#import "TapLoginDelegate.h" +#import + +@implementation TapLoginDelegate + ++(void) load{ + static dispatch_once_t onceToken; + dispatch_once(&onceToken,^{ + + NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; + [nc addObserverForName:kUnityOnOpenURL object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * _Nonnull note) { + if ([note.userInfo isKindOfClass: [NSMutableDictionary class]]) { + NSURL* url = [note.userInfo objectForKey:@"url"]; + [TapLoginHelper handleTapTapOpenURL:url]; + } + }]; + + }); +} + +@end diff --git a/Plugins/iOS/TapLoginDelegate.mm.meta b/Plugins/iOS/TapLoginDelegate.mm.meta new file mode 100644 index 0000000..2a949de --- /dev/null +++ b/Plugins/iOS/TapLoginDelegate.mm.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 0af51bed1409b4086b50ed729b8c78ef +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + - first: + tvOS: tvOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/iOS/TapLoginSDK.framework/Headers/TapLoginHelper.h b/Plugins/iOS/TapLoginSDK.framework/Headers/TapLoginHelper.h index 464492a..32563b3 100644 --- a/Plugins/iOS/TapLoginSDK.framework/Headers/TapLoginHelper.h +++ b/Plugins/iOS/TapLoginSDK.framework/Headers/TapLoginHelper.h @@ -14,8 +14,8 @@ #import #define TapLoginSDK @"TapLogin" -#define TapLoginSDK_VERSION_NUMBER @"20106001" -#define TapLoginSDK_VERSION @"2.1.6" +#define TapLoginSDK_VERSION_NUMBER @"20107001" +#define TapLoginSDK_VERSION @"2.1.7" NS_ASSUME_NONNULL_BEGIN diff --git a/Plugins/iOS/TapLoginSDK.framework/TapLoginSDK b/Plugins/iOS/TapLoginSDK.framework/TapLoginSDK index 839d531..2031c27 100644 Binary files a/Plugins/iOS/TapLoginSDK.framework/TapLoginSDK and b/Plugins/iOS/TapLoginSDK.framework/TapLoginSDK differ diff --git a/VERSIONNOTE.md b/VERSIONNOTE.md index 5e4d7fd..1c05d68 100644 --- a/VERSIONNOTE.md +++ b/VERSIONNOTE.md @@ -1,6 +1,7 @@ -### Optimization and fixed bugs -- 修复 TapTap 授权登录的一些 UI 问题 +### Optimization + +- 更新 iOS 拦截 openUrl 方式 ### Dependencies -- TapTap.Common v2.1.6 \ No newline at end of file +- TapTap.Common v2.1.7 \ No newline at end of file diff --git a/package.json b/package.json index eec4345..46a3191 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "com.taptap.tds.login", "displayName": "TapTap Login", "description": "TapTap Develop Service", - "version": "2.1.6", + "version": "3.0.0", "unity": "2018.3", "license": "MIT", "dependencies": { - "com.taptap.tds.common": "https://github.com/TapTap/TapCommon-Unity.git#2.1.6" + "com.taptap.tds.common": "https://github.com/TapTap/TapCommon-Unity.git#3.0.0" } } \ No newline at end of file