Moved Controls to bottom of screen
authorMichael Lehner <Lehner.Michael43@gmail.com>
Tue, 18 Dec 2018 15:58:13 +0000 (16:58 +0100)
committerMichael Lehner <Lehner.Michael43@gmail.com>
Tue, 18 Dec 2018 15:58:13 +0000 (16:58 +0100)
Optimized to decrease lag
-Only use latest server-pkg and read as fast as possible
-Updating only Text on Pre/Postgame-Pages
Changed Application name
Catched invalid ip input

42 files changed:
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/ConnectionTest.Android.csproj
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/ConnectionTest.Android.csproj.user
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/MainActivity.cs
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/Properties/AndroidManifest.xml
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.Android.dll
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.Android.pdb
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.dll
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.pdb
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/FormsViewGroup.dll.mdb
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/Mono.Android.pdb
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/Xamarin.Forms.Platform.Android.dll.mdb
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/com.companyname.ConnectionTest-Signed.apk
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/com.companyname.ConnectionTest.apk
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/obj/.cache/com.companyname.ConnectionTest.flag
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/obj/ConnectionTest.Android.csproj.nuget.cache
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/obj/ConnectionTest.Android.csproj.nuget.g.props
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/obj/ConnectionTest.Android.csproj.nuget.g.targets
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/obj/project.assets.json
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.UWP/Package.appxmanifest
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/ConnectionTest.iOS.csproj.nuget.cache
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/ConnectionTest.iOS.csproj.nuget.g.props
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/ConnectionTest.iOS.csproj.nuget.g.targets
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/iPhoneSimulator/Debug/ConnectionTest.iOS.csprojAssemblyReference.cache
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/project.assets.json
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/App.xaml.cs
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectPage.cs
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectionTest.csproj
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/InGamePage.cs
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/TcpJsonConnection.cs
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.deps.json
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.dll
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.pdb
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/ConnectionTest.csproj.nuget.cache
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/ConnectionTest.csproj.nuget.g.props
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/ConnectionTest.csproj.nuget.g.targets
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.assets.cache
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.csproj.CoreCompileInputs.cache
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.csproj.FileListAbsolute.txt
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.csprojAssemblyReference.cache
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.dll
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.pdb
src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/project.assets.json

index fc0aa62..78c9267 100644 (file)
@@ -8,7 +8,7 @@
     <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>ConnectionTest.Droid</RootNamespace>
-    <AssemblyName>ConnectionTest.Android</AssemblyName>
+    <AssemblyName>BombermanClone.Android</AssemblyName>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -31,6 +31,9 @@
     <AndroidLinkMode>None</AndroidLinkMode>
     <AndroidSupportedAbis />
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
index d753d69..4142abe 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SelectedDevice>Android_Accelerated_x86_Oreo</SelectedDevice>
+    <SelectedDevice>Sony D6603</SelectedDevice>
     <DefaultDevice>Android_Accelerated_x86_Oreo</DefaultDevice>
   </PropertyGroup>
 </Project>
