From cd5bc2bef7c2c4887ccc216049d78ecc98c8efee Mon Sep 17 00:00:00 2001
From: Stricted <info@stricted.de>
Date: Wed, 11 Nov 2015 23:07:05 +0100
Subject: [PATCH] update Lan Page

---
 SpeedportHybridControl/App.xaml               |  3 +-
 .../{DeviceViewModel.cs => DeviceList.cs}     | 22 +----------
 .../PageModel/LanPageModel.cs                 | 38 +++++++++++++++++++
 .../PageModel/TR181PageModel.cs               |  4 --
 .../SpeedportHybridControl.csproj             |  3 +-
 SpeedportHybridControl/page/LanPage.xaml      | 10 ++---
 6 files changed, 47 insertions(+), 33 deletions(-)
 rename SpeedportHybridControl/Model/{DeviceViewModel.cs => DeviceList.cs} (69%)
 create mode 100644 SpeedportHybridControl/PageModel/LanPageModel.cs

diff --git a/SpeedportHybridControl/App.xaml b/SpeedportHybridControl/App.xaml
index b4a7629..5c0bcff 100644
--- a/SpeedportHybridControl/App.xaml
+++ b/SpeedportHybridControl/App.xaml
@@ -17,8 +17,7 @@
             <pagemodel:SyslogPageModel x:Key="SyslogPageModel"></pagemodel:SyslogPageModel>
             <pagemodel:TR181PageModel x:Key="TR181PageModel"></pagemodel:TR181PageModel>
             <pagemodel:PhonePageModel x:Key="PhonePageModel"></pagemodel:PhonePageModel>
-            
-            <model:DeviceData x:Key="DeviceData"></model:DeviceData>
+            <pagemodel:LanPageModel x:Key="LanPageModel"></pagemodel:LanPageModel>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/SpeedportHybridControl/Model/DeviceViewModel.cs b/SpeedportHybridControl/Model/DeviceList.cs
similarity index 69%
rename from SpeedportHybridControl/Model/DeviceViewModel.cs
rename to SpeedportHybridControl/Model/DeviceList.cs
index ee69b48..eae8e6b 100644
--- a/SpeedportHybridControl/Model/DeviceViewModel.cs
+++ b/SpeedportHybridControl/Model/DeviceList.cs
@@ -1,24 +1,4 @@
-using System.Collections.Generic;
-
-namespace SpeedportHybridControl.Model {
-	public class DeviceData : SuperViewModel {
-		private List<DeviceList> _deviceList;
-		private string _datetime;
-
-		public List<DeviceList> deviceList {
-			get { return _deviceList; }
-			set { SetProperty(ref _deviceList, value); }
-		}
-
-		public string datetime {
-			get { return _datetime; }
-			set { SetProperty(ref _datetime, value); }
-		}
-
-		public DeviceData() {
-		}
-	}
-
+namespace SpeedportHybridControl.Model {
 	public class DeviceList : SuperViewModel {
 		private int _id;
 		private string _name;
diff --git a/SpeedportHybridControl/PageModel/LanPageModel.cs b/SpeedportHybridControl/PageModel/LanPageModel.cs
new file mode 100644
index 0000000..9f7f8e4
--- /dev/null
+++ b/SpeedportHybridControl/PageModel/LanPageModel.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using SpeedportHybridControl.Data;
+using SpeedportHybridControl.Model;
+using SpeedportHybridControl.Implementations;
+using System.Threading;
+
+namespace SpeedportHybridControl.PageModel {
+	class LanPageModel : SuperViewModel {
+		private DelegateCommand _reloadCommand;
+
+		private List<DeviceList> _deviceList;
+		private string _datetime;
+
+		public DelegateCommand ReloadCommand {
+			get { return _reloadCommand; }
+			set { SetProperty(ref _reloadCommand, value); }
+		}
+
+		public List<DeviceList> deviceList {
+			get { return _deviceList; }
+			set { SetProperty(ref _deviceList, value); }
+		}
+
+		public string datetime {
+			get { return _datetime; }
+			set { SetProperty(ref _datetime, value); }
+		}
+
+		private void OnReloadCommandExecute () {
+			new Thread(() => { SpeedportHybrid.initLan(); }).Start();
+		}
+
+		public LanPageModel () {
+			ReloadCommand = new DelegateCommand(new Action(OnReloadCommandExecute));
+		}
+	}
+}
diff --git a/SpeedportHybridControl/PageModel/TR181PageModel.cs b/SpeedportHybridControl/PageModel/TR181PageModel.cs
index 151203c..c25cb70 100644
--- a/SpeedportHybridControl/PageModel/TR181PageModel.cs
+++ b/SpeedportHybridControl/PageModel/TR181PageModel.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using SpeedportHybridControl.Data;
 using SpeedportHybridControl.Model;
 using SpeedportHybridControl.Implementations;
diff --git a/SpeedportHybridControl/SpeedportHybridControl.csproj b/SpeedportHybridControl/SpeedportHybridControl.csproj
index 4ae83d9..488db6e 100644
--- a/SpeedportHybridControl/SpeedportHybridControl.csproj
+++ b/SpeedportHybridControl/SpeedportHybridControl.csproj
@@ -72,12 +72,13 @@
     </Compile>
     <Compile Include="Model\bonding_client.cs" />
     <Compile Include="Model\Connection.cs" />
-    <Compile Include="Model\DeviceViewModel.cs" />
+    <Compile Include="Model\DeviceList.cs" />
     <Compile Include="Model\Line.cs" />
     <Compile Include="Model\PhoneCallList.cs" />
     <Compile Include="Model\StatusPhoneList.cs" />
     <Compile Include="Model\SyslogList.cs" />
     <Compile Include="PageModel\DslPageModel.cs" />
+    <Compile Include="PageModel\LanPageModel.cs" />
     <Compile Include="PageModel\LoginPageModel.cs" />
     <Compile Include="PageModel\LteInfoModel.cs" />
     <Compile Include="PageModel\MainWindowModel.cs" />
diff --git a/SpeedportHybridControl/page/LanPage.xaml b/SpeedportHybridControl/page/LanPage.xaml
index afb1f31..e0935fb 100644
--- a/SpeedportHybridControl/page/LanPage.xaml
+++ b/SpeedportHybridControl/page/LanPage.xaml
@@ -1,14 +1,14 @@
 <Page x:Class="SpeedportHybridControl.page.LanPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="clr-namespace:SpeedportHybridControl"
-      mc:Ignorable="d" 
+      mc:Ignorable="d"
       Width="Auto" Height="Auto"
       Title="LanPage">
 
-    <Grid DataContext="{StaticResource DeviceData}">
+    <Grid DataContext="{StaticResource LanPageModel}">
         <ListView ItemsSource="{Binding deviceList}" x:Name="listView4" Margin="0,0,0,39">
             <ListView.Resources>
                 <Style TargetType="{x:Type GridViewColumnHeader}">
@@ -30,6 +30,6 @@
 
         <TextBlock Text="{Binding datetime}" Margin="0,0,10,0" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
 
-        <Button x:Name="reload" Content="Aktualisieren" Margin="218,0,218,0" Click="button_click" VerticalAlignment="Bottom"/>
+        <Button Command="{Binding Path=ReloadCommand}" x:Name="reload" Content="Aktualisieren" Margin="218,0,218,0" VerticalAlignment="Bottom"/>
     </Grid>
 </Page>
-- 
2.20.1