PHXH
/
TapLogin-Unity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop/2.x' into feat/tdsuser 

# Conflicts:
#	Assets/LCLibs/Common.dll.meta
#	Assets/LCLibs/TapBootstrap_2.1.7.aar
#	Assets/LCLibs/TapBootstrap_2.1.7.aar.meta
#	Assets/TapTap/Bootstrap/Plugins/Android/libs/TapBootstrap_2.1.6.aar.meta
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.dll
#	Assets/TapTap/Bootstrap/Plugins/TapTap.Bootstrap.pdb
#	Assets/TapTap/Bootstrap/Plugins/iOS/TapBootstrapSDK.framework/Headers/TapBootstrap.h
#	Assets/TapTap/Bootstrap/Plugins/iOS/TapBootstrapSDK.framework/TapBootstrapSDK
#	Assets/TapTap/Common/Plugins/Android/libs/TapCommon_2.1.7.aar.meta
#	Assets/TapTap/Common/Plugins/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/TapTap.Common.pdb
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.dll
#	Assets/TapTap/Common/Plugins/iOS/TapTap.Common.pdb
#	Assets/TapTap/Friends/Plugins/TapTap.Friends.dll
#	Assets/TapTap/Friends/Plugins/TapTap.Friends.pdb
#	Assets/TapTap/License/Plugins/TapTap.License.dll
#	Assets/TapTap/License/Plugins/TapTap.License.pdb
#	Assets/TapTap/Login/Editor/TapLoginIOSProcessor.cs
#	Assets/TapTap/Login/Plugins/TapTap.Login.dll
#	Assets/TapTap/Login/Plugins/TapTap.Login.pdb
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.dll
#	Assets/TapTap/Moment/Plugins/TapTap.Moment.pdb
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/TapTap.TapDB.pdb
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.dll
#	Assets/TapTap/TapDB/Plugins/iOS/TapTap.TapDB.pdb
#	TapSDK2-Unity.sln
xiaoyi 2021-07-15 11:49:07 +08:00
parent a7477bffd3
commit f46676a0dc
17 changed files with 132 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,5 +1,15 @@
# ChangeLog
## 2.1.7
### Optimization
- 更新 iOS 拦截 openUrl 方式
### Dependencies
- TapTap.Common v2.1.7
### 2.1.6
### Optimization and fixed bugs

3
Editor.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 66c985194a5444c2a336b60bdb132f74
timeCreated: 1617120951

39
Editor/TapLoginIOSProcessor.cs
View File

@ -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 <TapLoginSDK/TapLoginHelper.h>");
unityAppController.WriteBelow(
@"id sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey], annotation = options[UIApplicationOpenURLOptionsAnnotationKey];",
@"if(url){[TapLoginHelper handleTapTapOpenURL:url];}");
Debug.Log("TapLogin Change AppController File!");
}
}
}

3
Editor/TapLoginIOSProcessor.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 50ded018333a4dc8ba19e7806c5bc693
timeCreated: 1617120951

16
Editor/TapTap.Login.Editor.asmdef
View File

@ -1,16 +0,0 @@
{
"name": "TapTap.Login.Editor",
"references": [
"TapTap.Common.Editor"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}

7
Editor/TapTap.Login.Editor.asmdef.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: a9157d20880b14db485aa407a4532958
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Plugins/Android/libs/TapLogin_2.1.6.aar
View File

Binary file not shown.

BIN
Plugins/Android/libs/TapLogin_2.1.7.aar Normal file
View File

Binary file not shown.

2
Plugins/Android/libs/TapLogin_2.1.6.aar.meta → Plugins/Android/libs/TapLogin_2.1.7.aar.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9e62cc398bc3a4ac0bc623eb5be3ecfd
guid: 4f760d0eb799d4f9284e36590280d5a6
PluginImporter:
externalObjects: {}
serializedVersion: 2

16
Plugins/iOS/TapLoginDelegate.h Normal file
View File

@ -0,0 +1,16 @@
//
// TapDelegate.h
// Unity-iPhone
//
// Created by xe on 2021/7/14.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface TapLoginDelegate : NSObject
@end
NS_ASSUME_NONNULL_END

27
Plugins/iOS/TapLoginDelegate.h.meta Normal file
View File

@ -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:

33
Plugins/iOS/TapLoginDelegate.mm Normal file
View File

@ -0,0 +1,33 @@
//
// TapDelegate.m
// Unity-iPhone
//
// Created by xe on 2021/7/14.
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <UserNotifications/UserNotifications.h>
#include "AppDelegateListener.h"
#include "LifeCycleListener.h"
#import "TapLoginDelegate.h"
#import <TapLoginSDK/TapLoginHelper.h>
@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<NSString*, id> class]]) {
NSURL* url = [note.userInfo objectForKey:@"url"];
[TapLoginHelper handleTapTapOpenURL:url];
}
}];
});
}
@end

37
Plugins/iOS/TapLoginDelegate.mm.meta Normal file
View File

@ -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:

4
Plugins/iOS/TapLoginSDK.framework/Headers/TapLoginHelper.h
View File

@ -14,8 +14,8 @@
#import <TapLoginSDK/TapTapLoginResultDelegate.h>
#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

BIN
Plugins/iOS/TapLoginSDK.framework/TapLoginSDK
View File

Binary file not shown.

7
VERSIONNOTE.md
View File

@ -1,6 +1,7 @@
### Optimization and fixed bugs
- 修复 TapTap 授权登录的一些 UI 问题
### Optimization
- 更新 iOS 拦截 openUrl 方式
### Dependencies
- TapTap.Common v2.1.6
- TapTap.Common v2.1.7

4
package.json
View File

@ -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"
}
}