\ No newline at end of file
index 8610d58..6ee25a5 100644 (file)
@@ -10,7 +10,7 @@ using Bomberman;
 
 namespace ConnectionTest.Droid
 {
-    [Activity(Label = "ConnectionTest", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+    [Activity(Label = "BombercloneClient", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
index dd7f0b4..78c5717 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.ConnectionTest" android:installLocation="auto">
-       <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="27" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.ConnectionTest" android:installLocation="internalOnly">
+       <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
        <uses-permission android:name="android.permission.INTERNET" />
        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
        <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -8,5 +8,6 @@
        <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
        <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
        <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-       <application android:label="ConnectionTest.Android"></application>
+       <application android:label="BombercloneClient"></application>
+  <application android:name="BombercloneClient"/>
 </manifest>
\ No newline at end of file
index ac0a331..5246dda 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.Android.dll and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.Android.dll differ
index 3a9470e..22bf1b2 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.Android.pdb and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.Android.pdb differ
index 2277446..c538d15 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.dll and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.dll differ
index 085555c..fa8b528 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.pdb and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/ConnectionTest.pdb differ
index 8f88f4d..b492b00 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/FormsViewGroup.dll.mdb and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/FormsViewGroup.dll.mdb differ
index a17047e..e1b042f 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/Mono.Android.pdb and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/Mono.Android.pdb differ
index eaabdad..9937e02 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/Xamarin.Forms.Platform.Android.dll.mdb and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/Xamarin.Forms.Platform.Android.dll.mdb differ
index 1661556..ecb9189 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/com.companyname.ConnectionTest-Signed.apk and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/com.companyname.ConnectionTest-Signed.apk differ
index e1b9661..d3c5366 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/com.companyname.ConnectionTest.apk and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/bin/Debug/com.companyname.ConnectionTest.apk differ
index 83ab0ca..2b634fe 100644 (file)
@@ -1,5 +1,5 @@
 {
   "version": 1,
-  "dgSpecHash": "RC2tkq5QiH+Cz7DKKbFbP94ndIxKxV6IrIbpeh6vvc3G8XQY1llgoEVR1BeoJ6lkIFeMnzQ7ku9sSMdhdRvjLQ==",
+  "dgSpecHash": "jV7G7MBlijsVXH6vrFyk8a9vWwmjehwl2+oUvk1z0g8p4Sfi4TiABlZXSB0ZidTgk9Opd7GO/UwAmj5it0Q+nA==",
   "success": true
 }
\ No newline at end of file
index ea14241..0dc6f47 100644 (file)
@@ -3,16 +3,16 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/obj/project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/bernhard/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/bernhard/.nuget/packages/</NuGetPackageFolders>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest.Android\obj\project.assets.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\User\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.7.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.8.1</NuGetToolVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.props" Condition="Exists('$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.props')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.props" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.props')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
index 4215c3f..124d73a 100644 (file)
@@ -4,25 +4,25 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.annotations/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Annotations.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.annotations/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Annotations.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.arch.lifecycle.common/1.0.3.1/build/MonoAndroid80/Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.arch.lifecycle.common/1.0.3.1/build/MonoAndroid80/Xamarin.Android.Arch.Lifecycle.Common.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.arch.core.common/1.0.0.1/build/MonoAndroid80/Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.arch.core.common/1.0.0.1/build/MonoAndroid80/Xamarin.Android.Arch.Core.Common.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.arch.lifecycle.runtime/1.0.3.1/build/MonoAndroid80/Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.arch.lifecycle.runtime/1.0.3.1/build/MonoAndroid80/Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.compat/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Compat.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.compat/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Compat.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.vector.drawable/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.vector.drawable/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Vector.Drawable.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.core.ui/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Core.UI.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.core.ui/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Core.UI.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.recyclerview/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.recyclerview/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.RecyclerView.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.core.utils/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.core.utils/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Core.Utils.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.palette/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.palette/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.Palette.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.media.compat/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.media.compat/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Media.Compat.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.fragment/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Fragment.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.fragment/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Fragment.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.animated.vector.drawable/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.animated.vector.drawable/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.appcompat/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.appcompat/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.AppCompat.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.mediarouter/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.mediarouter/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.MediaRouter.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.cardview/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.cardview/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v7.CardView.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v4/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v4.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v4/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.v4.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.transition/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Transition.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.transition/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Transition.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.android.support.design/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Design.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.design/27.0.2.1/build/MonoAndroid81/Xamarin.Android.Support.Design.targets')" />
-    <Import Project="$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.annotations\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Annotations.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.annotations\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Annotations.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.arch.lifecycle.common\1.0.3.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.arch.lifecycle.common\1.0.3.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.arch.core.common\1.0.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.arch.core.common\1.0.0.1\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.arch.lifecycle.runtime\1.0.3.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.arch.lifecycle.runtime\1.0.3.1\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.compat\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Compat.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.compat\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Compat.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.vector.drawable\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.vector.drawable\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Vector.Drawable.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.core.ui\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.core.ui\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Core.UI.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.recyclerview\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.recyclerview\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.RecyclerView.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.core.utils\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.core.utils\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Core.Utils.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.palette\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.palette\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.Palette.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.media.compat\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.media.compat\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Media.Compat.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.fragment\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Fragment.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.fragment\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Fragment.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.animated.vector.drawable\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.animated.vector.drawable\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.appcompat\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.appcompat\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.AppCompat.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.mediarouter\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.mediarouter\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.MediaRouter.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v7.cardview\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v7.cardview\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v7.CardView.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.v4\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v4.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.v4\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.v4.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.transition\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Transition.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.transition\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Transition.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.android.support.design\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Design.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.android.support.design\27.0.2.1\build\MonoAndroid81\Xamarin.Android.Support.Design.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
index f66302f..03cda83 100644 (file)
     ]
   },
   "packageFolders": {
-    "/Users/bernhard/.nuget/packages/": {}
+    "C:\\Users\\User\\.nuget\\packages\\": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/ConnectionTest.Android.csproj",
+      "projectUniqueName": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest.Android\\ConnectionTest.Android.csproj",
       "projectName": "ConnectionTest.Android",
-      "projectPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/ConnectionTest.Android.csproj",
-      "packagesPath": "/Users/bernhard/.nuget/packages/",
-      "outputPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.Android/obj",
+      "projectPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest.Android\\ConnectionTest.Android.csproj",
+      "packagesPath": "C:\\Users\\User\\.nuget\\packages\\",
+      "outputPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest.Android\\obj\\",
       "projectStyle": "PackageReference",
+      "skipContentFileWrite": true,
       "configFilePaths": [
-        "/Users/bernhard/.config/NuGet/NuGet.Config"
+        "C:\\Users\\User\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
         "monoandroid81"
       ],
       "sources": {
+        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
         "monoandroid81": {
           "projectReferences": {
-            "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectionTest.csproj": {
-              "projectPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectionTest.csproj"
+            "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest\\ConnectionTest.csproj": {
+              "projectPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest\\ConnectionTest.csproj"
             }
           }
         }
index 2a3ea04..fc0241f 100644 (file)
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ConnectionTest.UWP.App">
-      <uap:VisualElements DisplayName="ConnectionTest.UWP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="ConnectionTest.UWP" BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="BombercloneClient" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="ConnectionTest.UWP" BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="square150x150Logo" />
index db25fe7..b87015e 100644 (file)
@@ -1,5 +1,5 @@
 {
   "version": 1,
-  "dgSpecHash": "QOwapUtSxyFPLLXOAj0aZyUBqC0n/GJ0nr3v342pc2cXp3diLgOZhSUkuZyy2nx1JczcUj8CeuRygAFYghszkQ==",
+  "dgSpecHash": "rp8I5NnL8pbmFWzCtcjdKpY/T3AAKLIEsMc1/jBDnJwXoCCvuUyKg/pQXAPUZAWMQnnLJQ/1CYgmDhb+qbB5Wg==",
   "success": true
 }
\ No newline at end of file
index c7bb5b7..04851a4 100644 (file)
@@ -3,16 +3,16 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/bernhard/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/bernhard/.nuget/packages/</NuGetPackageFolders>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest.iOS\obj\project.assets.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\User\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.7.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.8.1</NuGetToolVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.props" Condition="Exists('$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.props')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.props" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.props')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
index 4ffc588..081531b 100644 (file)
@@ -4,6 +4,6 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
index 1f561d9..7e85ed6 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/iPhoneSimulator/Debug/ConnectionTest.iOS.csprojAssemblyReference.cache and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj/iPhoneSimulator/Debug/ConnectionTest.iOS.csprojAssemblyReference.cache differ
index adf2ca9..bca0dac 100644 (file)
     ]
   },
   "packageFolders": {
-    "/Users/bernhard/.nuget/packages/": {}
+    "C:\\Users\\User\\.nuget\\packages\\": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/ConnectionTest.iOS.csproj",
+      "projectUniqueName": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest.iOS\\ConnectionTest.iOS.csproj",
       "projectName": "ConnectionTest.iOS",
-      "projectPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/ConnectionTest.iOS.csproj",
-      "packagesPath": "/Users/bernhard/.nuget/packages/",
-      "outputPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest.iOS/obj",
+      "projectPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest.iOS\\ConnectionTest.iOS.csproj",
+      "packagesPath": "C:\\Users\\User\\.nuget\\packages\\",
+      "outputPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest.iOS\\obj\\",
       "projectStyle": "PackageReference",
+      "skipContentFileWrite": true,
       "configFilePaths": [
-        "/Users/bernhard/.config/NuGet/NuGet.Config"
+        "C:\\Users\\User\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
         "xamarinios10"
       ],
       "sources": {
+        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
         "xamarinios10": {
           "projectReferences": {
-            "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectionTest.csproj": {
-              "projectPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectionTest.csproj"
+            "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest\\ConnectionTest.csproj": {
+              "projectPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest\\ConnectionTest.csproj"
             }
           }
         }
index f56af91..44a2b3d 100644 (file)
@@ -44,7 +44,25 @@ namespace Bomberman
                 switch (pkg.State)
                 {
                     case ServerPackage.ServerState.PreGamePhase:
-                        Application.Current.MainPage = new PreGamePage(pkg);
+                        if(Application.Current.MainPage.GetType() != typeof(PreGamePage))
+                        {
+                            Application.Current.MainPage = new PreGamePage(pkg);
+                            oldPlayersCount = pkg.Players.Count;
+                        }
+                        else
+                        {
+                            if (pkg.Players.Count != oldPlayersCount)
+                            {
+                                ((PreGamePage)Application.Current.MainPage).UpdatePage(pkg);
+
+                            }
+                            else
+                            {
+                                ((PreGamePage)Application.Current.MainPage).UpdateTime(pkg);
+                            }
+                            oldPlayersCount = pkg.Players.Count;
+
+                        }
                         break;
                     case ServerPackage.ServerState.InGamePhase:
                         if (gameStarted == 0)
@@ -53,18 +71,39 @@ namespace Bomberman
                             Application.Current.MainPage = gamePage;
                             gamePage.CreateInitializePlayground(pkg.Field.Count);
                             gameStarted = 1;
+                            updateCnt = 20;
                         }
                         else
                         {
-                            gamePage.UpdatePlayground(pkg);
+                            if(updateCnt == 0)
+                            {
+                                gamePage.UpdatePlayground(pkg);
+                                updateCnt = 1;
+                            }
+                            else
+                            {
+                                updateCnt--;
+                            }
+
                         }
                         break;
                     case ServerPackage.ServerState.PostGamePhase:
                         gameStarted = 0;
-                        Application.Current.MainPage = new PostGamePage(pkg);
+                        if (Application.Current.MainPage.GetType() != typeof(PostGamePage))
+                        {
+                            Application.Current.MainPage = new PostGamePage(pkg);
+                        }
+                        else
+                        {
+                            ((PostGamePage)Application.Current.MainPage).UpdateTime(pkg);
+                        }
                         break;
                 }
             });
         }
+
+
+        int updateCnt = 0;
+        private int oldPlayersCount;
     }
 }
index 4afbb5e..49bb8e6 100644 (file)
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using System.Net;
 using static Bomberman.TcpJsonConnection;
+using System.Net.Sockets;
 
 namespace Bomberman
 {
@@ -31,8 +32,10 @@ namespace Bomberman
                 MaxLength = 15,
                 Keyboard = Keyboard.Telephone,
                 VerticalOptions = LayoutOptions.CenterAndExpand,
-                HorizontalOptions = LayoutOptions.CenterAndExpand
+                HorizontalOptions = LayoutOptions.CenterAndExpand,               
             };
+            entryIPAddress.Completed += EntryIPAddress_Completed;
+
 
             Button buttonConnect = new Button
             {
@@ -54,9 +57,31 @@ namespace Bomberman
             };
         }
 
