diff --git a/ApplicationIcon.png b/ApplicationIcon.png index 5859393..75b728e 100644 Binary files a/ApplicationIcon.png and b/ApplicationIcon.png differ diff --git a/Background.png b/Background.png index e46f21d..446cd88 100644 Binary files a/Background.png and b/Background.png differ diff --git a/BoardPage.xaml b/BoardPage.xaml index ba3ee56..2355e0b 100644 --- a/BoardPage.xaml +++ b/BoardPage.xaml @@ -53,7 +53,7 @@ - + diff --git a/HotPage.xaml b/HotPage.xaml new file mode 100644 index 0000000..f16b087 --- /dev/null +++ b/HotPage.xaml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HotPage.xaml.cs b/HotPage.xaml.cs new file mode 100644 index 0000000..7aae57a --- /dev/null +++ b/HotPage.xaml.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Shapes; +using Microsoft.Phone.Controls; + +namespace sbbs_client_wp7 +{ + public partial class HotPage : PhoneApplicationPage + { + public HotPage() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Images/Tiles/board.png b/Images/Tiles/board.png new file mode 100644 index 0000000..95ed56c Binary files /dev/null and b/Images/Tiles/board.png differ diff --git a/Images/Tiles/cup.png b/Images/Tiles/cup.png new file mode 100644 index 0000000..2abe92a Binary files /dev/null and b/Images/Tiles/cup.png differ diff --git a/Images/Tiles/folder.png b/Images/Tiles/folder.png new file mode 100644 index 0000000..85bb585 Binary files /dev/null and b/Images/Tiles/folder.png differ diff --git a/Images/Tiles/history.png b/Images/Tiles/history.png new file mode 100644 index 0000000..206b97b Binary files /dev/null and b/Images/Tiles/history.png differ diff --git a/Images/Tiles/list.png b/Images/Tiles/list.png new file mode 100644 index 0000000..e64866e Binary files /dev/null and b/Images/Tiles/list.png differ diff --git a/Images/Tiles/love.png b/Images/Tiles/love.png new file mode 100644 index 0000000..d5c625d Binary files /dev/null and b/Images/Tiles/love.png differ diff --git a/Images/Tiles/mailbox.png b/Images/Tiles/mailbox.png new file mode 100644 index 0000000..5c0b0ec Binary files /dev/null and b/Images/Tiles/mailbox.png differ diff --git a/Images/Tiles/pen.png b/Images/Tiles/pen.png new file mode 100644 index 0000000..ba6400a Binary files /dev/null and b/Images/Tiles/pen.png differ diff --git a/Images/Tiles/search.png b/Images/Tiles/search.png new file mode 100644 index 0000000..3381d7c Binary files /dev/null and b/Images/Tiles/search.png differ diff --git a/MainPage.xaml b/MainPage.xaml index b3499ff..673c40d 100644 --- a/MainPage.xaml +++ b/MainPage.xaml @@ -59,7 +59,7 @@ - + @@ -74,7 +74,7 @@ - + - - - - - - - - - + + + + + + + + + + diff --git a/MainPage.xaml.cs b/MainPage.xaml.cs index c9a4db3..89fcba4 100644 --- a/MainPage.xaml.cs +++ b/MainPage.xaml.cs @@ -62,13 +62,13 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e) } // 登录 - private void Login_Click(object sender, MouseButtonEventArgs e) + private void Login_Tap(object sender, System.Windows.Input.GestureEventArgs e) { this.NavigationService.Navigate(new Uri("/LoginPage.xaml", UriKind.Relative)); } // 注销 - private void Logout_Click(object sender, MouseButtonEventArgs e) + private void Logout_Tap(object sender, System.Windows.Input.GestureEventArgs e) { MessageBoxResult result = MessageBox.Show("真的要注销吗？", "注销", MessageBoxButton.OKCancel); if (result == MessageBoxResult.OK) @@ -76,19 +76,25 @@ private void Logout_Click(object sender, MouseButtonEventArgs e) } // 刷新十大 - private void RefreshTopten_Click(object sender, MouseButtonEventArgs e) + private void RefreshTopten_Tap(object sender, System.Windows.Input.GestureEventArgs e) { App.ViewModel.IsToptenLoaded = false; LoadTopten(); } // 刷新收藏夹 - private void RefreshFavorates_Click(object sender, MouseButtonEventArgs e) + private void RefreshFavorates_Tap(object sender, System.Windows.Input.GestureEventArgs e) { App.ViewModel.IsFavoratesLoaded = false; LoadFavorates(); } + // 分区热点 + private void HotTopics_Tap(object sender, System.Windows.Input.GestureEventArgs e) + { + + } + // 点击收藏夹 private void Favorates_Selected(object sender, SelectionChangedEventArgs e) diff --git a/Properties/WMAppManifest.xml b/Properties/WMAppManifest.xml index 3cea49e..0b40ac5 100644 --- a/Properties/WMAppManifest.xml +++ b/Properties/WMAppManifest.xml @@ -1,35 +1,34 @@  - - + ApplicationIcon.png - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + Background.png 0 - sbbs_client_wp7 + 虎踞龙蟠BBS - + \ No newline at end of file diff --git a/SampleData/MainViewModelSampleData.xaml b/SampleData/MainViewModelSampleData.xaml index 9b949df..0760ea5 100644 --- a/SampleData/MainViewModelSampleData.xaml +++ b/SampleData/MainViewModelSampleData.xaml @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/Sbbs/TopicsGroupViewModel.cs b/Sbbs/TopicsGroupViewModel.cs new file mode 100644 index 0000000..2a1926f --- /dev/null +++ b/Sbbs/TopicsGroupViewModel.cs @@ -0,0 +1,32 @@ +using System; +using System.ComponentModel; +using System.Collections.ObjectModel; +using System.Runtime.Serialization.Json; +using System.Runtime.Serialization; + +namespace sbbs_client_wp7.Sbbs +{ + [DataContract] + public class TopicsGroupViewModel : ObservableCollection + { + [DataMember(Name = "description")] + public string Title { get; set; } + + [DataMember(Name = "topics")] + public ObservableCollection Topics { get; set; } + + public bool HasItems + { + get + { + return Count != 0; + } + + private set + { + } + } + + // 将ObservableCollection的全部元素操作转向Topics + } +} diff --git a/SplashScreenImage.jpg b/SplashScreenImage.jpg index 353b192..c07913f 100644 Binary files a/SplashScreenImage.jpg and b/SplashScreenImage.jpg differ diff --git a/Tile.xaml b/Tile.xaml index afa1a66..7a45baa 100644 --- a/Tile.xaml +++ b/Tile.xaml @@ -9,7 +9,7 @@ d:DesignHeight="160" d:DesignWidth="160"> - + - + diff --git a/ViewModels/HotViewModel.cs b/ViewModels/HotViewModel.cs new file mode 100644 index 0000000..278f70d --- /dev/null +++ b/ViewModels/HotViewModel.cs @@ -0,0 +1,75 @@ +using System; +using System.ComponentModel; +using System.Collections.ObjectModel; + +namespace sbbs_client_wp7 +{ + using Sbbs; + + public class HotViewModel : INotifyPropertyChanged + { + private bool isLoading; + + public bool IsLoading + { + get + { + return isLoading; + } + set + { + if (isLoading != value) + { + isLoading = value; + NotifyPropertyChanged("IsLoading"); + } + } + } + + // 热门版面集合 + private ObservableCollection hotboardsItems; + public ObservableCollection HotboardsItems + { + get + { + return hotboardsItems; + } + set + { + if (value != hotboardsItems) + { + hotboardsItems = value; + NotifyPropertyChanged("HotboardsItems"); + } + } + } + + // 分区热点 + private ObservableCollection topicsGroupItems; + public ObservableCollection TopicsGroupItems + { + get + { + return topicsGroupItems; + } + set + { + if (value != topicsGroupItems) + { + topicsGroupItems = value; + NotifyPropertyChanged("TopicsGroupItems"); + } + } + } + + public event PropertyChangedEventHandler PropertyChanged; + private void NotifyPropertyChanged(String propertyName) + { + PropertyChangedEventHandler handler = PropertyChanged; + if (null != handler) + { + handler(this, new PropertyChangedEventArgs(propertyName)); + } + } + } +} diff --git a/sbbs-client-wp7.csproj b/sbbs-client-wp7.csproj index 1005e0b..550a098 100644 --- a/sbbs-client-wp7.csproj +++ b/sbbs-client-wp7.csproj @@ -74,6 +74,9 @@ + + HotPage.xaml + LoginPage.xaml @@ -89,6 +92,7 @@ + SettingsPage.xaml @@ -108,6 +112,7 @@ + @@ -124,6 +129,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -182,6 +191,15 @@ + + + + + + + + +