增加版本号

Berrysoft · Dec 29, 2018 · 5cb58b3 · 5cb58b3
1 parent fd228bc
commit 5cb58b3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/TsinghuaNetUWP/MainPage.xaml b/TsinghuaNetUWP/MainPage.xaml
@@ -172,7 +172,10 @@
                         </StackPanel>
                     </StackPanel>
                     <TextBlock Margin="10" Style="{ThemeResource TitleTextBlockStyle}">关于</TextBlock>
-                    <TextBlock Margin="10" Style="{ThemeResource SubtitleTextBlockStyle}">清华大学校园网客户端</TextBlock>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Margin="10" Style="{ThemeResource SubtitleTextBlockStyle}">清华大学校园网客户端</TextBlock>
+                        <TextBlock Margin="10" Style="{ThemeResource BodyTextBlockStyle}" VerticalAlignment="Bottom" Text="{x:Bind Model.GetVersionString(Model.Version),Mode=OneWay}"/>
+                    </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Margin="10" Style="{ThemeResource BaseTextBlockStyle}">版权所有 © 2018 Berrysoft</TextBlock>
                         <HyperlinkButton NavigateUri="https://github.com/Berrysoft/TsinghuaNetUWP">项目网址</HyperlinkButton>

diff --git a/TsinghuaNetUWP/MainViewModel.cpp b/TsinghuaNetUWP/MainViewModel.cpp
@@ -6,7 +6,9 @@
 #include "WaterUserContent.h"
 
 using namespace std;
+using sf::sprint;
 using namespace winrt;
+using namespace Windows::ApplicationModel;
 using namespace Windows::Foundation;
 using namespace Windows::UI::Xaml;
 using namespace TsinghuaNetHelper;
@@ -18,6 +20,11 @@ namespace winrt::TsinghuaNetUWP::implementation
         m_NetUsers = single_threaded_observable_vector<IInspectable>();
     }
 
+    hstring MainViewModel::GetVersionString(PackageVersion const& ver)
+    {
+        return hstring(sprint(L"{}.{}.{}.{}", ver.Major, ver.Minor, ver.Build, ver.Revision));
+    }
+
     void MainViewModel::OnAutoLoginPropertyChanged(DependencyObject const& d, DependencyPropertyChangedEventArgs const& e)
     {
         if (auto model{ d.try_as<class_type>() })
@@ -93,4 +100,6 @@ namespace winrt::TsinghuaNetUWP::implementation
 
     DEPENDENCY_PROPERTY_INIT(Theme, ElementTheme, MainViewModel, box_value(ElementTheme::Default))
     DEPENDENCY_PROPERTY_INIT(ContentType, UserContentType, MainViewModel, box_value(UserContentType::Ring), &MainViewModel::OnContentTypePropertyChanged)
+
+    DEPENDENCY_PROPERTY_INIT(Version, PackageVersion, MainViewModel, box_value(Package::Current().Id().Version()))
 } // namespace winrt::TsinghuaNetUWP::implementation
diff --git a/TsinghuaNetUWP/MainViewModel.h b/TsinghuaNetUWP/MainViewModel.h
@@ -34,8 +34,15 @@ namespace winrt::TsinghuaNetUWP::implementation
         DEPENDENCY_PROPERTY(ContentType, TsinghuaNetHelper::UserContentType)
         EVENT_DECL(ContentTypeChanged, TsinghuaNetHelper::UserContentType)
 
+        DEPENDENCY_PROPERTY(Version, Windows::ApplicationModel::PackageVersion)
+
     public:
-        Windows::Foundation::Collections::IObservableVector<Windows::Foundation::IInspectable> NetUsers() const { return m_NetUsers; }
+        hstring GetVersionString(Windows::ApplicationModel::PackageVersion const& ver);
+
+        Windows::Foundation::Collections::IObservableVector<Windows::Foundation::IInspectable> NetUsers() const
+        {
+            return m_NetUsers;
+        }
 
     private:
         Windows::Foundation::Collections::IObservableVector<Windows::Foundation::IInspectable> m_NetUsers;

diff --git a/TsinghuaNetUWP/MainViewModel.idl b/TsinghuaNetUWP/MainViewModel.idl
@@ -48,5 +48,9 @@ namespace TsinghuaNetUWP
         TsinghuaNetHelper.UserContentType ContentType;
         static Windows.UI.Xaml.DependencyProperty ContentTypeProperty { get; };
         event Windows.Foundation.EventHandler<TsinghuaNetHelper.UserContentType> ContentTypeChanged;
+
+        Windows.ApplicationModel.PackageVersion Version;
+        static Windows.UI.Xaml.DependencyProperty VersionProperty { get; };
+        String GetVersionString(Windows.ApplicationModel.PackageVersion ver);
     }
 } // namespace TsinghuaNetUWP
diff --git a/TsinghuaNetUWP/Package.appxmanifest b/TsinghuaNetUWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="Berrysoft.TsinghuaNetUWP" Publisher="CN=Straw" Version="2.0.37.0" />
+  <Identity Name="Berrysoft.TsinghuaNetUWP" Publisher="CN=Straw" Version="2.0.38.0" />
   <mp:PhoneIdentity PhoneProductId="091ffa12-1933-4f1b-96a5-4a169e4ab5f5" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>TsinghuaNetUWP</DisplayName>