+        private void EntryIPAddress_Completed(object sender, EventArgs e)
+        {
+            Connect();
+        }
+
+        private void Connect()
+        {
+            try
+            {
+                con.Connect(IPAddress.Parse(entryIPAddress.Text));
+            }
+            catch (TcpJsonException)
+            {
+                DisplayAlert("Error on Connect", "Could not connect to server on given IP", "OK");               
+            }
+            catch (Exception)
+            {
+                DisplayAlert("Error on Connect", "Invalid IP", "OK");
+
+            }
+        }
+
         void ButtonConnect_Clicked(object sender, EventArgs e)
         {
-            con.Connect(IPAddress.Parse(entryIPAddress.Text));
+            Connect();
         }
 
     }
index 68da1ef..4fcd63d 100644 (file)
@@ -15,6 +15,9 @@
   <ItemGroup>
     <Compile Include="..\..\..\..\visualization\Playground\HelloMovingImage\HelloMovingImage\Playground.cs" Link="Playground.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\..\..\visualization\Playground\HelloMovingImage\HelloMovingImage\Images\BombCountUp.png" Link="Images\BombCountUp.png" />
+  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="..\..\..\..\visualization\Playground\HelloMovingImage\HelloMovingImage\Images\BrickWallBreakable.png" Link="Images\BrickWallBreakable.png" />
index 50df70a..2bb896b 100644 (file)
@@ -34,9 +34,7 @@ namespace Bomberman
             //con.Connect(IPAddress.Parse("192.168.0.5"));
             //con.Connect(Dns.GetHostEntry(Dns.GetHostName()).AddressList[1]);    //localhost
 
