dotnet
/
windows-sdk-for-google-analytics
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixes Windows desktop Win32 user-agent.

This commit is contained in:
Tim Greenfield 2017-02-04 15:29:45 -08:00
Родитель 3d64002212
Коммит 8301f1560d
2 изменённых файлов: 30 добавлений и 21 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

27
src/Managed/GoogleAnalytics.UWP/PlatformInfoProvider.cs
Просмотреть файл

@ -4,6 +4,7 @@ using Windows.ApplicationModel;
using Windows.Devices.Input;
using Windows.Graphics.Display;
using Windows.Storage;
using Windows.System;
using Windows.System.Profile;
using Windows.UI.Core;
using Windows.UI.Xaml;
@ -170,7 +171,6 @@ namespace GoogleAnalytics
ulong v2 = (v & 0x0000FFFF00000000L) >> 32;
string systemVersion = $"{v1}.{v2}";
string architecture = Package.Current.Id.Architecture.ToString();
switch (ai.DeviceFamily)
{
@ -179,17 +179,20 @@ namespace GoogleAnalytics
// This: Mozilla/5.0 (Windows NT 10.0; Win64; X64; Microsoft Corporation; Surface Pro 4)
String uaArchitecture;
if (architecture == "X64")
switch (Package.Current.Id.Architecture)
{
uaArchitecture = "Win64; X64";
}
else if (architecture == "X86")
{
uaArchitecture = "Win86; X86";
}
else
{
uaArchitecture = architecture;
case ProcessorArchitecture.X64:
uaArchitecture = "Win64; X64";
break;
case ProcessorArchitecture.X86:
uaArchitecture = "Win32; X86";
break;
case ProcessorArchitecture.Arm:
uaArchitecture = "ARM";
break;
default:
uaArchitecture = "Win64; X64";
break;
}
return $"Mozilla/5.0 (Windows NT {systemVersion}; {uaArchitecture}; {sysInfo.SystemManufacturer}; {sysInfo.SystemProductName})";
@ -204,7 +207,7 @@ namespace GoogleAnalytics
return $"Mozilla/5.0 (Windows NT {systemVersion}; Win64; X64; Xbox; {sysInfo.SystemProductName})";
default:
return $"Mozilla/5.0 (Windows {systemVersion}; {architecture}; {sysInfo.SystemManufacturer}; {sysInfo.SystemProductName})";
return $"Mozilla/5.0 (Windows {systemVersion}; {Package.Current.Id.Architecture.ToString()}; {sysInfo.SystemManufacturer}; {sysInfo.SystemProductName})";
}
}
}

24
src/Native/GoogleAnalytics.UWP/PlatformInfoProvider.cpp
Просмотреть файл

@ -10,6 +10,7 @@
using namespace GoogleAnalytics;
using namespace Platform;
using namespace Windows::System;
using namespace Windows::UI::Core;
using namespace Windows::UI::ViewManagement;
using namespace Windows::Foundation;
@ -226,7 +227,6 @@ String^ PlatformInfoProvider::ConstructUserAgent()
{
auto sysInfo = ref new Windows::Security::ExchangeActiveSyncProvisioning::EasClientDeviceInformation();
auto package = Windows::ApplicationModel::Package::Current;
String^ architecture = package->Id->Architecture.ToString();
auto ai = Windows::System::Profile::AnalyticsInfo::VersionInfo;
String^ sv = ai->DeviceFamilyVersion;
@ -237,14 +237,20 @@ String^ PlatformInfoProvider::ConstructUserAgent()
if (ai->DeviceFamily == "Windows.Desktop") {
String^ uaArchitecture;
if (architecture == "X64") {
switch (package->Id->Architecture)
{
case ProcessorArchitecture::X64:
uaArchitecture = "Win64; X64";
}
else if(architecture == "X86") {
uaArchitecture = "Win86; X86";
}
else {
uaArchitecture = architecture;
break;
case ProcessorArchitecture::X86:
uaArchitecture = "Win32; X86";
break;
case ProcessorArchitecture::Arm:
uaArchitecture = "ARM";
break;
default:
uaArchitecture = "Win64; X64";
break;
}
return "Mozilla/5.0 (Windows NT " + systemVersion + "; " + uaArchitecture + "; " + sysInfo->SystemManufacturer + "; " + sysInfo->SystemProductName + ")";
}
@ -255,6 +261,6 @@ String^ PlatformInfoProvider::ConstructUserAgent()
return "Mozilla/5.0 (Windows NT " + systemVersion + "; Win64; X64; Xbox; " + sysInfo->SystemProductName + ")";
}
else {
return "Mozilla/5.0 (Windows " + systemVersion + "; " + architecture + "; " + sysInfo->SystemManufacturer + "; " + sysInfo->SystemProductName + ")";
return "Mozilla/5.0 (Windows " + systemVersion + "; " + package->Id->Architecture.ToString() + "; " + sysInfo->SystemManufacturer + "; " + sysInfo->SystemProductName + ")";
}
}