Skip to content

Commit 6f7745f

Browse files
tugcearartugcearar
authored
Merge pull request #2 from HMS-Core/feature/analytics-6.0.0.300
Analytics v6.0.0.300
2 parents e2713f0 + 6865578 commit 6f7745f

File tree

114 files changed

+14800
-780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+14800
-780
lines changed

‎README.md‎

Lines changed: 12 additions & 12 deletions
Large diffs are not rendered by default.

‎android/dependencies.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var AGC_VERSION="1.4.2.301";
22
var TASK_VERSION="1.4.1.300";
3-
var OPEN_DEVICE_VERSION="5.0.4.300";
3+
var OPEN_DEVICE_VERSION="5.1.1.301";
44
var BASE_VERSION="5.2.0.300";
55
var NETWORK_VERSION="4.0.20.301";
66
var UPDATE_VERSION="3.0.1.300";

‎android/main-components.cake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ new ArtifactInfo("awareness-common","1.0.7.303","hms","aar")
1010

1111

1212
var HIANALYTICS_ARTIFACTS = new List<ArtifactInfo> {
13-
new ArtifactInfo("hianalytics-framework","5.0.5.300","hms","jar"),
14-
new ArtifactInfo("hianalytics-core","5.0.5.300","hms","jar"),
15-
new ArtifactInfo("hianalytics","5.0.5.300","hms","aar")
13+
new ArtifactInfo("hianalytics-framework","6.0.0.300","hms","jar"),
14+
new ArtifactInfo("hianalytics-core","6.0.0.300","hms","jar"),
15+
new ArtifactInfo("hianalytics","6.0.0.300","hms","aar")
1616
};
1717

1818

‎android/nuspecs/Huawei.Hms.Hianalytics.6.0.0.300.nuspec‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
2+
<metadata>
3+
<id>Huawei.Hms.Hianalytics</id>
4+
<version>6.0.0.300</version>
5+
<title>Huawei.Hms.Hianalytics</title>
6+
<authors>Huawei</authors>
7+
<owners>Huawei</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="file">LICENSE.txt</license>
10+
<projectUrl>https://github.com/HMS-Core/hms-xamarin-bindings</projectUrl>
11+
<icon>huawei.png</icon>
12+
<description>Xamarin.Android bindings for HMS Core - Hianalytics</description>
13+
<copyright>© Huawei Technologies Co., Ltd. All rights reserved.</copyright>
14+
<tags>Huawei Hms Hianalytics</tags>
15+
<dependencies>
16+
<group targetFramework="MonoAndroid9.0">
17+
<dependency id="Huawei.Hms.HianalyticsCore" version="6.0.0.300" />
18+
<dependency id="Huawei.Hms.HianalyticsFramework" version="6.0.0.300" />
19+
<dependency id="Huawei.Agconnect.AgconnectCredential" version="1.5.0.300" />
20+
<dependency id="Huawei.Hms.Opendevice" version="5.1.1.301" />
21+
<dependency id="XGreenDao.Droid" version="3.3.0" />
22+
</group>
23+
</dependencies>
24+
<frameworkAssemblies>
25+
<frameworkAssembly assemblyName="Java.Interop" targetFramework="MonoAndroid9.0" />
26+
</frameworkAssemblies>
27+
</metadata>
28+
<files>
29+
<file src="bin/Release/Huawei.Hms.Analytics.dll" target="lib/monoandroid90/Huawei.Hms.Analytics.dll" />
30+
<file src="../../icons/huawei.png" target="" />
31+
<file src="../../README.md" target="" />
32+
<file src="THIRD PARTY OPEN SOURCE SOFTWARE NOTICE.txt" target="THIRD PARTY OPEN SOURCE SOFTWARE NOTICE.txt" />
33+
<file src="../../LICENSE.txt" target="" />
34+
</files>
35+
</package>

‎android/nuspecs/Huawei.Hms.HianalyticsCore.6.0.0.300.nuspec‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
2+
<metadata>
3+
<id>Huawei.Hms.HianalyticsCore</id>
4+
<version>6.0.0.300</version>
5+
<title>Huawei.Hms.HianalyticsCore</title>
6+
<authors>Huawei</authors>
7+
<owners>Huawei</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="file">LICENSE.txt</license>
10+
<projectUrl>https://github.com/HMS-Core/hms-xamarin-bindings</projectUrl>
11+
<icon>huawei.png</icon>
12+
<description>Xamarin.Android bindings for HMS Core - HianalyticsCore</description>
13+
<copyright>© Huawei Technologies Co., Ltd. All rights reserved.</copyright>
14+
<tags>Huawei Hms HianalyticsCore</tags>
15+
<dependencies>
16+
<group targetFramework="MonoAndroid9.0" />
17+
</dependencies>
18+
<frameworkAssemblies>
19+
<frameworkAssembly assemblyName="Java.Interop" targetFramework="MonoAndroid9.0" />
20+
</frameworkAssemblies>
21+
</metadata>
22+
<files>
23+
<file src="bin/Release/Huawei.Hms.HianalyticsCore.dll" target="lib/monoandroid90/Huawei.Hms.HianalyticsCore.dll" />
24+
<file src="../../icons/huawei.png" target="" />
25+
<file src="../../LICENSE.txt" target="" />
26+
</files>
27+
</package>