-            Entry ent = new Entry();
-            ButtonLayout.Children.Add(ent);
-            ent.TextChanged += Ent_TextChanged;
+
 
 
             for (int i = 0; i < 3; i++)
@@ -98,6 +96,10 @@ namespace Bomberman
                 }
 
             }
+
+            Entry ent = new Entry();
+            ButtonLayout.Children.Add(ent);
+            ent.TextChanged += Ent_TextChanged;
         }
         private void Down_Released(object sender, EventArgs e)
         {
@@ -136,8 +138,9 @@ namespace Bomberman
             BombermanPlayground.Playground.c_ImageNamespace = "ConnectionTest";
             BombermanPlayground.BombermanBlock.BlockSize = Width / (size + 1);
 
-            fullLayout.Children.Add(ButtonLayout);
             fullLayout.Children.Add(playground);
+            fullLayout.Children.Add(ButtonLayout);
+            ButtonLayout.TranslationY = Width;
             Content = fullLayout;
 
         }
@@ -174,11 +177,13 @@ namespace Bomberman
                     break;
                 case " ":
                     con.SendEvent(TcpJsonConnection.InputBomb.PlaceBomb);
+                    new Task(() => { System.Threading.Thread.Sleep(50); con.SendEvent(TcpJsonConnection.InputBomb.Idle); }).Start();
+                    break;
+                case "X":
+                    con.SendEvent(TcpJsonConnection.InputState.Idle);
                     break;
             }
             ((Entry)sender).Text = "";
