Merge branch 'master' of gitlab.iut-clermont.uca.fr:cldupland/thegameextreme

master
Baptiste ARNAUD 5 years ago
commit d172b7b1de

@ -27,6 +27,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MvvmCross.Plugins.BLE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MvvmCross.Plugin.BLE.2.1.1\lib\netstandard2.0\MvvmCross.Plugins.BLE.dll</HintPath>
</Reference>
<Reference Include="Plugin.BLE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.BLE.2.1.1\lib\netstandard2.0\Plugin.BLE.dll</HintPath>
</Reference>
<Reference Include="Plugin.BLE.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.BLE.2.1.1\lib\netstandard2.0\Plugin.BLE.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MvvmCross.Plugin.BLE" version="2.1.1" targetFramework="net472" />
<package id="NUnit" version="3.12.0" targetFramework="net472" />
<package id="Plugin.BLE" version="2.1.1" targetFramework="net472" />
<package id="TouchTracking" version="1.1.0" targetFramework="net472" />
<package id="TouchTracking.Forms" version="1.1.0" targetFramework="net472" />
<package id="Xamarin.Forms" version="3.0.0.446417" targetFramework="net472" />

@ -6,6 +6,7 @@ using Android.Runtime;
using Android.Views;
using Android.Widget;
using Android.OS;
using Xamarin.Forms;
namespace TheGameExtreme.Droid
{
@ -30,5 +31,7 @@ namespace TheGameExtreme.Droid
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
}
}
}

@ -3,6 +3,13 @@
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<application android:label="TheGameExtreme.Android" android:icon="@drawable/TrierImageB"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
</manifest>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

@ -48,6 +48,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@ -56,6 +57,9 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross.Plugin.BLE">
<Version>2.1.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Foundation;
using Foundation;
using UIKit;
namespace TheGameExtreme.iOS
@ -20,6 +16,7 @@ namespace TheGameExtreme.iOS
//
// You have 17 seconds to return from this method, or iOS will terminate your application.
//
public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{
global::Xamarin.Forms.Forms.Init();

@ -19,6 +19,24 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIBackgroundModes</key>
<array>
<!--for connecting to devices (client)-->
<string>bluetooth-central</string>
<!--for server configurations if needed-->
<string>bluetooth-peripheral</string>
</array>
<!--Description of the Bluetooth request message (required on iOS 10, deprecated)-->
<key>NSBluetoothPeripheralUsageDescription</key>
<string>YOUR CUSTOM MESSAGE</string>
<!--Description of the Bluetooth request message (required on iOS 13)-->
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Wallah</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
<key>CFBundleDisplayName</key>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 360 KiB

@ -137,6 +137,9 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MvvmCross.Plugin.BLE">
<Version>2.1.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
<PackageReference Include="SkiaSharp.Views.Forms">

@ -6,6 +6,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MvvmCross" Version="6.4.1" />
<PackageReference Include="MvvmCross.Plugin.BLE" Version="2.1.1" />
<PackageReference Include="Plugin.BLE" Version="2.1.1" />
<PackageReference Include="System.Drawing.Common" Version="4.6.1" />
<PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />

@ -33,7 +33,7 @@
HorizontalTextAlignment="Center"
Grid.Column="1" Grid.Row="0"/>
<Button Text="Connexion Bluetooth"
<!--<Button Text="Connexion Bluetooth"
Grid.Row="1"
Grid.Column="1"
WidthRequest="230"
@ -51,8 +51,30 @@
VerticalOptions="Center"
HorizontalOptions="Center"
CornerRadius="10"
BackgroundColor="{DynamicResource SkyBlueColor}"/>-->
<!--<Button Text="bouton statue"
Clicked="BtnStatueClicked"
Grid.Row="1"
Grid.Column="0"
WidthRequest="230"
HeightRequest="57"
VerticalOptions="Center"
HorizontalOptions="Center"
CornerRadius="10"
BackgroundColor="{DynamicResource SkyBlueColor}"/>
<Button Text="bouton scan"
Clicked="BtnScanClicked"
Grid.Row="1"
Grid.Column="1"
WidthRequest="230"
HeightRequest="57"
VerticalOptions="Center"
HorizontalOptions="Center"
CornerRadius="10"
BackgroundColor="{DynamicResource SkyBlueColor}"/>-->
</Grid>
</ContentPage>

@ -1,21 +1,55 @@
using System;
using System.Collections.Generic;
using MvvmCross;
using Plugin.BLE;
using Plugin.BLE.Abstractions.Contracts;
using System;
using System.Collections.ObjectModel;
using Xamarin.Forms;
namespace TheGameExtreme.view
{
public partial class MultiPlayerMode : ContentPage
{
/*IBluetoothLE ble;
IAdapter adapter;
ObservableCollection<IDevice> devicesList;
IDevice device;*/
public MultiPlayerMode()
{
InitializeComponent();
NavigationPage.SetHasNavigationBar(this, false);
/*ble = CrossBluetoothLE.Current;
adapter = CrossBluetoothLE.Current.Adapter;
devicesList = new ObservableCollection<IDevice>();*/
}
private async void BackMulti_Clicked(object sender, EventArgs e)
/*private async void BackMulti_Clicked(object sender, EventArgs e)
{
await Navigation.PopAsync();
}
public void BtnStatueClicked(object sender, EventArgs args)
{
var state = ble.State;
this.DisplayAlert("Notice", state.ToString(), "ok");
}
public async void BtnScanClicked(object sender, EventArgs args)
{
devicesList.Clear();
adapter.DeviceDiscovered += (s, a) =>
{
devicesList.Add(a.Device);
};
if (!ble.Adapter.IsScanning)
{
await adapter.StartScanningForDevicesAsync();
}
}*/
}
}

@ -45,6 +45,15 @@
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Plugins.BLE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MvvmCross.Plugin.BLE.2.1.1\lib\netstandard2.0\MvvmCross.Plugins.BLE.dll</HintPath>
</Reference>
<Reference Include="Plugin.BLE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.BLE.2.1.1\lib\netstandard2.0\Plugin.BLE.dll</HintPath>
</Reference>
<Reference Include="Plugin.BLE.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plugin.BLE.2.1.1\lib\netstandard2.0\Plugin.BLE.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>

@ -2,4 +2,6 @@
<packages>
<package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net472" />
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net472" />
<package id="MvvmCross.Plugin.BLE" version="2.1.1" targetFramework="net472" />
<package id="Plugin.BLE" version="2.1.1" targetFramework="net472" />
</packages>
Loading…
Cancel
Save