com.taptap.sdk.core 4.3.8-alpha.2 → 4.3.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Mobile/Editor/NativeDependencies.xml +3 -3
- package/Mobile/Runtime/IOSNativeWrapper.cs +3 -3
- package/Mobile/Runtime/TapCoreMobile.cs +3 -3
- package/Runtime/Internal/Init/IInitTask.cs +2 -2
- package/Runtime/Internal/Platform/ITapCorePlatform.cs +2 -2
- package/Runtime/Public/TapTapSDK.cs +7 -7
- package/Runtime/Public/{TapTapSDKCoreOptions.cs → TapTapSdkOptions.cs} +2 -2
- package/Standalone/Runtime/Internal/Openlog/TapOpenlogHttpClient.cs +11 -10
- package/Standalone/Runtime/Internal/Openlog/TapOpenlogStandalone.cs +3 -3
- package/Standalone/Runtime/Public/TapCoreStandalone.cs +3 -3
- package/package.json +1 -1
- package/link.xml +0 -4
- package/link.xml.meta +0 -7
- /package/Runtime/Public/{TapTapSDKCoreOptions.cs.meta → TapTapSdkOptions.cs.meta} +0 -0
|
@@ -5,17 +5,17 @@
|
|
|
5
5
|
<repositories>
|
|
6
6
|
<repository>https://repo.maven.apache.org/maven2</repository>
|
|
7
7
|
</repositories>
|
|
8
|
-
<androidPackage spec="com.taptap.sdk:tap-core-unity:4.3.
|
|
8
|
+
<androidPackage spec="com.taptap.sdk:tap-core-unity:4.3.10"/>
|
|
9
9
|
</androidPackages>
|
|
10
10
|
|
|
11
11
|
<!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
|
|
12
12
|
<iosPods>
|
|
13
13
|
<sources>
|
|
14
|
-
<source>
|
|
14
|
+
<source>https://github.com/CocoaPods/Specs.git</source>
|
|
15
15
|
</sources>
|
|
16
16
|
|
|
17
17
|
<iosPod name="Protobuf" version="~> 3.0" bitcodeEnabled="false" addToAllTargets="false"/>
|
|
18
|
-
<iosPod name="TapTapCoreSDK" version="~> 4.3.
|
|
18
|
+
<iosPod name="TapTapCoreSDK" version="~> 4.3.10" bitcodeEnabled="false" addToAllTargets="false"/>
|
|
19
19
|
|
|
20
20
|
</iosPods>
|
|
21
21
|
|
|
@@ -93,7 +93,7 @@ namespace TapSDK.Core.Mobile {
|
|
|
93
93
|
private static extern void _TapTapSDKCoreSwitchToRND();
|
|
94
94
|
|
|
95
95
|
// 提供给 Unity 调用的 C# 方法
|
|
96
|
-
public static void Init(
|
|
96
|
+
public static void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
|
|
97
97
|
{
|
|
98
98
|
// 将其他选项转换为JSON字符串
|
|
99
99
|
string otherOptionsJson = ConvertOtherOptionsToJson(otherOptions);
|
|
@@ -105,7 +105,7 @@ namespace TapSDK.Core.Mobile {
|
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
// 提供给 Unity 调用的 C# 方法
|
|
108
|
-
public static void Init(
|
|
108
|
+
public static void Init(TapTapSdkOptions coreOption)
|
|
109
109
|
{
|
|
110
110
|
// 调用C方法
|
|
111
111
|
_TapTapSDKInit(
|
|
@@ -221,7 +221,7 @@ namespace TapSDK.Core.Mobile {
|
|
|
221
221
|
return null;
|
|
222
222
|
}
|
|
223
223
|
|
|
224
|
-
private static string ConvertOtherOptionsToJson(
|
|
224
|
+
private static string ConvertOtherOptionsToJson(TapTapSdkBaseOptions[] otherOptions)
|
|
225
225
|
{
|
|
226
226
|
if (otherOptions == null || otherOptions.Length == 0)
|
|
227
227
|
{
|
|
@@ -21,7 +21,7 @@ namespace TapSDK.Core.Mobile
|
|
|
21
21
|
EngineBridgeInitializer.Initialize();
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
public void Init(
|
|
24
|
+
public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
|
|
25
25
|
{
|
|
26
26
|
Debug.Log("TapCoreMobile SDK inited");
|
|
27
27
|
SetPlatformAndVersion(TapTapSDK.SDKPlatform, TapTapSDK.Version);
|
|
@@ -54,9 +54,9 @@ namespace TapSDK.Core.Mobile
|
|
|
54
54
|
.CommandBuilder());
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
public void Init(
|
|
57
|
+
public void Init(TapTapSdkOptions coreOption)
|
|
58
58
|
{
|
|
59
|
-
Init(coreOption, new
|
|
59
|
+
Init(coreOption, new TapTapSdkBaseOptions[0]);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
public void UpdateLanguage(TapTapLanguageType language)
|
|
@@ -10,9 +10,9 @@ namespace TapSDK.Core.Internal.Init {
|
|
|
10
10
|
/// 初始化
|
|
11
11
|
/// </summary>
|
|
12
12
|
/// <param name="config"></param>
|
|
13
|
-
void Init(
|
|
13
|
+
void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions);
|
|
14
14
|
|
|
15
|
-
void Init(
|
|
15
|
+
void Init(TapTapSdkOptions coreOption);
|
|
16
16
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -3,9 +3,9 @@ using System.Threading.Tasks;
|
|
|
3
3
|
|
|
4
4
|
namespace TapSDK.Core.Internal {
|
|
5
5
|
public interface ITapCorePlatform {
|
|
6
|
-
void Init(
|
|
6
|
+
void Init(TapTapSdkOptions config);
|
|
7
7
|
|
|
8
|
-
void Init(
|
|
8
|
+
void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions);
|
|
9
9
|
|
|
10
10
|
void UpdateLanguage(TapTapLanguageType language);
|
|
11
11
|
}
|
|
@@ -11,11 +11,11 @@ using TapSDK.Core.Internal.Log;
|
|
|
11
11
|
|
|
12
12
|
namespace TapSDK.Core {
|
|
13
13
|
public class TapTapSDK {
|
|
14
|
-
public static readonly string Version = "4.3.
|
|
15
|
-
|
|
14
|
+
public static readonly string Version = "4.3.10";
|
|
15
|
+
|
|
16
16
|
public static string SDKPlatform = "TapSDK-Unity";
|
|
17
17
|
|
|
18
|
-
public static
|
|
18
|
+
public static TapTapSdkOptions taptapSdkOptions;
|
|
19
19
|
private static ITapCorePlatform platformWrapper;
|
|
20
20
|
|
|
21
21
|
private static bool disableDurationStatistics;
|
|
@@ -32,12 +32,12 @@ namespace TapSDK.Core {
|
|
|
32
32
|
"TapSDK.Core") as ITapCorePlatform;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
public static void Init(
|
|
35
|
+
public static void Init(TapTapSdkOptions coreOption) {
|
|
36
36
|
if (coreOption == null)
|
|
37
37
|
throw new ArgumentException("[TapSDK] options is null!");
|
|
38
38
|
if (string.IsNullOrEmpty(coreOption.clientId))
|
|
39
39
|
throw new ArgumentException("[TapSDK] clientID is null or empty!");
|
|
40
|
-
TapTapSDK.
|
|
40
|
+
TapTapSDK.taptapSdkOptions = coreOption;
|
|
41
41
|
TapLog.Enabled = coreOption.enableLog;
|
|
42
42
|
platformWrapper?.Init(coreOption);
|
|
43
43
|
// 初始化各个模块
|
|
@@ -56,13 +56,13 @@ namespace TapSDK.Core {
|
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
public static void Init(
|
|
59
|
+
public static void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions){
|
|
60
60
|
if (coreOption == null)
|
|
61
61
|
throw new ArgumentException("[TapSDK] options is null!");
|
|
62
62
|
if (string.IsNullOrEmpty(coreOption.clientId))
|
|
63
63
|
throw new ArgumentException("[TapSDK] clientID is null or empty!");
|
|
64
64
|
|
|
65
|
-
TapTapSDK.
|
|
65
|
+
TapTapSDK.taptapSdkOptions = coreOption;
|
|
66
66
|
TapLog.Enabled = coreOption.enableLog;
|
|
67
67
|
platformWrapper?.Init(coreOption,otherOptions);
|
|
68
68
|
|
|
@@ -3,7 +3,7 @@ using Newtonsoft.Json;
|
|
|
3
3
|
|
|
4
4
|
namespace TapSDK.Core
|
|
5
5
|
{
|
|
6
|
-
public interface
|
|
6
|
+
public interface TapTapSdkBaseOptions
|
|
7
7
|
{
|
|
8
8
|
string moduleName { get; }
|
|
9
9
|
|
|
@@ -36,7 +36,7 @@ namespace TapSDK.Core
|
|
|
36
36
|
vi// 越南语
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
public class
|
|
39
|
+
public class TapTapSdkOptions : TapTapSdkBaseOptions
|
|
40
40
|
{
|
|
41
41
|
/// <summary>
|
|
42
42
|
/// 客户端 ID,开发者后台获取
|
|
@@ -40,16 +40,17 @@ namespace TapSDK.Core.Standalone.Internal
|
|
|
40
40
|
|
|
41
41
|
public TapOpenlogHttpClient()
|
|
42
42
|
{
|
|
43
|
-
var ip = "http://172.26.200.194:8888";
|
|
44
|
-
ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) =>
|
|
45
|
-
{
|
|
46
|
-
|
|
47
|
-
};
|
|
48
|
-
HttpClientHandler clientHandler = new HttpClientHandler
|
|
49
|
-
{
|
|
50
|
-
|
|
51
|
-
};
|
|
52
|
-
client = new System.Net.Http.HttpClient(clientHandler);
|
|
43
|
+
// var ip = "http://172.26.200.194:8888";
|
|
44
|
+
// ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) =>
|
|
45
|
+
// {
|
|
46
|
+
// return true;
|
|
47
|
+
// };
|
|
48
|
+
// HttpClientHandler clientHandler = new HttpClientHandler
|
|
49
|
+
// {
|
|
50
|
+
// Proxy = new WebProxy(ip)
|
|
51
|
+
// };
|
|
52
|
+
// client = new System.Net.Http.HttpClient(clientHandler);
|
|
53
|
+
client = new System.Net.Http.HttpClient();
|
|
53
54
|
}
|
|
54
55
|
|
|
55
56
|
public async Task<bool> Post(string path, byte[] content)
|
|
@@ -112,13 +112,13 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
|
|
|
112
112
|
// 应用版本字符串
|
|
113
113
|
generalParameter[TapOpenlogParamConstants.PARAM_APP_VERSION] = Application.version;
|
|
114
114
|
// 应用版本(数字)
|
|
115
|
-
generalParameter[TapOpenlogParamConstants.PARAM_APP_VERSION_CODE] =
|
|
115
|
+
generalParameter[TapOpenlogParamConstants.PARAM_APP_VERSION_CODE] = "";
|
|
116
116
|
// 固定一个枚举值: TapSDK
|
|
117
117
|
generalParameter[TapOpenlogParamConstants.PARAM_PN] = "TapSDK";
|
|
118
118
|
// SDK 产物类型
|
|
119
119
|
generalParameter[TapOpenlogParamConstants.PARAM_TAPSDK_ARTIFACT] = "Unity";
|
|
120
120
|
// SDK 运行平台
|
|
121
|
-
generalParameter[TapOpenlogParamConstants.PARAM_PLATFORM] =
|
|
121
|
+
generalParameter[TapOpenlogParamConstants.PARAM_PLATFORM] = "PC";
|
|
122
122
|
// 埋点版本号(预留字段),当前全为1
|
|
123
123
|
generalParameter[TapOpenlogParamConstants.PARAM_TRACK_CODE] = "1";
|
|
124
124
|
// SDK生成的设备一次安装的唯一标识
|
|
@@ -164,7 +164,7 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
|
|
|
164
164
|
{
|
|
165
165
|
|
|
166
166
|
// 客户端时区,eg:Asia/Shanghai
|
|
167
|
-
props[TapOpenlogParamConstants.PARAM_TIMEZONE] =
|
|
167
|
+
props[TapOpenlogParamConstants.PARAM_TIMEZONE] = "";
|
|
168
168
|
// SDK接入项目具体模块枚举值
|
|
169
169
|
props[TapOpenlogParamConstants.PARAM_TAPSDK_PROJECT] = sdkProjectName;
|
|
170
170
|
// SDK 模块版本号
|
|
@@ -17,7 +17,7 @@ namespace TapSDK.Core.Standalone
|
|
|
17
17
|
internal static Prefs Prefs;
|
|
18
18
|
internal static Tracker Tracker;
|
|
19
19
|
internal static User User;
|
|
20
|
-
internal static
|
|
20
|
+
internal static TapTapSdkOptions coreOptions;
|
|
21
21
|
public static bool isRnd = false;
|
|
22
22
|
internal static bool enableAutoEvent = true;
|
|
23
23
|
|
|
@@ -46,7 +46,7 @@ namespace TapSDK.Core.Standalone
|
|
|
46
46
|
/// Initializes the TapCore SDK with the specified options.
|
|
47
47
|
/// </summary>
|
|
48
48
|
/// <param name="options">The TapCore SDK options.</param>
|
|
49
|
-
public void Init(
|
|
49
|
+
public void Init(TapTapSdkOptions options)
|
|
50
50
|
{
|
|
51
51
|
Init(options, null);
|
|
52
52
|
}
|
|
@@ -56,7 +56,7 @@ namespace TapSDK.Core.Standalone
|
|
|
56
56
|
/// </summary>
|
|
57
57
|
/// <param name="coreOption">The TapCore SDK core options.</param>
|
|
58
58
|
/// <param name="otherOptions">Additional TapCore SDK options.</param>
|
|
59
|
-
public void Init(
|
|
59
|
+
public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
|
|
60
60
|
{
|
|
61
61
|
Debug.Log("SDK inited with other options + " + coreOption.ToString() + coreOption.ToString());
|
|
62
62
|
coreOptions = coreOption;
|
package/package.json
CHANGED
package/link.xml
DELETED
package/link.xml.meta
DELETED
|
File without changes
|