-            con.SendEvent(TcpJsonConnection.InputState.Idle);
-            con.SendEvent(TcpJsonConnection.InputBomb.Idle);
 
 
         }
index d1e3c36..fcfa157 100644 (file)
@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -36,13 +37,10 @@ namespace Bomberman
         Task m_receiveTask;
         private CancellationTokenSource m_receiveTaskCancellationTokenSource;
 
+        private const int c_ConnectTimeout = 1200;
 
         public void Connect(IPAddress ipAddress)
         {
-            if(m_Connection != null)
-            {
-                return;
-            }
 
             Print("Connecting to " + ipAddress);
 
@@ -51,7 +49,11 @@ namespace Bomberman
             m_Connection = new Socket(ipAddress.AddressFamily,
                     SocketType.Stream, ProtocolType.Tcp);
 
-            m_Connection.Connect(remoteEP);
+            m_Connection.ConnectAsync(remoteEP).Wait(c_ConnectTimeout);
+            if(!m_Connection.Connected)
+            {
+                throw new TcpJsonException();
+            }
 
             Print("-Connected.");
 
@@ -113,7 +115,7 @@ namespace Bomberman
                 {
                     // Incoming data from the client.  
                     string data = null;
-                    byte[] bytes = new Byte[1024];
+                    byte[] bytes = new Byte[8192];
                     while (!m_receiveTaskCancellationTokenSource.Token.IsCancellationRequested)
                     {
                         int bytesRec = m_Connection.Receive(bytes);
@@ -130,7 +132,6 @@ namespace Bomberman
                                 for (int i = 0; i < recvPkgs.Length - 1; i++)
                                 {
                                     recvPkgsWithoutIncomplete[i] = recvPkgs[i];
-
                                 }
                                 recvPkgs = recvPkgsWithoutIncomplete;
                                 if (restFromPreviousReception != "")
@@ -146,15 +147,19 @@ namespace Bomberman
 
 
                 // Show the data on the console and forward to handler
+                string lastReceivedPackage = "";
                 for (int i = 0; i < recvPkgs.Length; i++)
                 {
                     if (recvPkgs[i].Length > 0) // Filter '\0' strings..
                     {
                         Print("Text received : " + recvPkgs[i]);
-                        HandleServerPackage(recvPkgs[i]);
+                        lastReceivedPackage = recvPkgs[i];
+                        //HandleServerPackage(recvPkgs[i]); // We would use this if we would handle every pkg
                     }
 
                 }
+                HandleServerPackage(lastReceivedPackage);
+
 
             }
         }
@@ -311,4 +316,24 @@ namespace Bomberman
         }
 
     }