‎android/nuspecs/Huawei.Hms.HianalyticsFramework.6.0.0.300.nuspec‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
2+
<metadata>
3+
<id>Huawei.Hms.HianalyticsFramework</id>
4+
<version>6.0.0.300</version>
5+
<title>Huawei.Hms.HianalyticsFramework</title>
6+
<authors>Huawei</authors>
7+
<owners>Huawei</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="file">LICENSE.txt</license>
10+
<projectUrl>https://github.com/HMS-Core/hms-xamarin-bindings</projectUrl>
11+
<icon>huawei.png</icon>
12+
<description>Xamarin.Android bindings for HMS Core - HianalyticsFramework</description>
13+
<copyright>© Huawei Technologies Co., Ltd. All rights reserved.</copyright>
14+
<tags>Huawei Hms HianalyticsFramework</tags>
15+
<dependencies>
16+
<group targetFramework="MonoAndroid9.0">
17+
<dependency id="Huawei.Hms.HianalyticsCore" version="6.0.0.300" />
18+
</group>
19+
</dependencies>
20+
<frameworkAssemblies>
21+
<frameworkAssembly assemblyName="Java.Interop" targetFramework="MonoAndroid9.0" />
22+
</frameworkAssemblies>
23+
</metadata>
24+
<files>
25+
<file src="bin/Release/Huawei.Hms.HianalyticsFramework.dll" target="lib/monoandroid90/Huawei.Hms.HianalyticsFramework.dll" />
26+
<file src="../../icons/huawei.png" target="" />
27+
<file src="../../LICENSE.txt" target="" />
28+
</files>
29+
</package>

‎android/samples/.docs/mainPageAndroidScan.jpg‎

239 KB
Loading

‎android/samples/HiAnalyticsDemo/BaseActivity.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020. Huawei. Technologies Co., Ltd. All rights reserved.
2+
* Copyright 2020-2021. Huawei. Technologies Co., Ltd. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

‎android/samples/HiAnalyticsDemo/Data/QuizData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020. Huawei. Technologies Co., Ltd. All rights reserved.
2+
* Copyright 2020-2021. Huawei. Technologies Co., Ltd. All rights reserved.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

‎android/samples/HiAnalyticsDemo/HiAnalyticsXamarinAndroidDemo.csproj‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,20 @@
4848
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
4949
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
5050
<EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
51-
<AndroidKeyStore>true</AndroidKeyStore>
51+
<AndroidKeyStore>false</AndroidKeyStore>
5252
<AotAssemblies>false</AotAssemblies>
5353
<EnableLLVM>false</EnableLLVM>
5454
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
5555
<BundleAssemblies>false</BundleAssemblies>
5656
<AndroidDexTool>d8</AndroidDexTool>
57-
<AndroidSigningKeyStore>D:\keystores\all.keystore</AndroidSigningKeyStore>
58-
<AndroidSigningStorePass>123456</AndroidSigningStorePass>
59-
<AndroidSigningKeyAlias>all</AndroidSigningKeyAlias>
60-
<AndroidSigningKeyPass>123456</AndroidSigningKeyPass>
57+
<AndroidSigningKeyStore>
58+
</AndroidSigningKeyStore>
59+
<AndroidSigningStorePass>
60+
</AndroidSigningStorePass>
61+
<AndroidSigningKeyAlias>
62+
</AndroidSigningKeyAlias>
63+
<AndroidSigningKeyPass>
64+
</AndroidSigningKeyPass>
6165
</PropertyGroup>
6266
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
6367
<DebugSymbols>True</DebugSymbols>
@@ -77,6 +81,15 @@
7781
<BundleAssemblies>false</BundleAssemblies>
7882
<AndroidDexTool>d8</AndroidDexTool>
7983
<AndroidLinkTool>r8</AndroidLinkTool>
84+
<AndroidKeyStore>false</AndroidKeyStore>
85+
<AndroidSigningKeyStore>
86+
</AndroidSigningKeyStore>
87+
<AndroidSigningStorePass>
88+
</AndroidSigningStorePass>
89+
<AndroidSigningKeyAlias>
90+
</AndroidSigningKeyAlias>
91+
<AndroidSigningKeyPass>
92+
</AndroidSigningKeyPass>
8093
</PropertyGroup>
8194
<ItemGroup>
8295
<Reference Include="System" />
@@ -129,7 +142,7 @@
129142
</ItemGroup>
130143
<ItemGroup>
131144
<PackageReference Include="Huawei.Hms.Hianalytics">
132-
<Version>5.0.5.300</Version>
145+
<Version>6.0.0.300</Version>
133146
</PackageReference>
134147
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
135148
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />

0 commit comments

Comments
 (0)