升级SDK

Berrysoft · Apr 20, 2019 · c825246 · c825246
1 parent f8271a3
commit c825246
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/TsinghuaNetUWP.Background/TsinghuaNetUWP.Background.vbproj b/TsinghuaNetUWP.Background/TsinghuaNetUWP.Background.vbproj
@@ -10,7 +10,7 @@
     <AssemblyName>TsinghuaNetUWP.Background</AssemblyName>
     <DefaultLanguage>zh-CN</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>

diff --git a/TsinghuaNetUWP.Helper/TsinghuaNetUWP.Helper.vbproj b/TsinghuaNetUWP.Helper/TsinghuaNetUWP.Helper.vbproj
@@ -10,7 +10,7 @@
     <AssemblyName>TsinghuaNetUWP.Helper</AssemblyName>
     <DefaultLanguage>zh-CN</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>

diff --git a/TsinghuaNetUWP/Package.appxmanifest b/TsinghuaNetUWP/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="Berrysoft.TsinghuaNetUWP"
     Publisher="CN=Straw"
-    Version="3.0.47.0" />
+    Version="3.0.49.0" />
 
   <mp:PhoneIdentity PhoneProductId="a82c01d1-a86d-44f3-8094-66f9b4e47d63" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/TsinghuaNetUWP/TsinghuaNetUWP.vbproj b/TsinghuaNetUWP/TsinghuaNetUWP.vbproj
@@ -8,9 +8,9 @@
     <OutputType>AppContainerExe</OutputType>
     <RootNamespace>TsinghuaNetUWP</RootNamespace>
     <AssemblyName>TsinghuaNetUWP</AssemblyName>
-    <DefaultLanguage>zh-CN</DefaultLanguage>
+    <DefaultLanguage>zh-cn</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -23,6 +23,7 @@
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/TsinghuaNetUWP/Views/MainPage.xaml b/TsinghuaNetUWP/Views/MainPage.xaml
@@ -51,7 +51,7 @@
             <Frame x:Name="MainFrame" Background="Transparent" Content="{x:Bind Model.UserContent,Mode=OneWay}"/>
         </SplitView.Content>
         <SplitView.Pane>
-            <ScrollViewer>
+            <muxc:ScrollViewer HorizontalScrollMode="Disabled">
                 <StackPanel Margin="10" Orientation="Vertical">
                     <TextBlock Margin="10" Style="{ThemeResource TitleTextBlockStyle}">设置</TextBlock>
                     <StackPanel Orientation="Horizontal">
@@ -93,12 +93,12 @@
                         <AppBarButton Margin="10,0" Width="50" VerticalAlignment="Center" LabelPosition="Collapsed" Icon="Help" ToolTipService.ToolTip="选项帮助" Click="HelpSelection"/>
                     </StackPanel>
                     <muxc:RadioButtons Margin="10" SelectedIndex="{x:Bind Model.State,Converter={StaticResource NetStateIndexConverter},Mode=TwoWay}">
-                        <TextBlock Text="{x:Bind helper:UserHelper.GetNetStateString(helper:NetState.Unknown)}" Width="300"/>
-                        <TextBlock Text="{x:Bind helper:UserHelper.GetNetStateString(helper:NetState.Net)}"/>
-                        <TextBlock Text="{x:Bind helper:UserHelper.GetNetStateString(helper:NetState.Auth4)}"/>
-                        <TextBlock Text="{x:Bind helper:UserHelper.GetNetStateString(helper:NetState.Auth6)}"/>
+                        <x:String>不登录</x:String>
+                        <x:String>Net</x:String>
+                        <x:String>Auth4</x:String>
+                        <x:String>Auth6</x:String>
                     </muxc:RadioButtons>
-                   <StackPanel Orientation="Horizontal">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock Margin="10" Style="{ThemeResource SubtitleTextBlockStyle}" VerticalAlignment="Center">管理连接</TextBlock>
                         <AppBarButton Margin="10,0" Width="50" VerticalAlignment="Center" LabelPosition="Collapsed" Icon="Refresh" ToolTipService.ToolTip="刷新状态" Click="RefreshNetUsers"/>
                     </StackPanel>
@@ -109,9 +109,10 @@
                             </TransitionCollection>
                         </ListView.ItemContainerTransitions>
                     </ListView>
+                    <TextBlock Margin="10" Style="{ThemeResource SubtitleTextBlockStyle}">主题设置</TextBlock>
                     <StackPanel Orientation="Horizontal">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Margin="10" Style="{ThemeResource SubtitleTextBlockStyle}">颜色主题</TextBlock>
+                            <TextBlock Margin="10" Style="{ThemeResource BaseTextBlockStyle}">颜色</TextBlock>
                             <muxc:RadioButtons Margin="10" SelectedIndex="{x:Bind Model.SettingsTheme,Converter={StaticResource UserThemeIndexConverter},Mode=TwoWay}">
                                 <x:String>系统</x:String>
                                 <x:String>浅色</x:String>
@@ -120,7 +121,7 @@
                             </muxc:RadioButtons>
                         </StackPanel>
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Margin="10" Style="{ThemeResource SubtitleTextBlockStyle}">样式主题</TextBlock>
+                            <TextBlock Margin="10" Style="{ThemeResource BaseTextBlockStyle}">样式</TextBlock>
                             <muxc:RadioButtons Margin="10" SelectedIndex="{x:Bind Model.ContentType,Converter={StaticResource UserContentTypeIndexConverter},Mode=TwoWay}">
                                 <x:String>直线</x:String>
                                 <x:String>圆圈</x:String>
@@ -139,7 +140,7 @@
                         <HyperlinkButton NavigateUri="https://github.com/Berrysoft/TsinghuaNetUWP">项目网址</HyperlinkButton>
                     </StackPanel>
                 </StackPanel>
-            </ScrollViewer>
+            </muxc:ScrollViewer>
         </SplitView.Pane>
     </SplitView>
     <Page.BottomAppBar>

diff --git a/TsinghuaNetUWP/Views/MainPage.xaml.vb b/TsinghuaNetUWP/Views/MainPage.xaml.vb
@@ -294,7 +294,11 @@ Public NotInheritable Class MainPage
     End Sub
 
     Private Sub ShowException(e As Exception)
-        ShowResponse(New LogResponse(False, $"异常 0x{e.HResult:X}：{e.Message}"))
+        Try
+            ShowResponse(New LogResponse(False, $"异常 0x{e.HResult:X}：{e.Message}"))
+        Catch ex As Exception
+            Debug.Fail(ex.Message)
+        End Try
     End Sub
 
     Private Sub HelpSelection(sender As Object, e As RoutedEventArgs)