+
+    [Serializable]
+    internal class TcpJsonException : Exception
+    {
+        public TcpJsonException()
+        {
+        }
+
+        public TcpJsonException(string message) : base(message)
+        {
+        }
+
+        public TcpJsonException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected TcpJsonException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
 }
index 2491d5e..22d6379 100644 (file)
@@ -58,7 +58,7 @@
     "Microsoft.NETCore.Platforms/1.1.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
+      "sha512": "sha512-bLpT1f/SFlO1CzqXG12KnJzpZs6lv24uX2Rzi4Fmm0noJpNlnWRVryuO3yK18Ca04t/YHcO1e1Z0WDfjseqNzw==",
       "path": "microsoft.netcore.platforms/1.1.0",
       "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
     },
index 2277446..c538d15 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.dll and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.dll differ
index 085555c..fa8b528 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.pdb and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.pdb differ
index d8ac98c..17111f7 100644 (file)
@@ -1,5 +1,5 @@
 {
   "version": 1,
-  "dgSpecHash": "65GF0rVIkVscs/DCxY7FWgD+7ZJGn7zJDx55NVnhKqSUkIryG0fknplG0NVc+MlJ/Bd2hyPjOzVecWI8J4bvrw==",
+  "dgSpecHash": "kTPqI91W6fZSO+L24n+RMvqXtV2F1079kKp+7UvzyuTkG8z2xjynNeTSBt3/w2toyeOibfWSF3meV5/yDoJv0A==",
   "success": true
 }
\ No newline at end of file
index 669be73..096ecbf 100644 (file)
@@ -3,16 +3,16 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/bernhard/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/bernhard/.nuget/packages/;/usr/local/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\project.assets.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\User\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.7.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.8.1</NuGetToolVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.props" Condition="Exists('$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.props')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.props" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.props')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
index 3967d11..17f03e1 100644 (file)
@@ -4,7 +4,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms/3.3.0.912540/build/Xamarin.Forms.targets')" />
-    <Import Project="/usr/local/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/build/netstandard2.0/NETStandard.Library.targets" Condition="Exists('/usr/local/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/build/netstandard2.0/NETStandard.Library.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\3.3.0.912540\build\Xamarin.Forms.targets')" />
+    <Import Project="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('C:\Program Files\dotnet\sdk\NuGetFallbackFolder\netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
index 3170d60..e05f5f9 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.assets.cache and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.assets.cache differ
index 1373ff0..ef1f3c6 100644 (file)
 /Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.dll
 /Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/bin/Debug/netstandard2.0/ConnectionTest.pdb
 /Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/XamlC.stamp
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\bin\Debug\netstandard2.0\ConnectionTest.deps.json
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\bin\Debug\netstandard2.0\ConnectionTest.dll
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\bin\Debug\netstandard2.0\ConnectionTest.pdb
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\ConnectionTest.csprojAssemblyReference.cache
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\App.xaml.g.cs
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\ConnectionTest.csproj.CoreCompileInputs.cache
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\ConnectionTest.AssemblyInfoInputs.cache
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\ConnectionTest.AssemblyInfo.cs
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\XamlC.stamp
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\ConnectionTest.dll
+Y:\full_system\ConnectionTest\ConnectionTest\ConnectionTest\obj\Debug\netstandard2.0\ConnectionTest.pdb
index 6b8f0ba..40f3628 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.csprojAssemblyReference.cache and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.csprojAssemblyReference.cache differ
index 2277446..c538d15 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.dll and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.dll differ
index 085555c..fa8b528 100644 (file)
Binary files a/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.pdb and b/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj/Debug/netstandard2.0/ConnectionTest.pdb differ
index 91fd4cf..a262847 100644 (file)
   },
   "libraries": {
     "Microsoft.NETCore.Platforms/1.1.0": {
-      "sha512": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
+      "sha512": "bLpT1f/SFlO1CzqXG12KnJzpZs6lv24uX2Rzi4Fmm0noJpNlnWRVryuO3yK18Ca04t/YHcO1e1Z0WDfjseqNzw==",
       "type": "package",
       "path": "microsoft.netcore.platforms/1.1.0",
       "files": [
+        ".signature.p7s",
         "ThirdPartyNotices.txt",
         "dotnet_library_license.txt",
         "lib/netstandard1.0/_._",
     ]
   },
   "packageFolders": {
-    "/Users/bernhard/.nuget/packages/": {},
-    "/usr/local/share/dotnet/sdk/NuGetFallbackFolder": {}
+    "C:\\Users\\User\\.nuget\\packages\\": {},
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectionTest.csproj",
+      "projectUniqueName": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest\\ConnectionTest.csproj",
       "projectName": "ConnectionTest",
-      "projectPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/ConnectionTest.csproj",
-      "packagesPath": "/Users/bernhard/.nuget/packages/",
-      "outputPath": "/Users/bernhard/gitlab/full-project/xamarin-client/src/full_system/ConnectionTest/ConnectionTest/ConnectionTest/obj",
+      "projectPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest\\ConnectionTest.csproj",
+      "packagesPath": "C:\\Users\\User\\.nuget\\packages\\",
+      "outputPath": "Y:\\full_system\\ConnectionTest\\ConnectionTest\\ConnectionTest\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
-        "/usr/local/share/dotnet/sdk/NuGetFallbackFolder"
+        "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
       ],
       "configFilePaths": [
-        "/Users/bernhard/.config/NuGet/NuGet.Config"
+        "C:\\Users\\User\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
         "netstandard2.0"
       ],
       "sources": {
+        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {